历史排班

controllers/schedule_api_controller.go

@@ -4149,6 +4149,8 @@ func (this *ScheduleApiController) GetBloodScheduleList() {
 	}
 
 	orgId := this.GetAdminUserInfo().CurrentOrgId
+
+	fmt.Println("weekt_ywppwepwpwwep", week_type)
 	if week_type > 0 {
 		list, err := service.GetWeekDayScheduleByIdThee(orgId, targetDay.Unix(), week_time, zone)
 		for _, item := range list {

controllers/self_drug_api_congtroller.go

@@ -3499,7 +3499,7 @@ func (this *SelfDrugApiController) GetSendGoodInformation() {
 
 	orgId := this.GetAdminUserInfo().CurrentOrgId
 	fmt.Println("orgid", orgId)
-	list, _ := service.GetWarehouseOutInfo(10489)
+	list, _ := service.GetWarehouseOutInfo(10485)
 
 	for _, it := range list {
 		service.UpdateWarehosueOutInfo(it.ID, it.WarehouseOutTime)

controllers/sign_api_controller.go

@@ -35,6 +35,9 @@ func SignApiRegistRouters() {
 	//添加合同签署人
 	beego.Router("/api/sign/addcontractsignatory", &SignApiController{}, "Get:AddContractSignatory")
 
+	//获取短信验证
+	beego.Router("/api/sign/getverificationcode", &SignApiController{}, "Get:GetVerificationCode")
+
 	//后台签署（返回签署文件）
 	beego.Router("/api/sign/createbackstagesign", &SignApiController{}, "Get:CreateBackStageSign")
 }
@@ -211,64 +214,79 @@ func (this *SignApiController) AddContractSignatory() {
 
 }
 
+type Struct2401 struct {
+	someTimestampStyle []someTimestampStyle
+}
+
+type someTimestampStyle struct {
+	ControlsKey string
+	Pattern     string
+	Color       string
+}
+
 func (this *SignApiController) CreateBackStageSign() {
 
 	contractId := this.GetString("contractId")
 
 	signers := this.GetString("signers")
 	sign := service.CreateBackStageSign(contractId, signers)
-
 	sealTimestampFiles := make(map[string]interface{})
-	fontsFiles := make(map[string]interface{})
 	inputDataArr := make([]map[string]interface{}, 0)
 	signFiles := make(map[string]interface{})
-	for _, item := range sealTimestampFiles {
-		fmt.Println(item)
-		keywordSignControls := make(map[string]interface{})
-		keywordSignControls["controlsKey"] = "2"
-		keywordSignControls["pattern"] = "1"
-		keywordSignControls["color"] = "#FF0000"
-		inputDataArr = append(inputDataArr, keywordSignControls)
-	}
+
+	keywordSignControls := make(map[string]interface{})
+	keywordSignControls["controlsKey"] = "2"
+	keywordSignControls["pattern"] = 1
+	keywordSignControls["color"] = "#FF0000"
+	inputDataArr = append(inputDataArr, keywordSignControls)
 
 	sealTimestampFiles["allAddTimestamp"] = false
 	sealTimestampFiles["someTimestampStyle"] = inputDataArr
 
 	inputDataArrOne := make([]map[string]interface{}, 0)
-	for _, item := range fontsFiles {
-		fmt.Println("item", item)
-		keySignControls := make(map[string]interface{})
-		keySignControls["controlsKey"] = "1"
-		keySignControls["fontType"] = 1
-		keySignControls["fontSize"] = 8.5
-		keySignControls["fontColor"] = "#56600F"
-		keySignControls["alignment"] = 1
-		inputDataArrOne = append(inputDataArrOne, keySignControls)
-	}
-	signFiles["fonts"] = fontsFiles
+
+	keySignControls := make(map[string]interface{})
+	keySignControls["controlsKey"] = "1"
+	keySignControls["fontType"] = 1
+	keySignControls["fontSize"] = 8.5
+	keySignControls["fontColor"] = "#56600F"
+	keySignControls["alignment"] = 1
+	inputDataArrOne = append(inputDataArrOne, keySignControls)
+
+	signFiles["fonts"] = inputDataArrOne
 	signFiles["showTimestamp"] = false
 	signFiles["sealTimestamp"] = sealTimestampFiles
 	signControl := make(map[string]interface{})
-	signControl["1"] = "234535"
+	signControl["1"] = "123456"
 	signFiles["signControl"] = signControl
-
+	signFiles["docId"] = "156002269974758623"
 	inputDataArrThree := make([]map[string]interface{}, 0)
 	inputDataArrThree = append(inputDataArrThree, signFiles)
 
 	signer := make(map[string]interface{})
 
-	signer["signerId"] = ""
+	signer["signerId"] = "156002269974758623"
 	signer["isUserWishes"] = true
 	signer["userWishesWay"] = 1
-	signer["codeNumber"] = "1004"
-	signer["verifyCode"] = "13006"
+	signer["codeNumber"] = "msg202308101550388589355"
+	signer["verifyCode"] = "123456"
 	signer["signFiles"] = inputDataArrThree
 	maprequest := make(map[string]interface{})
 	maprequest["contractId"] = "156002172264252635"
 	maprequest["signer"] = signer
+
 	this.ServeSuccessJSON(map[string]interface{}{
 		"sign":       sign,
 		"maprequest": maprequest,
 	})
 	return
 }
+
+func (this *SignApiController) GetVerificationCode() {
+
+	sign := service.GetVerificationCode()
+	this.ServeSuccessJSON(map[string]interface{}{
+		"sign": sign,
+	})
+	return
+}

service/doctor_schedule_service.go

@@ -607,7 +607,7 @@ func GetPatientScheduleByPd(schedule_date int64, zoneid int64, orgid int64, clas
 		err = db.Select("x.id,x.org_id,x.name,x.type,x.sort").Preload("DeviceNumber", func(db *gorm.DB) *gorm.DB {
 			return XTReadDB().Model(&models.DeviceNumber{}).Where("status = 1").Preload("Schedule", func(db *gorm.DB) *gorm.DB {
 				return XTReadDB().Model(&models.BlodSchedule{}).Where("status = 1 AND user_org_id = ? and schedule_date = ? and schedule_type = ?", orgid, schedule_date, class_type).Preload("VmBloodPatients", "status = 1 and user_org_id = ?", orgid).Preload("BloodDialysisOrder", "status = 1 and dialysis_date = ?", schedule_date).Preload("BloodDialysisPrescription", "status = 1 and record_date = ?", schedule_date).Preload("DialysisSolution", func(db *gorm.DB) *gorm.DB {
-					return db.Where("user_org_id = ? and status = 1", orgid).Group("patient_id,mode_id").Order("created_time asc")
+					return db.Where("user_org_id = ? and status = 1 and solution_status =1", orgid).Group("patient_id,mode_id").Order("created_time asc")
 				})
 			})
 		}).Find(&list).Error
@@ -615,7 +615,7 @@ func GetPatientScheduleByPd(schedule_date int64, zoneid int64, orgid int64, clas
 		err = db.Select("x.id,x.org_id,x.name,x.type,x.sort").Preload("DeviceNumber", func(db *gorm.DB) *gorm.DB {
 			return XTReadDB().Model(&models.DeviceNumber{}).Where("status = 1").Preload("Schedule", func(db *gorm.DB) *gorm.DB {
 				return XTReadDB().Model(&models.BlodSchedule{}).Where("status = 1 AND user_org_id = ? and schedule_date = ?", orgid, schedule_date).Preload("VmBloodPatients", "status = 1 and user_org_id = ?", orgid).Preload("BloodDialysisOrder", "status = 1 and dialysis_date = ?", schedule_date).Preload("BloodDialysisPrescription", "status = 1 and record_date = ?", schedule_date).Preload("DialysisSolution", func(db *gorm.DB) *gorm.DB {
-					return db.Where("user_org_id = ? and status = 1", orgid).Group("patient_id,mode_id").Order("created_time asc")
+					return db.Where("user_org_id = ? and status = 1 and solution_status =1", orgid).Group("patient_id,mode_id").Order("created_time asc")
 				})
 			})
 		}).Find(&list).Error

service/new_stock_service.go

@@ -574,7 +574,7 @@ func AddCountFlowOne(warehouse_info_id int64, good_id int64, user_org_id int64,
 
 func GetWarehouseOutInfo(user_org_id int64) (info []*models.WarehouseOut, err error) {
 
-	err = XTReadDB().Where("org_id = ? and status =1", 10489).Find(&info).Error
+	err = XTReadDB().Where("org_id = ? and status =1", 10485).Find(&info).Error
 
 	return info, err
 }
@@ -583,7 +583,7 @@ func UpdateWarehosueOutInfo(id int64, sys_record_time int64) (models.WarehouseOu
 
 	info := models.WarehouseOutInfo{}
 
-	err := XTWriteDB().Model(&info).Where("warehouse_out_id = ? and org_id = ? ", id, 10489).Updates(map[string]interface{}{"sys_record_time": sys_record_time, "ctime": sys_record_time}).Error
+	err := XTWriteDB().Model(&info).Where("warehouse_out_id = ? and org_id = ? ", id, 10485).Updates(map[string]interface{}{"sys_record_time": sys_record_time, "ctime": sys_record_time}).Error
 
 	return info, err
 }

service/schedule_service.go

@@ -900,7 +900,7 @@ func GetWeekDayScheduleById(orgid int64, scheduleDate int64, scheduleType int64,
 	err = db.Select("x.id,x.user_org_id,x.partition_id,x.bed_id,x.patient_id,x.schedule_date,x.schedule_type,x.schedule_week,x.mode_id,x.is_export").Preload("XtPatients", "status = 1").Preload("DeviceZone", "status = 1").Preload("DeviceNumber", "status = 1").Preload("DialysisOrder", "status = 1").Preload("DoctorAdvice", func(db *gorm.DB) *gorm.DB {
 		return db.Where("status =1 and parent_id = 0").Preload("ChildDoctorAdvice", "status = 1")
 	}).Preload("HisDoctorAdviceInfo", "status = 1").Preload("DialysisPrescription", "status = 1").Preload("DialysisSolution", func(db *gorm.DB) *gorm.DB {
-		return db.Where("status =1").Order("id asc")
+		return db.Where("status =1 and solution_status =1").Order("id asc")
 	}).Find(&list).Error
 
 	return list, err
@@ -925,7 +925,7 @@ func GetWeekDayScheduleByIdThee(orgid int64, scheduleDate int64, scheduleType in
 	err = db.Select("x.id,x.user_org_id,x.partition_id,x.bed_id,x.patient_id,x.schedule_date,x.schedule_type,x.schedule_week,x.mode_id,x.is_export").Preload("XtPatients", "status = 1").Preload("DeviceZone", "status = 1").Preload("DeviceNumber", "status = 1").Preload("DialysisOrder", "status = 1 and dialysis_date = ?", scheduleDate).Preload("XtAssessmentBeforeDislysis", "status = 1 and assessment_date =?", scheduleDate).Preload("DoctorAdvice", func(db *gorm.DB) *gorm.DB {
 		return db.Where("status =1 and parent_id = 0 and advice_date = ?", scheduleDate).Preload("ChildDoctorAdvice", "status = 1")
 	}).Preload("HisDoctorAdviceInfo", "status = 1 and advice_date = ? and user_org_id = ? ", scheduleDate, orgid).Preload("DialysisPrescription", "status = 1 and record_date =? and user_org_id = ?", scheduleDate, orgid).Preload("DialysisSolution", func(db *gorm.DB) *gorm.DB {
-		return db.Where("status =1").Order("id asc")
+		return db.Where("status =1 and solution_status = 1").Order("id asc")
 	}).Preload("LastAfterWeight", func(db *gorm.DB) *gorm.DB {
 		return db.Where("user_org_id = ? and status = 1 and assessment_date < ?", orgid, scheduleDate)
 	}).Find(&list).Error
@@ -952,7 +952,7 @@ func GetWeekDayScheduleByIdTwo(orgid int64, scheduleDate int64, scheduleType int
 	err = db.Select("x.id,x.user_org_id,x.partition_id,x.bed_id,x.patient_id,x.schedule_date,x.schedule_type,x.schedule_week,x.mode_id,x.is_export,x.mode_id").Preload("XtPatients", "status = 1").Preload("DeviceZone", "status = 1").Preload("DeviceNumber", "status = 1").Preload("DialysisOrder", "status = 1 and dialysis_date =?", scheduleDate).Preload("XtAssessmentBeforeDislysis", "status = 1 and assessment_date =?", scheduleDate).Preload("DoctorAdvice", func(db *gorm.DB) *gorm.DB {
 		return db.Where("status =1 and parent_id = 0 and advice_date = ?", scheduleDate).Preload("ChildDoctorAdvice", "status = 1")
 	}).Preload("HisDoctorAdviceInfo", "status = 1 and advice_date = ?", scheduleDate).Preload("DialysisPrescription", "status = 1 and record_date = ?", scheduleDate).Preload("DialysisSolution", func(db *gorm.DB) *gorm.DB {
-		return db.Where("status =1").Order("id asc")
+		return db.Where("status =1 and solution_status =1").Order("id asc")
 	}).Preload("LastAfterWeight", func(db *gorm.DB) *gorm.DB {
 		return db.Where("user_org_id = ? and status = 1 and assessment_date < ?", orgid, scheduleDate)
 	}).Find(&list).Error

service/sign_service.go

@@ -477,55 +477,54 @@ func AddContractSignatory(contractId string, signers string, contract models.New
 
 	serviceCode := beego.AppConfig.String("serviceCode")
 
-	signFiles := make(map[string]interface{})
-
-	signFiles["docId"] = "156002172264252636"
-
+	sealTimestampFiles := make(map[string]interface{})
+	fontsFiles := make(map[string]interface{})
 	inputDataArr := make([]map[string]interface{}, 0)
-
-	for _, item := range signFiles {
-		fmt.Println("item", item)
-		xySignControls := make(map[string]interface{})
-		xySignControls["key"] = "1"
-		xySignControls["type"] = "autograph"
-		xySignControls["pageNum"] = 1
-		xySignControls["positionX"] = 100
-		xySignControls["positionY"] = 100
-		inputDataArr = append(inputDataArr, xySignControls)
-	}
-	inputDataArrTwo := make([]map[string]interface{}, 0)
-	for _, item := range signFiles {
+	signFiles := make(map[string]interface{})
+	for _, item := range sealTimestampFiles {
 		fmt.Println(item)
 		keywordSignControls := make(map[string]interface{})
-		keywordSignControls["key"] = "2"
-		keywordSignControls["type"] = "autograph"
-		keywordSignControls["pageNum"] = 1
-		keywordSignControls["keyword"] = "盖章"
-		keywordSignControls["offsetX"] = 100
-		keywordSignControls["offsetY"] = 100
-		inputDataArrTwo = append(inputDataArrTwo, keywordSignControls)
-	}
-	signFiles["xySignControls"] = inputDataArr
-	signFiles["keywordSignControls"] = inputDataArrTwo
-	inputDataArrThree := make([]map[string]interface{}, 0)
-	inputDataArrThree = append(inputDataArrThree, signFiles)
+		keywordSignControls["controlsKey"] = "2"
+		keywordSignControls["pattern"] = "1"
+		keywordSignControls["color"] = "#FF0000"
+		inputDataArr = append(inputDataArr, keywordSignControls)
+	}
 
-	signersFiles := make(map[string]interface{})
+	sealTimestampFiles["allAddTimestamp"] = false
+	sealTimestampFiles["someTimestampStyle"] = inputDataArr
 
-	signersFiles["userId"] = "DCBCD8QR2TU6B83XFF3FOHJL"
-	signersFiles["signerType"] = "1"
-	signersFiles["enterpriseId"] = "BRWAABXW3RUD4PGCYEQWRRK8"
-	signersFiles["sequence"] = "8"
-	signersFiles["sendMsg"] = false
-	signersFiles["signFiles"] = inputDataArrThree
+	inputDataArrOne := make([]map[string]interface{}, 0)
+	for _, item := range fontsFiles {
+		fmt.Println("item", item)
+		keySignControls := make(map[string]interface{})
+		keySignControls["controlsKey"] = "1"
+		keySignControls["fontType"] = 1
+		keySignControls["fontSize"] = 8.5
+		keySignControls["fontColor"] = "#56600F"
+		keySignControls["alignment"] = 1
+		inputDataArrOne = append(inputDataArrOne, keySignControls)
+	}
+	signFiles["fonts"] = inputDataArrOne
+	signFiles["showTimestamp"] = false
+	signFiles["sealTimestamp"] = sealTimestampFiles
+	signControl := make(map[string]interface{})
+	signControl["1"] = "234535"
+	signFiles["signControl"] = signControl
 
-	inputDataArrFour := make([]map[string]interface{}, 0)
+	inputDataArrThree := make([]map[string]interface{}, 0)
+	inputDataArrThree = append(inputDataArrThree, signFiles)
 
-	inputDataArrFour = append(inputDataArrFour, signersFiles)
+	signer := make(map[string]interface{})
 
+	signer["signerId"] = "156002269974758623"
+	signer["isUserWishes"] = true
+	signer["userWishesWay"] = 1
+	signer["codeNumber"] = "1004"
+	signer["verifyCode"] = "13006"
+	signer["signFiles"] = inputDataArrThree
 	maprequest := make(map[string]interface{})
 	maprequest["contractId"] = "156002172264252635"
-	maprequest["signers"] = inputDataArrFour
+	maprequest["signer"] = signer
 
 	byterequest, _ := json.Marshal(maprequest)
 	reader := bytes.NewReader(byterequest)
@@ -570,54 +569,45 @@ func CreateBackStageSign(contractId string, signers string) string {
 	serviceCode := beego.AppConfig.String("serviceCode")
 
 	sealTimestampFiles := make(map[string]interface{})
-	fontsFiles := make(map[string]interface{})
 	inputDataArr := make([]map[string]interface{}, 0)
 	signFiles := make(map[string]interface{})
-	signFiles["docId"] = "156002172264252636"
 
-	for _, item := range sealTimestampFiles {
-		fmt.Println(item)
-		keywordSignControls := make(map[string]interface{})
-		keywordSignControls["controlsKey"] = "2"
-		keywordSignControls["pattern"] = "1"
-		keywordSignControls["color"] = "#FF0000"
-		inputDataArr = append(inputDataArr, keywordSignControls)
-	}
+	keywordSignControls := make(map[string]interface{})
+	keywordSignControls["controlsKey"] = "2"
+	keywordSignControls["pattern"] = 1
+	keywordSignControls["color"] = "#FF0000"
+	inputDataArr = append(inputDataArr, keywordSignControls)
 
 	sealTimestampFiles["allAddTimestamp"] = false
 	sealTimestampFiles["someTimestampStyle"] = inputDataArr
 
 	inputDataArrOne := make([]map[string]interface{}, 0)
-	for _, item := range fontsFiles {
-		fmt.Println("item", item)
-		keySignControls := make(map[string]interface{})
-		keySignControls["controlsKey"] = "1"
-		keySignControls["fontType"] = 1
-		keySignControls["fontSize"] = 8.5
-		keySignControls["fontColor"] = "#56600F"
-		keySignControls["alignment"] = 1
-		inputDataArrOne = append(inputDataArrOne, keySignControls)
-	}
 
-	fontsFiles["fonts"] = inputDataArrOne
+	keySignControls := make(map[string]interface{})
+	keySignControls["controlsKey"] = "1"
+	keySignControls["fontType"] = 1
+	keySignControls["fontSize"] = 8.5
+	keySignControls["fontColor"] = "#56600F"
+	keySignControls["alignment"] = 1
+	inputDataArrOne = append(inputDataArrOne, keySignControls)
 
-	signFiles["fonts"] = fontsFiles
+	signFiles["fonts"] = inputDataArrOne
 	signFiles["showTimestamp"] = false
 	signFiles["sealTimestamp"] = sealTimestampFiles
 	signControl := make(map[string]interface{})
-	signControl["1"] = "234535"
+	signControl["1"] = "123456"
 	signFiles["signControl"] = signControl
-
+	signFiles["docId"] = "156002269974758623"
 	inputDataArrThree := make([]map[string]interface{}, 0)
 	inputDataArrThree = append(inputDataArrThree, signFiles)
 
 	signer := make(map[string]interface{})
 
-	signer["signerId"] = ""
+	signer["signerId"] = "156002269974758623"
 	signer["isUserWishes"] = true
 	signer["userWishesWay"] = 1
-	signer["codeNumber"] = "1004"
-	signer["verifyCode"] = "13006"
+	signer["codeNumber"] = "msg202308101909098052578"
+	signer["verifyCode"] = "123456"
 	signer["signFiles"] = inputDataArrThree
 	maprequest := make(map[string]interface{})
 	maprequest["contractId"] = "156002172264252635"
@@ -653,3 +643,49 @@ func CreateBackStageSign(contractId string, signers string) string {
 
 	return str
 }
+
+func GetVerificationCode() string {
+
+	var url string
+
+	url = "http://demo.itruscloud.com/apigate/contractpaasapi/contract/sendSmsCode"
+	appId := beego.AppConfig.String("sign_appid")
+
+	serviceKye := beego.AppConfig.String("serviceKye")
+
+	serviceCode := beego.AppConfig.String("serviceCode")
+
+	maprequest := make(map[string]interface{})
+	maprequest["contractId"] = "156002172264252635"
+	maprequest["userId"] = "DCBCD8QR2TU6B83XFF3FOHJL"
+
+	byterequest, _ := json.Marshal(maprequest)
+	reader := bytes.NewReader(byterequest)
+
+	signatureStr, _ := generateHMACSHA1SignatureOne(maprequest, serviceKye, serviceCode)
+
+	request, err := http.NewRequest("POST", url, reader)
+	if err != nil {
+		fmt.Println(err.Error())
+	}
+
+	request.Header.Set("appId", appId)
+	request.Header.Set("serviceCode", serviceCode)
+	request.Header.Set("Content-Type", "application/json;charset=UTF-8")
+	request.Header.Set("Content-Signature", signatureStr)
+	client := http.Client{}
+
+	resp, err := client.Do(request)
+	if err != nil {
+		fmt.Println(err.Error())
+
+	}
+	respBytes, err := ioutil.ReadAll(resp.Body)
+	if err != nil {
+		fmt.Println(err.Error())
+
+	}
+	str := string(respBytes)
+
+	return str
+}