历史排班

controllers/mobile_api_controllers/patient_api_controller.go

@@ -2182,6 +2182,7 @@ func (c *PatientApiController) EditAssessmentBeforeDislysis() {
 
 	dialysisPrescribe, _ = service.MobileGetDialysisPrescribe(adminUserInfo.Org.Id, id, theAssessmentDateTime)
 	lastDialysisPrescribe, _ = service.MobileGetLastDialysisPrescribeByModeIdSix(adminUserInfo.Org.Id, id, schedual.ModeId)
+	fmt.Println("22332232o2o", lastDialysisPrescribe.Chaptalization)
 	if schedual != nil {
 		// 获取透析模版
 		dialysisSolution, _ = service.MobileGetDialysisSolutionByModeIdSix(adminUserInfo.Org.Id, id, schedual.ModeId)

controllers/sign_api_controller.go

@@ -1,6 +1,7 @@
 package controllers
 
 import (
+	"XT_New/models"
 	"XT_New/service"
 	"encoding/json"
 	"fmt"
@@ -196,7 +197,82 @@ func (this *SignApiController) AddContractSignatory() {
 
 	signers := this.GetString("signers")
 
-	service.AddContractSignatory(contractId, signers)
+	var newContract models.NewContract
+
+	newContract.ContractId = "153497878806048027"
+
+	service.AddContractSignatory(contractId, signers, newContract)
+
+	maprequest := make(map[string]interface{})
+
+	maprequest["contractId"] = "153497878806048027"
+
+	//maprequestOne := make(map[string]interface{})
+
+	maprequestTwo := make(map[string]interface{})
+
+	var signFiles models.SignFiles
+	var sig []*models.Signers
+	signFiles.DocId = 343465645
+
+	inputDataArrOne := make([]map[string]interface{}, 0)
+	inputDataArrTwo := make([]map[string]interface{}, 0)
+
+	inputDataArrThree := make([]map[string]interface{}, 0)
+	for _, item := range signFiles.XySignControls {
+		fmt.Println(item)
+		inputDataThree := make(map[string]interface{})
+		inputDataThree["key"] = 11
+		inputDataThree["type"] = 222
+		inputDataThree["pageNum"] = 333
+		inputDataThree["positionX"] = 444
+		inputDataThree["positionY"] = 555
+
+		fmt.Println("2O2332O23O23O23", inputDataArrThree)
+		inputDataArrOne = append(inputDataArrOne, inputDataThree)
+	}
+
+	fmt.Println("inputDataArrOne", inputDataArrOne)
+
+	for _, item := range signFiles.KeywordSignControls {
+		fmt.Println(item)
+		inputDataFour := make(map[string]interface{})
+		inputDataFour["key"] = 666
+		inputDataFour["type"] = 888
+		inputDataFour["pageNum"] = 9999
+		inputDataFour["keyword"] = 6666
+		inputDataFour["positionX"] = 77777
+		inputDataFour["positionY"] = 8888
+
+		inputDataArrTwo = append(inputDataArrTwo, inputDataFour)
+	}
+
+	for _, item := range sig {
+		fmt.Println(item)
+		inputDataFive := make(map[string]interface{})
+		inputDataFive["userId"] = 233232
+		inputDataFive["signerType"] = 454545
+		inputDataFive["enterpriseId"] = 45455
+		inputDataFive["sequence"] = 44545
+		inputDataFive["sendMsg"] = 4545
+		inputDataFive["signFiles"] = 45455
+
+	}
+
+	maprequestTwo["xySignControls"] = inputDataArrOne
+	maprequestTwo["keywordSignControls"] = inputDataArrTwo
+	maprequestTwo["docId"] = 1234555
+
+	maprequest["contractId"] = newContract.ContractId
+
+	maprequest["signers"] = inputDataArrThree
+
+	this.ServeSuccessJSON(map[string]interface{}{
+		"inputDataArrOne": inputDataArrOne,
+		"maprequestOne":   maprequest,
+		"maprequestTwo":   maprequestTwo,
+	})
+	return
 }
 
 func (this *SignApiController) CreateContractsignatory() {

models/sign.models.go

@@ -2,27 +2,27 @@ package models
 
 type NewContract struct {
 	ContractId string `json:"contractId"`
-	signers    []struct {
+	Signers    []struct {
 		UserId       string `json:"userId"`
 		SignerType   int64  `json:"signerType"`
 		EnterpriseId string `json:"enterpriseId"`
 		Sequence     string `json:"sequence"`
 		SendMsg      string `json:"sendMsg"`
 		SignFiles    []struct {
-			DocId          float64 `json:"343465645"`
+			DocId          float64 `json:"docId"`
 			XySignControls []struct {
 				Key       string `json:"key"`
 				Type      string `json:"type"`
-				PageNum   string `json:"pageNum"`
-				PositionX string `json:"positionX"`
-				positionY string `json:"positionY"`
+				PageNum   int64  `json:"pageNum"`
+				PositionX int64  `json:"positionX"`
+				PositionY int64  `json:"positionY"`
 			} `json:"xySignControls"`
 			KeywordSignControls []struct {
-				Key       string `json:"key"`
-				Type      string `json:"type"`
-				PageNum   string `json:"pageNum"`
-				PositionX string `json:"positionX"`
-				positionY string `json:"positionY"`
+				Key     string `json:"key"`
+				Type    string `json:"type"`
+				PageNum int64  `json:"pageNum"`
+				OffsetX int64  `json:"offsetX"`
+				OffsetY int64  `json:"offsetY"`
 			} `json:"keywordSignControls"`
 		} `json:"signFiles"`
 	}
@@ -31,33 +31,60 @@ type NewContract struct {
 type XySignControls struct {
 	Key       string `json:"key"`
 	Type      string `json:"type"`
-	PageNum   string `json:"pageNum"`
-	PositionX string `json:"positionX"`
-	positionY string `json:"positionY"`
+	PageNum   int64  `json:"pageNum"`
+	PositionX int64  `json:"positionX"`
+	PositionY int64  `json:"positionY"`
 }
 
 type KeywordSignControls struct {
-	Key       string `json:"key"`
-	Type      string `json:"type"`
-	PageNum   string `json:"pageNum"`
-	PositionX string `json:"positionX"`
-	positionY string `json:"positionY"`
+	Key     string `json:"key"`
+	Type    string `json:"type"`
+	PageNum int64  `json:"pageNum"`
+	KeyWord string `json:"KeyWord"`
+	OffsetX int64  `json:"offsetX"`
+	OffsetY int64  `json:"offsetY"`
 }
 
-type SignFiles []struct {
+type SignFiles struct {
 	DocId          float64 `json:"343465645"`
 	XySignControls []struct {
 		Key       string `json:"key"`
 		Type      string `json:"type"`
 		PageNum   string `json:"pageNum"`
 		PositionX string `json:"positionX"`
-		positionY string `json:"positionY"`
+		PositionY string `json:"positionY"`
 	} `json:"xySignControls"`
 	KeywordSignControls []struct {
 		Key       string `json:"key"`
 		Type      string `json:"type"`
 		PageNum   string `json:"pageNum"`
+		KeyWord   string `json:"KeyWord"`
 		PositionX string `json:"positionX"`
-		positionY string `json:"positionY"`
+		PositionY string `json:"positionY"`
 	} `json:"keywordSignControls"`
 }
+
+type Signers struct {
+	UserId       string `json:"userId"`
+	SignerType   int64  `json:"signerType"`
+	EnterpriseId string `json:"enterpriseId"`
+	Sequence     string `json:"sequence"`
+	SendMsg      string `json:"sendMsg"`
+	SignFiles    []struct {
+		DocId          float64 `json:"docId"`
+		XySignControls []struct {
+			Key       string `json:"key"`
+			Type      string `json:"type"`
+			PageNum   int64  `json:"pageNum"`
+			PositionX int64  `json:"positionX"`
+			PositionY int64  `json:"positionY"`
+		} `json:"xySignControls"`
+		KeywordSignControls []struct {
+			Key     string `json:"key"`
+			Type    string `json:"type"`
+			PageNum int64  `json:"pageNum"`
+			OffsetX int64  `json:"offsetX"`
+			OffsetY int64  `json:"offsetY"`
+		} `json:"keywordSignControls"`
+	} `json:"signFiles"`
+}

service/sign_service.go

@@ -466,7 +466,7 @@ func CreateUserId(userId string, displayName string) string {
 //	WarnInfo    interface{} `json:"warn_info"`
 //}
 
-func AddContractSignatory(contractId string, signers string) string {
+func AddContractSignatory(contractId string, signers string, contract models.NewContract) string {
 
 	var url string
 
@@ -481,11 +481,55 @@ func AddContractSignatory(contractId string, signers string) string {
 
 	maprequest["contractId"] = "153497878806048027"
 
-	maprequest["signers"] = ""
+	maprequestOne := make(map[string]interface{})
 
-	var customs models.NewContract
+	maprequestTwo := make(map[string]interface{})
 
-	customs.ContractId = ""
+	var signFiles models.SignFiles
+	signFiles.DocId = 343465645
+
+	inputDataArrOne := make([]map[string]interface{}, 0)
+	inputDataArrTwo := make([]map[string]interface{}, 0)
+	for _, item := range signFiles.XySignControls {
+
+		inputDataThree := make(map[string]interface{})
+		inputDataThree["key"] = item.Key
+		inputDataThree["type"] = item.Type
+		inputDataThree["pageNum"] = item.PageNum
+		inputDataThree["positionX"] = item.PositionX
+		inputDataThree["positionY"] = item.PositionY
+
+		inputDataArrOne = append(inputDataArrOne, inputDataThree)
+	}
+
+	for _, item := range signFiles.KeywordSignControls {
+		inputDataFour := make(map[string]interface{})
+		inputDataFour["key"] = item.Key
+		inputDataFour["type"] = item.Type
+		inputDataFour["pageNum"] = item.PageNum
+		inputDataFour["keyword"] = item.KeyWord
+		inputDataFour["positionX"] = item.PositionX
+		inputDataFour["positionY"] = item.PositionY
+
+		inputDataArrTwo = append(inputDataArrTwo, inputDataFour)
+	}
+
+	maprequestTwo["xySignControls"] = inputDataArrOne
+	maprequestTwo["keywordSignControls"] = inputDataArrTwo
+	maprequestTwo["docId"] = 1234555
+
+	maprequestOne["userId"] = ""
+	maprequestOne["signerType"] = ""
+	maprequestOne["enterpriseId"] = ""
+	maprequestOne["sequence"] = ""
+	maprequestOne["sendMsg"] = false
+	maprequestOne["signFiles"] = maprequestTwo
+
+	maprequestOne["signers"] = maprequestOne
+
+	maprequest["contractId"] = contract.ContractId
+
+	maprequest["signers"] = maprequestOne
 
 	byterequest, _ := json.Marshal(maprequest)
 	reader := bytes.NewReader(byterequest)

service/statistics_service/index_evaluation_service.go

@@ -1620,7 +1620,7 @@ func FindOrgInspectionReferenceRangeTypeValue(user_org_id int64, project_id int6
 
 func FindOrgConfigRangeTypeValue(user_org_id int64, project_id int64, item_id int64) (qcs models.InspectionReference, err error) {
 	db := service.XTReadDB()
-	err = db.Model(&models.InspectionReference{}).Where("status = 1 AND org_id = ? AND project_id = ? AND id = ?", user_org_id, project_id, item_id).First(&qcs).Error
+	err = db.Model(&models.InspectionReference{}).Where("status = 1 AND org_id = ? AND project_id = ? AND item_id = ?", user_org_id, project_id, item_id).First(&qcs).Error
 	return
 }