Merge branch '20230223_xt_api_new_branch' of http://git.shengws.com/csx/XT_New into 20230223_xt_api_new_branch

conf/app.conf

@@ -1,6 +1,6 @@
 appname = 血透
 httpport = 9531
-runmode = prod
+runmode = dev
 #dev/prod
 
 #

controllers/dialysis_api_controller.go

@@ -4173,6 +4173,8 @@ func (c *DialysisApiController) GetDialysisOrder() {
 	//相关操作对应的操作人
 	//operators, _ := service.GetAdminUserES(adminUserInfo.CurrentOrgId, adminUserInfo.CurrentAppId, operatorIDs)
 	operators, err := service.GetAdminUserEsOne(adminUserInfo.CurrentOrgId)
+
+	fmt.Println("operators", operators)
 	templateInfo, _ := service.GetOrgInfoTemplate(adminUserInfo.CurrentOrgId)
 
 	//获取当前日期月份的第一天

controllers/dialysis_record_api_controller.go

@@ -1595,6 +1595,11 @@ func (this *DialysisRecordAPIController) FinishDialysis() {
 		tempassessmentAfterDislysis.SealingFluidDispose = lastAssessmentAfterDislysis.SealingFluidDispose
 		tempassessmentAfterDislysis.SealingFluidSpecial = lastAssessmentAfterDislysis.SealingFluidSpecial
 
+		if adminUserInfo.CurrentOrgId == 10375 {
+			tempassessmentAfterDislysis.SystolicBloodPressure = 0
+			tempassessmentAfterDislysis.DiastolicBloodPressure = 0
+		}
+
 	}
 
 	err := service.UpdateAssessmentAfterDislysisRecord(&tempassessmentAfterDislysis)

controllers/drug_stock_api_contorller.go

@@ -1171,7 +1171,7 @@ func (c *StockDrugApiController) CreateDrugWarehouseOut() {
 		StorehouseId:            storehouse_id,
 		IsCheck:                 2,
 	}
-	fmt.Println("warehouse_out_id232323322323232323233223", warehouse_out_id)
+
 	if warehouse_out_id == 0 {
 		service.AddSigleDrugWarehouseOut(&warehouseOut)
 	}
@@ -1282,7 +1282,8 @@ func (c *StockDrugApiController) CreateDrugWarehouseOut() {
 					Price:                   price,
 					TotalPrice:              total,
 					Status:                  1,
-					Ctime:                   ctime,
+					Ctime:                   warehousingOutDate.Unix(),
+					Mtime:                   ctime,
 					Remark:                  remark,
 					OrgId:                   adminUserInfo.CurrentOrgId,
 					Type:                    types,
@@ -1683,14 +1684,15 @@ func (c *StockDrugApiController) EditDrugWarehouseOut() {
 						Price:                   price,
 						TotalPrice:              total,
 						Status:                  1,
-						Ctime:                   ctime,
+						Ctime:                   warehouseOut.WarehouseOutTime,
+						Mtime:                   ctime,
 						Remark:                  remark,
 						OrgId:                   adminUserInfo.CurrentOrgId,
 						Type:                    types,
 						Manufacturer:            manufacturer,
 						Dealer:                  dealer,
 						IsSys:                   0,
-						SysRecordTime:           0,
+						SysRecordTime:           warehouseOut.WarehouseOutTime,
 						RetailPrice:             retail_price,
 						RetailTotalPrice:        retail_price_total,
 						BatchNumber:             batch_number,
@@ -1715,7 +1717,8 @@ func (c *StockDrugApiController) EditDrugWarehouseOut() {
 						Count:                   count,
 						Price:                   price,
 						Status:                  1,
-						Ctime:                   ctime,
+						Ctime:                   warehouseOut.WarehouseOutTime,
+						Mtime:                   ctime,
 						UserOrgId:               adminUserInfo.CurrentOrgId,
 						Manufacturer:            manufacturer,
 						Dealer:                  dealer,
@@ -1758,7 +1761,7 @@ func (c *StockDrugApiController) EditDrugWarehouseOut() {
 						Price:                   price,
 						TotalPrice:              total,
 						Status:                  1,
-						Ctime:                   ctime,
+						Ctime:                   warehouseOut.WarehouseOutTime,
 						Remark:                  remark,
 						OrgId:                   adminUserInfo.CurrentOrgId,
 						Mtime:                   time.Now().Unix(),
@@ -1791,7 +1794,8 @@ func (c *StockDrugApiController) EditDrugWarehouseOut() {
 						Count:                   count,
 						Price:                   price,
 						Status:                  1,
-						Ctime:                   ctime,
+						Ctime:                   warehouseOut.WarehouseOutTime,
+						Mtime:                   time.Now().Unix(),
 						UserOrgId:               adminUserInfo.CurrentOrgId,
 						Manufacturer:            manufacturer,
 						Dealer:                  dealer,

controllers/gobal_config_api_controller.go

@@ -2387,7 +2387,7 @@ func (c *GobalConfigApiController) GetDrugOutOrderPrint() {
 	warehousing, _ := service.GetExportOutOrderDrugListOne(ids)
 
 	drug_warhouse_out, _ := service.GetDrugWarehouseOutTenty(ids, admin.CurrentOrgId)
-	fmt.Println("drug_warhouse_out9999999", drug_warhouse_out)
+
 	c.ServeSuccessJSON(map[string]interface{}{
 		"info":              info,
 		"warehousing":       warehousing,

controllers/mobile_api_controllers/check_weight_api_controller.go

@@ -402,7 +402,7 @@ func (c *CheckWeightApiController) SavePatientInfoDialysis() {
 			if adminUserInfo.Org.Id == 10121 {
 				newprescribe.DialysisDurationHour = 4
 				newprescribe.DialysisDurationMinute = 0
-				newprescribe.BloodAccess = 0
+				newprescribe.BloodAccess = dialysisSolution.BloodAccess
 			}
 			//插入透析处方
 			err := service.AddSigleRecord(&newprescribe)
@@ -472,7 +472,12 @@ func (c *CheckWeightApiController) SavePatientInfoDialysis() {
 				newprescribe.TargetUltrafiltration = dewater_amount
 				newprescribe.PrescriptionWater = dewater_amount
 				newprescribe.Status = 1
-				newprescribe.Remark = lastDialysisPrescribe.Remark
+				if adminUserInfo.Org.Id != 10490 {
+					newprescribe.Remark = lastDialysisPrescribe.Remark
+				} else {
+					newprescribe.Remark = ""
+				}
+
 				newprescribe.Chaptalization = lastDialysisPrescribe.Chaptalization
 				newprescribe.PrescribingNumber = 1
 				if adminUserInfo.Org.Id == 10340 {
@@ -481,7 +486,7 @@ func (c *CheckWeightApiController) SavePatientInfoDialysis() {
 				if adminUserInfo.Org.Id == 10121 {
 					newprescribe.DialysisDurationHour = 4
 					newprescribe.DialysisDurationMinute = 0
-					newprescribe.BloodAccess = 0
+					newprescribe.BloodAccess = dialysisSolution.BloodAccess
 				}
 				err := service.AddSigleRecord(&newprescribe)
 				key := strconv.FormatInt(adminUserInfo.Org.Id, 10) + ":" + strconv.FormatInt(id, 10) + ":" + strconv.FormatInt(theAssessmentDateTime, 10) + ":" + strconv.FormatInt(mode_id, 10) + ":dialysis_prescribe"
@@ -555,7 +560,7 @@ func (c *CheckWeightApiController) SavePatientInfoDialysis() {
 				if adminUserInfo.Org.Id == 10121 {
 					newprescribe.DialysisDurationHour = 4
 					newprescribe.DialysisDurationMinute = 0
-					newprescribe.BloodAccess = 0
+					newprescribe.BloodAccess = dialysisSolution.BloodAccess
 				}
 				err := service.AddSigleRecord(&newprescribe)
 				key := strconv.FormatInt(adminUserInfo.Org.Id, 10) + ":" + strconv.FormatInt(id, 10) + ":" + strconv.FormatInt(theAssessmentDateTime, 10) + ":" + strconv.FormatInt(mode_id, 10) + ":dialysis_prescribe"
@@ -694,8 +699,9 @@ func (c *CheckWeightApiController) SavePatientInfoDialysis() {
 				evaluation.Exposed = lastPredialysisEvaluation.Exposed                         // 外漏
 				evaluation.DialysisCount = lastPredialysisEvaluation.DialysisCount             //呼吸频次
 				evaluation.Phinholing = lastPredialysisEvaluation.Phinholing                   //针眼
+
 				evaluation.Remark = lastPredialysisEvaluation.Remark
-				if adminUserInfo.Org.Id == 10318 {
+				if adminUserInfo.Org.Id == 10318 || adminUserInfo.Org.Id == 10490 {
 					evaluation.Remark = ""
 				}
 				if adminUserInfo.Org.Id == 10340 || adminUserInfo.Org.Id == 10447 {

controllers/mobile_api_controllers/dialysis_api_controller.go

@@ -2490,8 +2490,14 @@ func (c *DialysisAPIController) Finish() {
 		tempassessmentAfterDislysis.Temperature = endmonitorRecords.Temperature
 		tempassessmentAfterDislysis.PulseFrequency = endmonitorRecords.PulseFrequency
 		tempassessmentAfterDislysis.BreathingRate = endmonitorRecords.BreathingRate
-		tempassessmentAfterDislysis.SystolicBloodPressure = endmonitorRecords.SystolicBloodPressure
-		tempassessmentAfterDislysis.DiastolicBloodPressure = endmonitorRecords.DiastolicBloodPressure
+		if adminUserInfo.Org.Id != 10375 {
+			tempassessmentAfterDislysis.SystolicBloodPressure = endmonitorRecords.SystolicBloodPressure
+			tempassessmentAfterDislysis.DiastolicBloodPressure = endmonitorRecords.DiastolicBloodPressure
+		} else {
+			tempassessmentAfterDislysis.SystolicBloodPressure = 0
+			tempassessmentAfterDislysis.DiastolicBloodPressure = 0
+		}
+
 		if adminUserInfo.Org.Id != 10445 {
 			tempassessmentAfterDislysis.ActualUltrafiltration = endmonitorRecords.UltrafiltrationVolume
 		}
@@ -2692,6 +2698,14 @@ func (c *DialysisAPIController) Finish() {
 			tempassessmentAfterDislysis.ActualDisplacement = 0
 		}
 
+		if adminUserInfo.Org.Id != 10375 {
+			tempassessmentAfterDislysis.SystolicBloodPressure = endmonitorRecords.SystolicBloodPressure
+			tempassessmentAfterDislysis.DiastolicBloodPressure = endmonitorRecords.DiastolicBloodPressure
+		} else {
+			tempassessmentAfterDislysis.SystolicBloodPressure = 0
+			tempassessmentAfterDislysis.DiastolicBloodPressure = 0
+		}
+
 	}
 
 	finish := models.XtDialysisFinish{
@@ -3303,7 +3317,7 @@ func (this *DialysisAPIController) StartDialysis() {
 			}
 
 			//针对
-			if adminUserInfo.Org.Id == 10471 || adminUserInfo.Org.Id == 3877 {
+			if adminUserInfo.Org.Id == 10471 || adminUserInfo.Org.Id == 3877 || adminUserInfo.Org.Id == 10460 {
 
 				ultrafiltration_rate = math.Floor(prescription.TargetUltrafiltration / float64(totalMin) * 60 * 1000)
 				ultrafiltration_rate = ultrafiltration_rate / 1000
@@ -4216,7 +4230,6 @@ func (this *DialysisAPIController) GetLastMonitorRecordTody() {
 		if prescription.TargetUltrafiltration > 0 && prescription.DialysisDurationHour > 0 {
 
 			totalMin := prescription.DialysisDurationHour*60 + prescription.DialysisDurationMinute
-			fmt.Println("hahhdahahah", template.TemplateId)
 			if (template.TemplateId == 6 || template.TemplateId == 65 || adminInfo.Org.Id == 10375) && adminInfo.Org.Id != 9538 {
 				fmt.Println("hahhdahahah")
 				ultrafiltration_rate = math.Floor(prescription.TargetUltrafiltration / float64(totalMin) * 60 * 1000)
@@ -4224,6 +4237,10 @@ func (this *DialysisAPIController) GetLastMonitorRecordTody() {
 
 			}
 
+			if adminInfo.Org.Id == 10510 {
+				record.UltrafiltrationRate = 0
+			}
+
 			if template.TemplateId == 32 || template.TemplateId == 34 || template.TemplateId == 36 {
 
 				ultrafiltration_rate = math.Floor(prescription.TargetUltrafiltration / float64(totalMin) * 60 * 1)
@@ -4278,6 +4295,13 @@ func (this *DialysisAPIController) GetLastMonitorRecordTody() {
 
 			}
 
+			if adminInfo.Org.Id == 10460 {
+
+				ultrafiltration_rate = math.Floor(prescription.TargetUltrafiltration / float64(totalMin) * 60 * 1000)
+				record.UltrafiltrationRate = ultrafiltration_rate / 1000
+
+			}
+
 			//if template.TemplateId == 47 {
 			//	ultrafiltration_rate = math.Floor(prescription.TargetUltrafiltration * 60 / float64(totalMin))
 			//	record.UltrafiltrationRate = ultrafiltration_rate
@@ -4308,7 +4332,7 @@ func (this *DialysisAPIController) GetLastMonitorRecordTody() {
 
 		if ultrafiltration_rate > 0 {
 			ultrafiltration_volume := math.Floor(float64(record.OperateTime+3600-fristrecord.OperateTime) / 3600 * ultrafiltration_rate)
-			fmt.Println("ultrafiltration_volume", ultrafiltration_volume)
+
 			record.UltrafiltrationVolume = ultrafiltration_volume
 		}
 
@@ -4317,7 +4341,14 @@ func (this *DialysisAPIController) GetLastMonitorRecordTody() {
 	if adminInfo.Org.Id == 10471 {
 
 		ultrafiltration_volume := math.Floor(float64(record.OperateTime+3600-fristrecord.OperateTime) / 3600 * ultrafiltration_rate)
-		fmt.Println("ultrafiltration_volume", ultrafiltration_volume)
+
+		record.UltrafiltrationVolume = ultrafiltration_volume / 1000
+	}
+
+	if adminInfo.Org.Id == 10460 {
+
+		ultrafiltration_volume := math.Floor(float64(record.OperateTime+3600-fristrecord.OperateTime) / 3600 * ultrafiltration_rate)
+
 		record.UltrafiltrationVolume = ultrafiltration_volume / 1000
 	}
 	//长沙南雅累计血容量自动计算
@@ -4329,6 +4360,10 @@ func (this *DialysisAPIController) GetLastMonitorRecordTody() {
 		record.DisplacementQuantity = record.DisplacementQuantity + record.DisplacementQuantity
 	}
 
+	if adminInfo.Org.Id == 10510 {
+		record.UltrafiltrationVolume = 0
+	}
+
 	this.ServeSuccessJSON(map[string]interface{}{
 		"monitor": record,
 	})

controllers/mobile_api_controllers/patient_api_controller.go

@@ -655,7 +655,17 @@ func (c *PatientApiController) ExecDoctorAdvice() {
 
 		if groupno > 0 {
 			advices, _ := service.FindAllDoctorAdviceByGoroupNo(adminUserInfo.Org.Id, groupno)
+
 			for _, item := range advices {
+				//恒泰中医院
+				if item.UserOrgId == 10490 {
+					if item.DrugId == 0 || item.DrugNameId == 0 {
+						//从字典里面查找
+						drug, _ := service.GetBaseDrugByName(item.AdviceName, item.UserOrgId)
+						service.UpdateDoctorAdviceByGoroupNo(item.ID, drug.ID)
+
+					}
+				}
 				if item.ExecutionState == 2 {
 					advice = item
 				}
@@ -663,6 +673,15 @@ func (c *PatientApiController) ExecDoctorAdvice() {
 		} else {
 			advices, _ := service.FindDoctorAdviceByIds(adminUserInfo.Org.Id, ids)
 			for _, item := range advices {
+				//恒泰中医院
+				if item.UserOrgId == 10490 {
+					if item.DrugId == 0 || item.DrugNameId == 0 {
+						//从字典里面查找
+						drug, _ := service.GetBaseDrugByName(item.AdviceName, item.UserOrgId)
+						service.UpdateDoctorAdviceByGoroupNo(item.ID, drug.ID)
+
+					}
+				}
 				if item.ExecutionState == 2 {
 					advice = item
 				}

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,8 +35,17 @@ func SignApiRegistRouters() {
 	//添加合同签署人
 	beego.Router("/api/sign/addcontractsignatory", &SignApiController{}, "Get:AddContractSignatory")
 
-	//beego.Router("/api/sign/contractsignatory", &SignApiController{}, "Get:CreateSignTest")
-	beego.Router("/api/sign/contractsignatory", &SignApiController{}, "Get:CreateContractsignatory")
+	//获取短信验证
+	beego.Router("/api/sign/getverificationcode", &SignApiController{}, "Get:GetVerificationCode")
+
+	//后台签署（返回签署文件）
+	beego.Router("/api/sign/createbackstagesign", &SignApiController{}, "Get:CreateBackStageSign")
+
+	//创建企业印章并添加授权用户
+	beego.Router("/api/sign/totestelment", &SignApiController{}, "Get:CreateEnterprise")
+
+	//测试PDF
+	beego.Router("/api/sign/totestthrityment", &SignApiController{}, "Get:GetTestThrityMent")
 }
 
 // 短信服务接口
@@ -191,6 +200,7 @@ func (this *SignApiController) CreateEnterPriseRealName() {
 	return
 }
 
+// 添加合同签署人
 func (this *SignApiController) AddContractSignatory() {
 
 	contractId := this.GetString("contractId")
@@ -199,91 +209,99 @@ func (this *SignApiController) AddContractSignatory() {
 
 	var newContract models.NewContract
 
-	newContract.ContractId = "153497878806048027"
+	newContract.ContractId = "156001444267295949"
 
-	service.AddContractSignatory(contractId, signers, newContract)
+	sign := service.AddContractSignatory(contractId, signers, newContract)
 
-	maprequest := make(map[string]interface{})
+	this.ServeSuccessJSON(map[string]interface{}{
+		"sign": sign,
+	})
+	return
 
-	maprequest["contractId"] = "153497878806048027"
+}
 
-	//maprequestOne := make(map[string]interface{})
+type Struct2401 struct {
+	someTimestampStyle []someTimestampStyle
+}
 
-	maprequestTwo := make(map[string]interface{})
+type someTimestampStyle struct {
+	ControlsKey string
+	Pattern     string
+	Color       string
+}
 
-	var signFiles models.SignFiles
-	var sig []*models.Signers
-	signFiles.DocId = 343465645
+func (this *SignApiController) CreateBackStageSign() {
 
-	inputDataArrOne := make([]map[string]interface{}, 0)
-	inputDataArrTwo := make([]map[string]interface{}, 0)
+	contractId := this.GetString("contractId")
 
-	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)
-	}
+	signers := this.GetString("signers")
+	sign := service.CreateBackStageSign(contractId, signers)
+	sealTimestampFiles := make(map[string]interface{})
+	inputDataArr := make([]map[string]interface{}, 0)
+	signFiles := make(map[string]interface{})
 
-	fmt.Println("inputDataArrOne", inputDataArrOne)
+	keywordSignControls := make(map[string]interface{})
+	keywordSignControls["controlsKey"] = "2"
+	keywordSignControls["pattern"] = 1
+	keywordSignControls["color"] = "#FF0000"
+	inputDataArr = append(inputDataArr, keywordSignControls)
 
-	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
+	sealTimestampFiles["allAddTimestamp"] = false
+	sealTimestampFiles["someTimestampStyle"] = inputDataArr
 
-		inputDataArrTwo = append(inputDataArrTwo, inputDataFour)
-	}
+	inputDataArrOne := make([]map[string]interface{}, 0)
 
-	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
+	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"] = "123456"
+	signFiles["signControl"] = signControl
+	signFiles["docId"] = "156190809375377646"
+	inputDataArrThree := make([]map[string]interface{}, 0)
+	inputDataArrThree = append(inputDataArrThree, signFiles)
 
-	}
+	signer := make(map[string]interface{})
 
-	maprequestTwo["xySignControls"] = inputDataArrOne
-	maprequestTwo["keywordSignControls"] = inputDataArrTwo
-	maprequestTwo["docId"] = 1234555
+	signer["signerId"] = "156002269974758623"
+	signer["isUserWishes"] = true
+	signer["userWishesWay"] = 1
+	signer["codeNumber"] = "msg202308111444501897422"
+	signer["verifyCode"] = "978176"
+	signer["signFiles"] = inputDataArrThree
+	maprequest := make(map[string]interface{})
+	maprequest["contractId"] = "156190809375377645"
+	maprequest["signer"] = signer
 
-	maprequest["contractId"] = newContract.ContractId
+	this.ServeSuccessJSON(map[string]interface{}{
+		"sign":       sign,
+		"maprequest": maprequest,
+	})
+	return
+}
 
-	maprequest["signers"] = inputDataArrThree
+func (this *SignApiController) GetVerificationCode() {
 
+	sign := service.GetVerificationCode()
 	this.ServeSuccessJSON(map[string]interface{}{
-		"inputDataArrOne": inputDataArrOne,
-		"maprequestOne":   maprequest,
-		"maprequestTwo":   maprequestTwo,
+		"sign": sign,
 	})
 	return
 }
 
-func (this *SignApiController) CreateContractsignatory() {
+func (this *SignApiController) CreateEnterprise() {
 
-	list, _ := service.GetHisDoctorAdviceInfoList(10215)
-
-	for _, item := range list {
-		service.UpdatePatietPrice(item.ID, item.RetailPrice)
-	}
+	sign := service.CreateEnterprise()
 	this.ServeSuccessJSON(map[string]interface{}{
-		"sign": "msg",
+		"sign": sign,
 	})
 	return
 }

controllers/stock_in_api_controller.go

@@ -1356,6 +1356,7 @@ func (c *StockManagerApiController) CreateWarehouseOut() {
 					StockCount:              stock_count,
 					IsCheck:                 2,
 					RegisterNumber:          register_number,
+					SysRecordTime:           warehouseOut.WarehouseOutTime,
 				}
 				warehousingOutInfo = append(warehousingOutInfo, warehouseOutInfo)
 
@@ -1605,7 +1606,6 @@ func (c *StockManagerApiController) EditWarehouseOut() {
 		return
 	}
 
-	ctime := time.Now().Unix()
 	mtime := time.Now().Unix()
 	adminUserInfo := c.GetAdminUserInfo()
 
@@ -1742,12 +1742,13 @@ func (c *StockManagerApiController) EditWarehouseOut() {
 						Price:                   price,
 						TotalPrice:              total,
 						Status:                  1,
-						Ctime:                   ctime,
+						Ctime:                   warehouseOut.WarehouseOutTime,
+						Mtime:                   time.Now().Unix(),
 						Remark:                  remark,
 						OrgId:                   adminUserInfo.CurrentOrgId,
 						Type:                    types,
 						IsSys:                   0,
-						SysRecordTime:           0,
+						SysRecordTime:           warehouseOut.WarehouseOutTime,
 						Number:                  number,
 						ExpiryDate:              expiryDate,
 						ProductDate:             productDate,
@@ -1788,7 +1789,7 @@ func (c *StockManagerApiController) EditWarehouseOut() {
 						Price:                   price,
 						TotalPrice:              total,
 						Status:                  1,
-						Ctime:                   ctime,
+						Ctime:                   warehouseOut.WarehouseOutTime,
 						Remark:                  remark,
 						OrgId:                   adminUserInfo.CurrentOrgId,
 						Mtime:                   time.Now().Unix(),

models/drug.go

@@ -94,6 +94,7 @@ type BaseDrugLibSeven struct {
 	SumCount   int64  `gorm:"column:sum_count" json:"sum_count" form:"sum_count"`
 	IsUse      int64  `gorm:"column:is_user" json:"is_user" form:"is_user"`
 	IsPharmacy int64  `gorm:"column:is_pharmacy" json:"is_pharmacy" form:"is_pharmacy"`
+	OrgId      int64  `gorm:"column:org_id" json:"org_id" form:"org_id"`
 }
 
 func (BaseDrugLibSeven) TableName() string {

models/new_stock_models.go

@@ -262,18 +262,21 @@ func (VmNewStockFlowTwenty) TableName() string {
 }
 
 type GoodInfoTwenty struct {
-	ID                     int64                   `gorm:"column:id" json:"id" form:"id"`
-	SpecificationName      string                  `gorm:"column:specification_name" json:"specification_name" form:"specification_name"`
-	GoodTypeId             int64                   `gorm:"column:good_type_id" json:"good_type_id" form:"good_type_id"`
-	BuyPrice               float64                 `gorm:"column:buy_price" json:"buy_price" form:"buy_price"`
-	Manufacturer           int64                   `gorm:"column:manufacturer" json:"manufacturer" form:"manufacturer"`
-	Status                 int64                   `gorm:"column:status" json:"status" form:"status"`
-	OrgId                  int64                   `gorm:"column:org_id" json:"org_id" form:"org_id"`
-	GoodName               string                  `gorm:"column:good_name" json:"good_name" form:"good_name"`
-	RetailPrice            float64                 `gorm:"column:retail_price" json:"retail_price" form:"retail_price"`
-	PackingUnit            string                  `gorm:"column:packing_unit" json:"packing_unit" form:"packing_unit"`
-	PackingPrice           float64                 `gorm:"column:packing_price" json:"packing_price" form:"packing_price"`
-	StWarehousingInfo      []*StWarehousingInfo    `gorm:"ForeignKey:GoodId;AssociationForeignKey:ID" json:"xt_warehouse_info"`
+	ID                int64                `gorm:"column:id" json:"id" form:"id"`
+	SpecificationName string               `gorm:"column:specification_name" json:"specification_name" form:"specification_name"`
+	GoodTypeId        int64                `gorm:"column:good_type_id" json:"good_type_id" form:"good_type_id"`
+	BuyPrice          float64              `gorm:"column:buy_price" json:"buy_price" form:"buy_price"`
+	Manufacturer      int64                `gorm:"column:manufacturer" json:"manufacturer" form:"manufacturer"`
+	Dealer            int64                `gorm:"column:dealer" json:"dealer" form:"dealer"`
+	Status            int64                `gorm:"column:status" json:"status" form:"status"`
+	OrgId             int64                `gorm:"column:org_id" json:"org_id" form:"org_id"`
+	GoodName          string               `gorm:"column:good_name" json:"good_name" form:"good_name"`
+	RetailPrice       float64              `gorm:"column:retail_price" json:"retail_price" form:"retail_price"`
+	PackingUnit       string               `gorm:"column:packing_unit" json:"packing_unit" form:"packing_unit"`
+	PackingPrice      float64              `gorm:"column:packing_price" json:"packing_price" form:"packing_price"`
+	GoodNumber        string               `gorm:"column:good_number" json:"good_number" form:"good_number"`
+	StWarehousingInfo []*StWarehousingInfo `gorm:"ForeignKey:GoodId;AssociationForeignKey:ID" json:"xt_warehouse_info"`
+
 	WarehousingInfoOne     []*StartWarehousingInfo `gorm:"json:"warehouse_info"` //期间增加
 	WarehousingInfoStart   []*StartWarehousingInfo `gorm:"json:"warehouse_info_start"`
 	WarehousingInfoEnd     []*StartWarehousingInfo `gorm:"json:"warehouse_info_end"`
@@ -399,6 +402,7 @@ type VmBaseDrugTwenty struct {
 	MinPrice                         float64           `gorm:"column:min_price" json:"min_price" form:"min_price"`
 	LastPrice                        float64           `gorm:"column:last_price" json:"last_price" form:"last_price"`
 	Manufacturer                     int64             `gorm:"column:manufacturer" json:"manufacturer" form:"manufacturer"`
+	Dealer                           int64             `gorm:"column:dealer" json:"dealer" form:"dealer"`
 	Status                           int64             `gorm:"column:status" json:"status" form:"status"`
 	Ctime                            int64             `gorm:"column:ctime" json:"ctime" form:"ctime"`
 	Mtime                            int64             `gorm:"column:mtime" json:"mtime" form:"mtime"`

models/self_drug_models.go

@@ -40,42 +40,42 @@ type XtBaseDrug struct {
 	DrugDoseUnit           int64   `gorm:"column:drug_dose_unit" json:"drug_dose_unit" form:"drug_dose_unit"`
 	MedicalInsuranceNumber string  `gorm:"column:medical_insurance_number" json:"medical_insurance_number" form:"medical_insurance_number"`
 	ProvincesCode          string  `gorm:"column:provinces_code" json:"provinces_code" form:"provinces_code"`
-
-	Manufacturer          int64   `gorm:"column:manufacturer" json:"manufacturer" form:"manufacturer"`
-	PharmacologyCategory  int64   `gorm:"column:pharmacology_category" json:"pharmacology_category" form:"pharmacology_category"`
-	StatisticsCategory    int64   `gorm:"column:statistics_category" json:"statistics_category" form:"statistics_category"`
-	Code                  string  `gorm:"column:code" json:"code" form:"code"`
-	IsSpecialDiseases     int64   `gorm:"column:is_special_diseases" json:"is_special_diseases" form:"is_special_diseases"`
-	IsRecord              int64   `gorm:"column:is_record" json:"is_record" form:"is_record"`
-	Agent                 string  `gorm:"column:agent" json:"agent" form:"agent"`
-	DrugStatus            string  `gorm:"column:drug_status" json:"drug_status" form:"drug_status"`
-	LimitRemark           string  `gorm:"column:limit_remark" json:"limit_remark" form:"limit_remark"`
-	DeliveryWay           string  `gorm:"column:delivery_way" json:"delivery_way" form:"delivery_way"`
-	ExecutionFrequency    string  `gorm:"column:execution_frequency" json:"execution_frequency" form:"execution_frequency"`
-	SingleDose            float64 `gorm:"column:single_dose" json:"single_dose" form:"single_dose"`
-	PrescribingNumber     float64 `gorm:"column:prescribing_number" json:"prescribing_number" form:"prescribing_number"`
-	Label                 int64   `gorm:"column:label" json:"label" form:"label"`
-	Sort                  int64   `gorm:"column:sort" json:"sort" form:"sort"`
-	IsUseDoctorAdvice     int64   `gorm:"column:is_use_doctor_advice" json:"is_use_doctor_advice" form:"is_use_doctor_advice"`
-	IsDefault             int64   `gorm:"column:is_default" json:"is_default" form:"is_default"`
-	IsChargePredict       int64   `gorm:"column:is_charge_predict" json:"is_charge_predict" form:"is_charge_predict"`
-	IsStatisticsWork      int64   `gorm:"column:is_statistics_work" json:"is_statistics_work" form:"is_statistics_work"`
-	IsChargeUse           int64   `gorm:"column:is_charge_use" json:"is_charge_use" form:"is_charge_use"`
-	Status                int64   `gorm:"column:status" json:"status" form:"status"`
-	Ctime                 int64   `gorm:"column:ctime" json:"ctime" form:"ctime"`
-	Mtime                 int64   `gorm:"column:mtime" json:"mtime" form:"mtime"`
-	OrgId                 int64   `gorm:"column:org_id" json:"org_id" form:"org_id"`
-	HospApprFlag          int64   `gorm:"column:hosp_appr_flag" json:"hosp_appr_flag" form:"hosp_appr_flag"`
-	LmtUsedFlag           int64   `gorm:"column:lmt_used_flag" json:"lmt_used_flag" form:"lmt_used_flag"`
-	Total                 float64 `gorm:"column:total" json:"total" form:"total"`
-	PrescribingNumberUnit string  `gorm:"column:prescribing_number_unit" json:"prescribing_number_unit" form:"prescribing_number_unit"`
-	MinNumber             int64   `gorm:"column:min_number" json:"min_number" form:"min_number"`
-	Dose                  string  `gorm:"column:dose" json:"dose" form:"dose"`
-	DoseUnit              string  `gorm:"column:dose_unit" json:"dose_unit" form:"dose_unit"`
-	DrugDay               string  `gorm:"column:drug_day" json:"drug_day" form:"drug_day"`
-	MinPrice              float64 `gorm:"column:min_price" json:"min_price" form:"min_price"`
-	IsUse                 int64   `gorm:"column:is_user" json:"is_user" form:"is_user"`
-	IsPharmacy            int64   `gorm:"column:is_pharmacy" json:"is_pharmacy" form:"is_pharmacy"`
+	Dealer                 int64   `gorm:"column:dealer" json:"dealer" form:"dealer"`
+	Manufacturer           int64   `gorm:"column:manufacturer" json:"manufacturer" form:"manufacturer"`
+	PharmacologyCategory   int64   `gorm:"column:pharmacology_category" json:"pharmacology_category" form:"pharmacology_category"`
+	StatisticsCategory     int64   `gorm:"column:statistics_category" json:"statistics_category" form:"statistics_category"`
+	Code                   string  `gorm:"column:code" json:"code" form:"code"`
+	IsSpecialDiseases      int64   `gorm:"column:is_special_diseases" json:"is_special_diseases" form:"is_special_diseases"`
+	IsRecord               int64   `gorm:"column:is_record" json:"is_record" form:"is_record"`
+	Agent                  string  `gorm:"column:agent" json:"agent" form:"agent"`
+	DrugStatus             string  `gorm:"column:drug_status" json:"drug_status" form:"drug_status"`
+	LimitRemark            string  `gorm:"column:limit_remark" json:"limit_remark" form:"limit_remark"`
+	DeliveryWay            string  `gorm:"column:delivery_way" json:"delivery_way" form:"delivery_way"`
+	ExecutionFrequency     string  `gorm:"column:execution_frequency" json:"execution_frequency" form:"execution_frequency"`
+	SingleDose             float64 `gorm:"column:single_dose" json:"single_dose" form:"single_dose"`
+	PrescribingNumber      float64 `gorm:"column:prescribing_number" json:"prescribing_number" form:"prescribing_number"`
+	Label                  int64   `gorm:"column:label" json:"label" form:"label"`
+	Sort                   int64   `gorm:"column:sort" json:"sort" form:"sort"`
+	IsUseDoctorAdvice      int64   `gorm:"column:is_use_doctor_advice" json:"is_use_doctor_advice" form:"is_use_doctor_advice"`
+	IsDefault              int64   `gorm:"column:is_default" json:"is_default" form:"is_default"`
+	IsChargePredict        int64   `gorm:"column:is_charge_predict" json:"is_charge_predict" form:"is_charge_predict"`
+	IsStatisticsWork       int64   `gorm:"column:is_statistics_work" json:"is_statistics_work" form:"is_statistics_work"`
+	IsChargeUse            int64   `gorm:"column:is_charge_use" json:"is_charge_use" form:"is_charge_use"`
+	Status                 int64   `gorm:"column:status" json:"status" form:"status"`
+	Ctime                  int64   `gorm:"column:ctime" json:"ctime" form:"ctime"`
+	Mtime                  int64   `gorm:"column:mtime" json:"mtime" form:"mtime"`
+	OrgId                  int64   `gorm:"column:org_id" json:"org_id" form:"org_id"`
+	HospApprFlag           int64   `gorm:"column:hosp_appr_flag" json:"hosp_appr_flag" form:"hosp_appr_flag"`
+	LmtUsedFlag            int64   `gorm:"column:lmt_used_flag" json:"lmt_used_flag" form:"lmt_used_flag"`
+	Total                  float64 `gorm:"column:total" json:"total" form:"total"`
+	PrescribingNumberUnit  string  `gorm:"column:prescribing_number_unit" json:"prescribing_number_unit" form:"prescribing_number_unit"`
+	MinNumber              int64   `gorm:"column:min_number" json:"min_number" form:"min_number"`
+	Dose                   string  `gorm:"column:dose" json:"dose" form:"dose"`
+	DoseUnit               string  `gorm:"column:dose_unit" json:"dose_unit" form:"dose_unit"`
+	DrugDay                string  `gorm:"column:drug_day" json:"drug_day" form:"drug_day"`
+	MinPrice               float64 `gorm:"column:min_price" json:"min_price" form:"min_price"`
+	IsUse                  int64   `gorm:"column:is_user" json:"is_user" form:"is_user"`
+	IsPharmacy             int64   `gorm:"column:is_pharmacy" json:"is_pharmacy" form:"is_pharmacy"`
 }
 
 func (XtBaseDrug) TableName() string {

service/dialysis_service.go

@@ -639,7 +639,7 @@ func FindPunctureNurse(adminid int64, appid int64, orgid int64) (models.App_Role
 	role := models.App_Roles{}
 	//err := UserReadDB().Where("admin_user_id = ? and app_id = ? and org_id = ?", adminid, appid, orgid).Find(&role).Error
 	//return role, err
-	db := UserReadDB().Table("sgj_user_admin_role as r").Where("r.status =1")
+	db := UserReadDB().Table("sgj_user_admin_role as r")
 	err := db.Select("r.id,r.admin_user_id,r.org_id,r.role_id,r.user_name,r.avatar,r.user_type,r.user_title,r.intro,r.status,r.ctime,e.url").Joins("left join sgj_user_admin_electronic_signature as e on e.creator = r.admin_user_id").Where("r.admin_user_id = ? and r.app_id = ? and r.org_id = ?", adminid, appid, orgid).Find(&role).Error
 	return role, err
 }

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/new_warehouse_service.go

@@ -813,6 +813,7 @@ func BloodDrugDeliverInfo(orgID int64, prescribingNumber float64, warehouseout *
 		}
 
 		//如果本次出库数据大于历史出库数据 新增1条流水
+
 		if deliver_number > (out_count - cancel_count) {
 			drugflow := models.DrugFlow{
 				WarehouseOutOrderNumber: warehouseout.WarehouseOutOrderNumber,
@@ -1262,7 +1263,7 @@ func BloodDrugDeliverInfo(orgID int64, prescribingNumber float64, warehouseout *
 }
 
 // 药品自动出库 递归方式
-func BloodHisDrugDeliverInfo(orgID int64, prescribingNumber float64, warehouseout *models.DrugWarehouseOut, drup *models.BaseDrugLib, advice *models.HisDoctorAdviceInfo) (err error) {
+func BloodHisDrugDeliverInfo(orgID int64, prescribingNumber float64, warehouseout *models.DrugWarehouseOut, drup *models.BaseDrugLib, advice *models.HisDoctorAdviceInfo, hisprescribingNumber float64) (err error) {
 
 	drugError := models.XtDrugError{
 		UserOrgId:             orgID,
@@ -1280,11 +1281,15 @@ func BloodHisDrugDeliverInfo(orgID int64, prescribingNumber float64, warehouseou
 	CreateDrugError(drugError)
 	// 判断处方里药品单位是拆零单位还是包装单位,	如果是包装单位，则根据规格，将包装数量转为拆零数量
 	var deliver_number int64 = 0
+	var deliver_number_one int64 = 0
 	var stock_number int64 = 0
 
 	prescribingNumber_temp := strconv.FormatFloat(math.Abs(prescribingNumber), 'f', 0, 64)
 	count, _ := strconv.ParseInt(prescribingNumber_temp, 10, 64)
 
+	prescribingNumber_temp_one := strconv.FormatFloat(math.Abs(hisprescribingNumber), 'f', 0, 64)
+	countone, _ := strconv.ParseInt(prescribingNumber_temp_one, 10, 64)
+
 	var drug_price float64
 	if advice.PrescribingNumberUnit == drup.MaxUnit {
 		deliver_number = count * drup.MinNumber
@@ -1294,6 +1299,16 @@ func BloodHisDrugDeliverInfo(orgID int64, prescribingNumber float64, warehouseou
 
 	}
 
+	if advice.PrescribingNumberUnit == drup.MaxUnit {
+		deliver_number_one = countone * drup.MinNumber
+
+	} else {
+		deliver_number_one = countone
+
+	}
+
+	fmt.Println(deliver_number_one)
+
 	if advice.PrescribingNumberUnit == drup.MaxUnit {
 		drug_price = drup.RetailPrice
 	}
@@ -1320,6 +1335,7 @@ func BloodHisDrugDeliverInfo(orgID int64, prescribingNumber float64, warehouseou
 
 			ChangeMaxNumber(lastWarehouse.ID, stockMax)
 			UpdateMinNumber(lastWarehouse.ID, stockMin)
+
 		}
 	}
 
@@ -1493,7 +1509,8 @@ func BloodHisDrugDeliverInfo(orgID int64, prescribingNumber float64, warehouseou
 			WarehouseOutOrderNumber: warehouseout.WarehouseOutOrderNumber,
 			WarehouseOutId:          warehouseout.ID,
 			Status:                  1,
-			Ctime:                   time.Now().Unix(),
+			Ctime:                   advice.RecordDate,
+			Mtime:                   time.Now().Unix(),
 			Remark:                  warehouse.Remark,
 			OrgId:                   orgID,
 			Type:                    1,
@@ -1542,33 +1559,41 @@ func BloodHisDrugDeliverInfo(orgID int64, prescribingNumber float64, warehouseou
 			}
 		}
 		if lastDrugOutInfo.ID > 0 {
-			var his_count int64
-			if lastDrugOutInfo.CountUnit == drup.MaxUnit {
-				his_count = lastDrugOutInfo.Count * drup.MinNumber
-			}
-			if lastDrugOutInfo.CountUnit == drup.MinUnit {
-				his_count = lastDrugOutInfo.Count
-			}
-			if deliver_number != his_count {
-				errThree := UpdateSigleDrugWarehouseOutInfo(lastDrugOutInfo.ID, warehouseOutInfo)
-				if errThree != nil {
-					drugError := models.XtDrugError{
-						UserOrgId:             orgID,
-						DrugId:                advice.DrugId,
-						RecordDate:            advice.AdviceDate,
-						PatientId:             advice.PatientId,
-						Remark:                "更新出库单失败",
-						Status:                1,
-						Ctime:                 time.Now().Unix(),
-						Mtime:                 0,
-						SumCount:              0,
-						Prescribingnumber:     advice.PrescribingNumber,
-						PrescribingNumberUnit: advice.PrescribingNumberUnit,
-					}
-					CreateDrugError(drugError)
-					return errThree
-				}
-			}
+
+			//删除在新增
+			UpdateDrugWarehouseOutInfoTen(lastDrugOutInfo.PatientId, lastDrugOutInfo.SysRecordTime, advice.ID)
+
+			AddSigleDrugWarehouseOutInfo(warehouseOutInfo)
+
+			//var his_count int64
+			//if lastDrugOutInfo.CountUnit == drup.MaxUnit {
+			//	his_count = lastDrugOutInfo.Count * drup.MinNumber
+			//}
+			//if lastDrugOutInfo.CountUnit == drup.MinUnit {
+			//	his_count = lastDrugOutInfo.Count
+			//}
+			//fmt.Println("deliver_number", deliver_number)
+			//fmt.Println("his_countwowowoowow", his_count)
+			//if deliver_number != his_count {
+			//	errThree := UpdateSigleDrugWarehouseOutInfo(lastDrugOutInfo.ID, warehouseOutInfo)
+			//	if errThree != nil {
+			//		drugError := models.XtDrugError{
+			//			UserOrgId:             orgID,
+			//			DrugId:                advice.DrugId,
+			//			RecordDate:            advice.AdviceDate,
+			//			PatientId:             advice.PatientId,
+			//			Remark:                "更新出库单失败",
+			//			Status:                1,
+			//			Ctime:                 time.Now().Unix(),
+			//			Mtime:                 0,
+			//			SumCount:              0,
+			//			Prescribingnumber:     advice.PrescribingNumber,
+			//			PrescribingNumberUnit: advice.PrescribingNumberUnit,
+			//		}
+			//		CreateDrugError(drugError)
+			//		return errThree
+			//	}
+			//}
 		}
 
 		var out_count int64
@@ -1585,11 +1610,7 @@ func BloodHisDrugDeliverInfo(orgID int64, prescribingNumber float64, warehouseou
 			cancel_count += item.Count
 		}
 
-		//如果本次出库数据大于历史出库数据 新增1条流水
-		//fmt.Println("deliver_number233233223232wi", deliver_number)
-		//fmt.Println("out_coutn23333333333333333", out_count)
-		//fmt.Println("cancel_coutn099992ow", cancel_count)
-		if deliver_number >= (out_count - cancel_count) {
+		if deliver_number_one-(out_count-cancel_count) >= 0 {
 			if (deliver_number - out_count - cancel_count) != 0 {
 				drugflow := models.DrugFlow{
 					WarehouseOutOrderNumber: warehouseout.WarehouseOutOrderNumber,
@@ -1598,10 +1619,11 @@ func BloodHisDrugDeliverInfo(orgID int64, prescribingNumber float64, warehouseou
 					Number:                  warehouse.Number,
 					ProductDate:             warehouse.ProductDate,
 					ExpireDate:              warehouse.ExpiryDate,
-					Count:                   deliver_number - (out_count - cancel_count), //按最小单位计算,
+					Count:                   deliver_number_one - (out_count - cancel_count), //按最小单位计算,
 					Price:                   warehouse.RetailPrice,
 					Status:                  1,
-					Ctime:                   time.Now().Unix(),
+					Ctime:                   advice.AdviceDate,
+					Mtime:                   time.Now().Unix(),
 					UserOrgId:               orgID,
 					Manufacturer:            warehouse.Manufacturer,
 					Dealer:                  warehouse.Dealer,
@@ -1665,7 +1687,7 @@ func BloodHisDrugDeliverInfo(orgID int64, prescribingNumber float64, warehouseou
 		}
 
 		//如果本次出库数据小于历史出库数据 新增1条退库流水
-		if deliver_number < (out_count - cancel_count) {
+		if deliver_number_one-(out_count-cancel_count) < 0 {
 
 			operation_time := time.Now().Unix()
 
@@ -1721,7 +1743,8 @@ func BloodHisDrugDeliverInfo(orgID int64, prescribingNumber float64, warehouseou
 				DrugId:           advice.DrugId,
 				Count:            (out_count - cancel_count) - deliver_number,
 				Status:           1,
-				Ctime:            ctime,
+				Ctime:            advice.AdviceDate,
+				Mtime:            time.Now().Unix(),
 				OrgId:            advice.UserOrgId,
 				Type:             1,
 				Manufacturer:     manufactureName.ManufacturerName,
@@ -1779,8 +1802,8 @@ func BloodHisDrugDeliverInfo(orgID int64, prescribingNumber float64, warehouseou
 				Creator:                 advice.ExecutionStaff,
 				UpdateCreator:           0,
 				Status:                  1,
-				Ctime:                   time.Now().Unix(),
-				Mtime:                   0,
+				Ctime:                   advice.AdviceDate,
+				Mtime:                   time.Now().Unix(),
 				Price:                   warehouse.RetailPrice,
 				WarehousingDetailId:     warehouse.ID,
 				WarehouseOutDetailId:    0,
@@ -1852,7 +1875,7 @@ func BloodHisDrugDeliverInfo(orgID int64, prescribingNumber float64, warehouseou
 			WarehouseOutId:          warehouseout.ID,
 			WarehouseOutOrderNumber: warehouseout.WarehouseOutOrderNumber,
 			PatientId:               advice.PatientId,
-			Ctime:                   time.Now().Unix(),
+			Ctime:                   advice.RecordDate,
 			Mtime:                   time.Now().Unix(),
 			Status:                  1,
 			RecordTime:              advice.RecordDate,
@@ -1952,7 +1975,8 @@ func BloodHisDrugDeliverInfo(orgID int64, prescribingNumber float64, warehouseou
 			WarehouseOutOrderNumber: warehouseout.WarehouseOutOrderNumber,
 			WarehouseOutId:          warehouseout.ID,
 			Status:                  1,
-			Ctime:                   time.Now().Unix(),
+			Ctime:                   advice.RecordDate,
+			Mtime:                   time.Now().Unix(),
 			Remark:                  warehouse.Remark,
 			OrgId:                   orgID,
 			Type:                    1,
@@ -2035,7 +2059,7 @@ func BloodHisDrugDeliverInfo(orgID int64, prescribingNumber float64, warehouseou
 			WarehouseOutId:          warehouseout.ID,
 			WarehouseOutOrderNumber: warehouseOutInfo.WarehouseOutOrderNumber,
 			PatientId:               advice.PatientId,
-			Ctime:                   time.Now().Unix(),
+			Ctime:                   advice.AdviceDate,
 			Mtime:                   time.Now().Unix(),
 			Status:                  1,
 			RecordTime:              advice.RecordDate,
@@ -2117,7 +2141,8 @@ func BloodHisDrugDeliverInfo(orgID int64, prescribingNumber float64, warehouseou
 				Count:                   stock_number,
 				Price:                   warehouse.RetailPrice,
 				Status:                  1,
-				Ctime:                   time.Now().Unix(),
+				Ctime:                   advice.AdviceDate,
+				Mtime:                   time.Now().Unix(),
 				UserOrgId:               orgID,
 				Manufacturer:            warehouse.Manufacturer,
 				Dealer:                  warehouse.Dealer,
@@ -2198,7 +2223,8 @@ func BloodHisDrugDeliverInfo(orgID int64, prescribingNumber float64, warehouseou
 				DrugId:           advice.DrugId,
 				Count:            (out_count - cancel_count) - deliver_number,
 				Status:           1,
-				Ctime:            ctime,
+				Ctime:            advice.AdviceDate,
+				Mtime:            time.Now().Unix(),
 				OrgId:            advice.UserOrgId,
 				Type:             1,
 				Manufacturer:     manufactureName.ManufacturerName,
@@ -2256,8 +2282,8 @@ func BloodHisDrugDeliverInfo(orgID int64, prescribingNumber float64, warehouseou
 				Creator:                 advice.ExecutionStaff,
 				UpdateCreator:           0,
 				Status:                  1,
-				Ctime:                   time.Now().Unix(),
-				Mtime:                   0,
+				Ctime:                   advice.AdviceDate,
+				Mtime:                   time.Now().Unix(),
 				Price:                   warehouse.RetailPrice,
 				WarehousingDetailId:     warehouse.ID,
 				WarehouseOutDetailId:    0,
@@ -2334,7 +2360,7 @@ func BloodHisDrugDeliverInfo(orgID int64, prescribingNumber float64, warehouseou
 		advice.PrescribingNumber = float64(prescribingNumber_two_temp)
 		advice.PrescribingNumberUnit = drup.MinUnit
 
-		BloodHisDrugDeliverInfo(orgID, overPlusNumber, warehouseout, drup, advice)
+		BloodHisDrugDeliverInfo(orgID, overPlusNumber, warehouseout, drup, advice, hisprescribingNumber)
 	}
 
 	return
@@ -3929,7 +3955,6 @@ func ConsumablesGoodDeliveryNew(orgID int64, patient_id int64, record_time int64
 		utils.ErrorLog("事务失败，原因为: %v", err)
 		tx.Rollback()
 	} else {
-		fmt.Println("err-----------------------", err)
 		tx.Commit()
 	}
 	var deliver_number int64 = 0
@@ -4507,3 +4532,9 @@ func ConsumablesGoodDeliveryNew(orgID int64, patient_id int64, record_time int64
 
 	return nil
 }
+
+func UpdateDrugWarehouseOutInfoTen(patient_id int64, sys_record_time int64, advice_id int64) error {
+
+	err := XTWriteDB().Model(&models.DrugWarehouseOutInfo{}).Where("patient_id = ? and sys_record_time  = ? and status=1 and advice_id = ?", patient_id, sys_record_time, advice_id).Updates(map[string]interface{}{"status": 0}).Error
+	return err
+}

service/patient_service.go

@@ -1654,6 +1654,12 @@ func FindAllDoctorAdviceByGoroupNo(orgID int64, groupno int64) (advice []models.
 	return
 }
 
+func UpdateDoctorAdviceByGoroupNo(id int64, drug_id int64) error {
+
+	err := XTWriteDB().Model(&models.DoctorAdvice{}).Where("id = ? and status =1", id).Updates(map[string]interface{}{"drug_id": drug_id, "drug_name_id": drug_id, "way": 1}).Error
+	return err
+}
+
 func FindAllDoctorAdviceByGoroupNoTwety(orgID int64, groupno int64) (advice []models.DoctorAdvice, err error) {
 	err = readDb.Model(&models.DoctorAdvice{}).Where("user_org_id=?  AND groupno = ? AND status = 1 and (drug_id >0 or drug_name_id >0)", orgID, groupno).Find(&advice).Error
 	return
@@ -3052,3 +3058,12 @@ func GetNewAllMonitorList(orgID int64, scheduleDate int64, pat_type int64) (moni
 	}
 	return monitor, err
 }
+
+func GetBaseDrugByName(drug_name string, org_id int64) (models.BaseDrugLibSeven, error) {
+
+	libSeven := models.BaseDrugLibSeven{}
+
+	err := XTReadDB().Where("drug_name= ? and org_id = ? and status=1", drug_name, org_id).First(&libSeven).Error
+
+	return libSeven, err
+}

service/print_data_service/schedule_dialysis/print_schedule_dialysis_service.go

@@ -107,7 +107,7 @@ type AdminUserListTwo struct {
 
 func GetAllAdminUsers(orgId int64, appid int64) (list []*AdminUserList, err error) {
 	db := p_service.UserReadDB()
-	err = db.Table("sgj_user_admin_role as uar").Joins("JOIN sgj_user_admin as ua ON ua.id = uar.admin_user_id").Where("uar.org_id=? and uar.app_id =? and ua.status=1", orgId, appid).Select("ua.id, uar.user_name as name, uar.user_type").Scan(&list).Error
+	err = db.Table("sgj_user_admin_role as uar").Joins("JOIN sgj_user_admin as ua ON ua.id = uar.admin_user_id").Where("uar.org_id=? and uar.app_id =?", orgId, appid).Select("ua.id, uar.user_name as name, uar.user_type").Scan(&list).Error
 	return
 }
 

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

@@ -110,11 +110,11 @@ func CreateUserName(phone string, disPlayName string) (string, string) {
 	url = "http://demo.itruscloud.com/apigate/contractpaasapi/user/createUserRealName"
 	var phoneOne string
 
-	phoneOne = "13318464649"
+	phoneOne = "13318464642"
 
 	var disPlayNameOne string
 
-	disPlayNameOne = "王老师"
+	disPlayNameOne = "马云的朋友"
 
 	var authentication string
 	//测试环境用true
@@ -206,11 +206,11 @@ func CreatePersionSeal(user_id string, person_seal_type int64, person_seal_name
 
 	maprequest := make(map[string]interface{})
 
-	maprequest["userId"] = "DVVZ65G1JTC1BH3AHYY2KYAE"
+	maprequest["userId"] = "PBRLMBFVIRR3BV8JGGOX9C7N"
 
 	maprequest["personSealType"] = 1
 
-	maprequest["personSealName"] = "测试印章"
+	maprequest["personSealName"] = "马云朋友的印章"
 
 	var url string
 
@@ -275,11 +275,11 @@ func CreateUploadPact(contractcode string, contractname string, signcount int64,
 
 	//maprequest["contractCode"] = "102020620701056856"
 
-	maprequest["contractName"] = "汽车购买交易合同"
+	maprequest["contractName"] = "电脑购买交易合同"
 
 	maprequest["signCount"] = 10
 
-	maprequest["docName"] = "员工保密协议"
+	maprequest["docName"] = "电脑员工保密协议"
 
 	file := "C:/Users/28169/Desktop/打印单.pdf"
 	fileBytes, err := ioutil.ReadFile(file) // 读取file
@@ -289,7 +289,7 @@ func CreateUploadPact(contractcode string, contractname string, signcount int64,
 	maprequest["contractBase64"] = contractBase64
 
 	//添加企业成员 里面的USERID
-	maprequest["creator"] = "DCBCD8QR2TU6B83XFF3FOHJL"
+	maprequest["creator"] = "PBRLMBFVIRR3BV8JGGOX9C7N"
 
 	maprequest["enterpriseId"] = "BRWAABXW3RUD4PGCYEQWRRK8"
 
@@ -347,7 +347,7 @@ func CreateEnterPriseRealName(enterprisename string) string {
 	customerReq["idCardType"] = "N"
 	customerReq["idCardNum"] = "430526199408156511"
 
-	maprequest["enterpriseName"] = "深圳益森科技有限公司"
+	maprequest["enterpriseName"] = "深圳德马西科技有限公司"
 	maprequest["authentication"] = true
 	maprequest["customerAuthReq"] = customerReq
 
@@ -398,7 +398,7 @@ func CreateUserId(userId string, displayName string) string {
 	maprequest := make(map[string]interface{})
 
 	maprequest["enterpriseId"] = "BRWAABXW3RUD4PGCYEQWRRK8"
-	maprequest["userId"] = "DCBCD8QR2TU6B83XFF3FOHJL"
+	maprequest["userId"] = "PBRLMBFVIRR3BV8JGGOX9C7N"
 
 	byterequest, _ := json.Marshal(maprequest)
 	reader := bytes.NewReader(byterequest)
@@ -477,59 +477,188 @@ func AddContractSignatory(contractId string, signers string, contract models.New
 
 	serviceCode := beego.AppConfig.String("serviceCode")
 
+	signFiles := make(map[string]interface{})
+
+	signFiles["docId"] = "156190809375377646"
+
+	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 {
+		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)
+
+	signersFiles := make(map[string]interface{})
+
+	signersFiles["userId"] = "PBRLMBFVIRR3BV8JGGOX9C7N"
+	signersFiles["signerType"] = "1"
+	signersFiles["enterpriseId"] = "BRWAABXW3RUD4PGCYEQWRRK8"
+	signersFiles["sequence"] = "8"
+	signersFiles["sendMsg"] = false
+	signersFiles["signFiles"] = inputDataArrThree
+
+	inputDataArrFour := make([]map[string]interface{}, 0)
+
+	inputDataArrFour = append(inputDataArrFour, signersFiles)
+
 	maprequest := make(map[string]interface{})
+	maprequest["contractId"] = "156190809375377645"
+	maprequest["signers"] = inputDataArrFour
+
+	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
+}
+
+func CreateBackStageSign(contractId string, signers string) string {
+
+	var url string
 
-	maprequest["contractId"] = "153497878806048027"
+	url = "http://demo.itruscloud.com/apigate/contractpaasapi/contract/signByFile"
+	appId := beego.AppConfig.String("sign_appid")
+
+	serviceKye := beego.AppConfig.String("serviceKye")
+
+	serviceCode := beego.AppConfig.String("serviceCode")
 
-	maprequestOne := make(map[string]interface{})
+	sealTimestampFiles := make(map[string]interface{})
+	inputDataArr := make([]map[string]interface{}, 0)
+	signFiles := make(map[string]interface{})
 
-	maprequestTwo := make(map[string]interface{})
+	keywordSignControls := make(map[string]interface{})
+	keywordSignControls["controlsKey"] = "2"
+	keywordSignControls["pattern"] = 1
+	keywordSignControls["color"] = "#FF0000"
+	inputDataArr = append(inputDataArr, keywordSignControls)
 
-	var signFiles models.SignFiles
-	signFiles.DocId = 343465645
+	sealTimestampFiles["allAddTimestamp"] = false
+	sealTimestampFiles["someTimestampStyle"] = inputDataArr
 
 	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
+	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"] = "autograph"
+	signFiles["signControl"] = signControl
+	signFiles["docId"] = "156190809375377646"
+	inputDataArrThree := make([]map[string]interface{}, 0)
+	inputDataArrThree = append(inputDataArrThree, signFiles)
+
+	signer := make(map[string]interface{})
+
+	signer["signerId"] = "156190965067942129"
+	signer["isUserWishes"] = true
+	signer["userWishesWay"] = 1
+	signer["codeNumber"] = "msg202308111745462623789"
+	signer["verifyCode"] = "930788"
+	signer["signFiles"] = inputDataArrThree
+	maprequest := make(map[string]interface{})
+	maprequest["contractId"] = "156190809375377645"
+	maprequest["signer"] = signer
 
-		inputDataArrOne = append(inputDataArrOne, inputDataThree)
+	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())
 	}
 
-	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
+	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())
 
-		inputDataArrTwo = append(inputDataArrTwo, inputDataFour)
 	}
+	respBytes, err := ioutil.ReadAll(resp.Body)
+	if err != nil {
+		fmt.Println(err.Error())
+
+	}
+	str := string(respBytes)
 
-	maprequestTwo["xySignControls"] = inputDataArrOne
-	maprequestTwo["keywordSignControls"] = inputDataArrTwo
-	maprequestTwo["docId"] = 1234555
+	return str
+}
 
-	maprequestOne["userId"] = ""
-	maprequestOne["signerType"] = ""
-	maprequestOne["enterpriseId"] = ""
-	maprequestOne["sequence"] = ""
-	maprequestOne["sendMsg"] = false
-	maprequestOne["signFiles"] = maprequestTwo
+func GetVerificationCode() string {
+
+	var url string
 
-	maprequestOne["signers"] = maprequestOne
+	url = "http://demo.itruscloud.com/apigate/contractpaasapi/contract/sendSmsCode"
+	appId := beego.AppConfig.String("sign_appid")
 
-	maprequest["contractId"] = contract.ContractId
+	serviceKye := beego.AppConfig.String("serviceKye")
 
-	maprequest["signers"] = maprequestOne
+	serviceCode := beego.AppConfig.String("serviceCode")
+
+	maprequest := make(map[string]interface{})
+	maprequest["contractId"] = "156190809375377645"
+	maprequest["userId"] = "PBRLMBFVIRR3BV8JGGOX9C7N"
 
 	byterequest, _ := json.Marshal(maprequest)
 	reader := bytes.NewReader(byterequest)
@@ -562,16 +691,54 @@ func AddContractSignatory(contractId string, signers string, contract models.New
 	return str
 }
 
-func GetHisDoctorAdviceInfoList(user_org_id int64) (advice []*models.XtDrugWarehouseInfo, err error) {
+func CreateEnterprise() string {
 
-	err = XTReadDB().Where("status= 1 and is_check= 1").Find(&advice).Error
+	var url string
 
-	return advice, err
-}
+	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"] = "156190809375377645"
+	maprequest["userId"] = "PBRLMBFVIRR3BV8JGGOX9C7N"
+	maprequest["sealType"] = 1
+	maprequest["sealName"] = "测试用章"
+	maprequest["sealBase64"] = ""
+	maprequest["color"] = 1
+	maprequest["width"] = 40
+	maprequest["authUserId"] = ""
+	maprequest["sealCreateType"] = false
+	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{}
 
-func UpdatePatietPrice(id int64, retail_price float64) (models.DrugFlow, error) {
+	resp, err := client.Do(request)
+	if err != nil {
+		fmt.Println(err.Error())
 
-	flow := models.DrugFlow{}
-	err := XTWriteDB().Model(&flow).Where("warehousing_detail_id = ? and status=1", id).Updates(map[string]interface{}{"price": retail_price}).Error
-	return flow, err
+	}
+	respBytes, err := ioutil.ReadAll(resp.Body)
+	if err != nil {
+		fmt.Println(err.Error())
+
+	}
+	str := string(respBytes)
+
+	return str
 }

service/stock_service.go

@@ -6109,7 +6109,7 @@ func GetInventoryDetailList(keyword string, limit int64, page int64, orgid int64
 	if storehouse_id > 0 {
 		db = db.Where("x.storehouse_id = ?", storehouse_id)
 	}
-	err = db.Select("x.id,x.good_name,x.specification_name,x.warehousing_unit,x.count,x.buy_price,x.packing_price,x.new_price,x.manufacturer,x.dealer,x.remark,x.good_id,x.warehousing_order,x.license_number,x.start_time,x.creater,x.checker,x.checker_status,x.checker_time,x.total,x.number,x.expire_date,x.product_date,t.packing_unit,x.last_stock_count,x.type,x.inventory_type,x.stock_count,x.storehouse_id,x.ctime").Joins("left join sgj_users.sgj_user_admin_role as r on r.id = x.creater").Joins("left join xt_good_information as t on t.id =x.good_id").Count(&total).Offset(offset).Limit(limit).Scan(&list).Error
+	err = db.Select("x.id,x.good_name,x.specification_name,x.warehousing_unit,x.count,x.buy_price,x.packing_price,x.new_price,x.manufacturer,x.dealer,x.remark,x.good_id,x.warehousing_order,x.license_number,x.start_time,x.creater,x.checker,x.checker_status,x.checker_time,x.total,x.number,x.expire_date,x.product_date,t.packing_unit,x.last_stock_count,x.type,x.inventory_type,x.stock_count,x.storehouse_id,x.ctime").Joins("left join sgj_users.sgj_user_admin_role as r on r.id = x.creater").Joins("left join xt_good_information as t on t.id =x.good_id").Count(&total).Offset(offset).Limit(limit).Order("x.id desc").Scan(&list).Error
 	return list, total, err
 }
 

service/user_service.go

@@ -90,7 +90,7 @@ func GetAllDoctorAndNurseSeven(orgId int64) (doctors []AdminUserList, nurses []A
 
 func GetAllAdminUsers(orgId, appid int64) (list []*AdminUserList, err error) {
 
-	err = readUserDb.Table("sgj_user_admin_role as uar").Joins("JOIN sgj_user_admin as ua ON ua.id = uar.admin_user_id").Where("uar.org_id=? and uar.app_id =? and ua.status=1", orgId, appid).Select("ua.id, uar.user_name as name, uar.user_type,uar.status").Scan(&list).Error
+	err = readUserDb.Table("sgj_user_admin_role as uar").Joins("JOIN sgj_user_admin as ua ON ua.id = uar.admin_user_id").Where("uar.org_id=? and uar.app_id =?", orgId, appid).Select("ua.id, uar.user_name as name, uar.user_type,uar.status").Scan(&list).Error
 	//err = readUserDb.Table("sgj_user_admin_role as uar").Joins("JOIN sgj_user_admin as ua ON ua.id = uar.admin_user_id").Where("uar.status=1  and ua.status=1").Select("ua.id, uar.user_name as name, uar.user_type").Scan(&list).Error
 	return
 }

service/warhouse_service.go

@@ -619,7 +619,7 @@ func HisDrugsDelivery(orgID int64, creater int64, advice *models.HisDoctorAdvice
 		if drup.ID > 0 {
 			prescribingNumber := advice.PrescribingNumber
 
-			BloodHisDrugDeliverInfo(orgID, prescribingNumber, &out, &drup, advice)
+			BloodHisDrugDeliverInfo(orgID, prescribingNumber, &out, &drup, advice, prescribingNumber)
 
 		} else {
 			return errors.New("药品信息不存在")
@@ -1488,7 +1488,8 @@ func ConsumablesDelivery(orgID int64, patient_id int64, record_time int64, goods
 			WarehouseOutId:          warehouseOut.ID,
 			WarehouseInfotId:        warehouse.ID,
 			Status:                  1,
-			Ctime:                   time.Now().Unix(),
+			Ctime:                   record_time,
+			Mtime:                   time.Now().Unix(),
 			Remark:                  warehouse.Remark,
 			OrgId:                   orgID,
 			Type:                    1,
@@ -1525,7 +1526,7 @@ func ConsumablesDelivery(orgID int64, patient_id int64, record_time int64, goods
 			WarehouseOutId:          warehouseOutInfo.ID,
 			WarehouseOutOrderNumber: warehouseOutInfo.WarehouseOutOrderNumber,
 			PatientId:               patient_id,
-			Ctime:                   time.Now().Unix(),
+			Ctime:                   record_time,
 			Mtime:                   time.Now().Unix(),
 			Status:                  1,
 			RecordTime:              record_time,
@@ -1554,7 +1555,8 @@ func ConsumablesDelivery(orgID int64, patient_id int64, record_time int64, goods
 				Count:                   deliver_number,
 				Price:                   warehouse.PackingPrice,
 				Status:                  1,
-				Ctime:                   time.Now().Unix(),
+				Ctime:                   record_time,
+				Mtime:                   time.Now().Unix(),
 				UserOrgId:               orgID,
 				Manufacturer:            warehouse.Manufacturer,
 				Dealer:                  warehouse.Dealer,
@@ -1595,7 +1597,8 @@ func ConsumablesDelivery(orgID int64, patient_id int64, record_time int64, goods
 					Count:                   exsit.Count + goods.Count,
 					Price:                   warehouse.PackingPrice,
 					Status:                  1,
-					Ctime:                   time.Now().Unix(),
+					Ctime:                   record_time,
+					Mtime:                   time.Now().Unix(),
 					UserOrgId:               orgID,
 					Manufacturer:            warehouse.Manufacturer,
 					Dealer:                  warehouse.Dealer,
@@ -1631,7 +1634,8 @@ func ConsumablesDelivery(orgID int64, patient_id int64, record_time int64, goods
 				Count:                   deliver_number,
 				Price:                   warehouse.PackingPrice,
 				Status:                  1,
-				Ctime:                   time.Now().Unix(),
+				Ctime:                   record_time,
+				Mtime:                   time.Now().Unix(),
 				UserOrgId:               orgID,
 				Manufacturer:            warehouse.Manufacturer,
 				Dealer:                  warehouse.Dealer,
@@ -1669,7 +1673,8 @@ func ConsumablesDelivery(orgID int64, patient_id int64, record_time int64, goods
 					Count:                   exsit.Count + goods.Count,
 					Price:                   warehouse.PackingPrice,
 					Status:                  1,
-					Ctime:                   time.Now().Unix(),
+					Ctime:                   record_time,
+					Mtime:                   time.Now().Unix(),
 					UserOrgId:               orgID,
 					Manufacturer:            warehouse.Manufacturer,
 					Dealer:                  warehouse.Dealer,
@@ -1715,7 +1720,8 @@ func ConsumablesDelivery(orgID int64, patient_id int64, record_time int64, goods
 			WarehouseOutId:          warehouseOut.ID,
 			WarehouseInfotId:        warehouse.ID,
 			Status:                  1,
-			Ctime:                   time.Now().Unix(),
+			Ctime:                   record_time,
+			Mtime:                   time.Now().Unix(),
 			Remark:                  warehouse.Remark,
 			OrgId:                   orgID,
 			Type:                    1,
@@ -1757,7 +1763,8 @@ func ConsumablesDelivery(orgID int64, patient_id int64, record_time int64, goods
 				Count:                   stock_number,
 				Price:                   warehouse.PackingPrice,
 				Status:                  1,
-				Ctime:                   time.Now().Unix(),
+				Ctime:                   record_time,
+				Mtime:                   time.Now().Unix(),
 				UserOrgId:               orgID,
 				Manufacturer:            warehouse.Manufacturer,
 				Dealer:                  warehouse.Dealer,
@@ -1793,7 +1800,8 @@ func ConsumablesDelivery(orgID int64, patient_id int64, record_time int64, goods
 					Count:                   exsit.Count + goods.Count,
 					Price:                   warehouse.PackingPrice,
 					Status:                  1,
-					Ctime:                   time.Now().Unix(),
+					Ctime:                   record_time,
+					Mtime:                   time.Now().Unix(),
 					UserOrgId:               orgID,
 					Manufacturer:            warehouse.Manufacturer,
 					Dealer:                  warehouse.Dealer,
@@ -1835,7 +1843,8 @@ func ConsumablesDelivery(orgID int64, patient_id int64, record_time int64, goods
 				Count:                   stock_number,
 				Price:                   warehouse.PackingPrice,
 				Status:                  1,
-				Ctime:                   time.Now().Unix(),
+				Ctime:                   record_time,
+				Mtime:                   time.Now().Unix(),
 				UserOrgId:               orgID,
 				Manufacturer:            warehouse.Manufacturer,
 				Dealer:                  warehouse.Dealer,
@@ -1871,7 +1880,8 @@ func ConsumablesDelivery(orgID int64, patient_id int64, record_time int64, goods
 					Count:                   exsit.Count + goods.Count,
 					Price:                   warehouse.PackingPrice,
 					Status:                  1,
-					Ctime:                   time.Now().Unix(),
+					Ctime:                   record_time,
+					Mtime:                   time.Now().Unix(),
 					UserOrgId:               orgID,
 					Manufacturer:            warehouse.Manufacturer,
 					Dealer:                  warehouse.Dealer,
@@ -1941,7 +1951,8 @@ func ConsumablesDeliveryDelete(orgID int64, patient_id int64, record_time int64,
 			WarehouseOutId:          warehouseOut.ID,
 			//WarehouseInfoId:		 warehouse.ID,
 			Status:        1,
-			Ctime:         time.Now().Unix(),
+			Ctime:         record_time,
+			Mtime:         time.Now().Unix(),
 			Remark:        "",
 			OrgId:         orgID,
 			Type:          1,
@@ -1966,7 +1977,7 @@ func ConsumablesDeliveryDelete(orgID int64, patient_id int64, record_time int64,
 				WarehouseOutId:          warehouseOutInfo.ID,
 				WarehouseOutOrderNumber: warehouseOutInfo.WarehouseOutOrderNumber,
 				PatientId:               patient_id,
-				Ctime:                   time.Now().Unix(),
+				Ctime:                   record_time,
 				Mtime:                   time.Now().Unix(),
 				Status:                  1,
 				RecordTime:              record_time,
@@ -2035,7 +2046,8 @@ func ConsumablesDeliveryDelete(orgID int64, patient_id int64, record_time int64,
 			Total:           0,
 			ProductDate:     ware.ProductDate,
 			ExpiryDate:      ware.ExpiryDate,
-			Ctime:           time.Now().Unix(),
+			Ctime:           record_time,
+			Mtime:           time.Now().Unix(),
 			Status:          1,
 			OrgId:           good_yc.UserOrgId,
 			OrderNumber:     cancel.OrderNumber,
@@ -2081,8 +2093,8 @@ func ConsumablesDeliveryDelete(orgID int64, patient_id int64, record_time int64,
 			Creator:                 warehouseOut.Creater,
 			UpdateCreator:           0,
 			Status:                  1,
-			Ctime:                   time.Now().Unix(),
-			Mtime:                   0,
+			Ctime:                   record_time,
+			Mtime:                   time.Now().Unix(),
 			Price:                   ware.Price,
 			WarehousingDetailId:     ware.WarehouseInfotId,
 			WarehouseOutDetailId:    ware.ID,
@@ -5522,8 +5534,8 @@ func ConsumablesDeliveryThirty(orgID int64, record_time int64, goods *models.War
 			Creator:                 creator,
 			UpdateCreator:           0,
 			Status:                  1,
-			Ctime:                   time.Now().Unix(),
-			Mtime:                   0,
+			Ctime:                   record_time,
+			Mtime:                   time.Now().Unix(),
 			Price:                   warehouse.PackingPrice, //零售价
 			WarehousingDetailId:     warehouse.ID,
 			WarehouseOutDetailId:    goods.ID,
@@ -5670,8 +5682,8 @@ func ConsumablesDeliveryThirty(orgID int64, record_time int64, goods *models.War
 			Creator:                 creator,
 			UpdateCreator:           0,
 			Status:                  1,
-			Ctime:                   time.Now().Unix(),
-			Mtime:                   0,
+			Ctime:                   record_time,
+			Mtime:                   time.Now().Unix(),
 			Price:                   warehouse.PackingPrice, //零售价
 			WarehousingDetailId:     warehouse.ID,
 			WarehouseOutDetailId:    goods.ID,
@@ -5755,8 +5767,6 @@ func ConsumablesDeliveryThirty(orgID int64, record_time int64, goods *models.War
 // 药品手动出库 递归方式
 func AutoDrugDeliverInfoFourtyOne(orgID int64, prescribingNumber int64, warehouseout *models.DrugWarehouseOut, drup *models.BaseDrugLib, advice *models.DrugWarehouseOutInfo) (err error) {
 
-	fmt.Println("出库数量", prescribingNumber)
-
 	// 判断处方里药品单位是拆零单位还是包装单位,	如果是包装单位，则根据规格，将包装数量转为拆零数量
 	var deliver_number int64 = 0
 	var stock_number int64 = 0
@@ -5917,7 +5927,8 @@ func AutoDrugDeliverInfoFourtyOne(orgID int64, prescribingNumber int64, warehous
 			Count:                   deliver_number,
 			Price:                   warehouse.RetailPrice,
 			Status:                  1,
-			Ctime:                   time.Now().Unix(),
+			Ctime:                   advice.SysRecordTime,
+			Mtime:                   time.Now().Unix(),
 			UserOrgId:               advice.OrgId,
 			Manufacturer:            advice.Manufacturer,
 			Dealer:                  advice.Dealer,
@@ -5985,7 +5996,8 @@ func AutoDrugDeliverInfoFourtyOne(orgID int64, prescribingNumber int64, warehous
 			Count:                   stock_number,
 			Price:                   warehouse.RetailPrice,
 			Status:                  1,
-			Ctime:                   time.Now().Unix(),
+			Ctime:                   advice.SysRecordTime,
+			Mtime:                   time.Now().Unix(),
 			UserOrgId:               advice.OrgId,
 			Manufacturer:            advice.Manufacturer,
 			Dealer:                  advice.Dealer,