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

conf/app.conf

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

controllers/dialysis_api_controller.go

@@ -582,7 +582,7 @@ func (c *DialysisApiController) PostPrescription() {
 			if filedConfig.ID > 0 {
 				str = dialyzerPerfusionApparatus
 			} else {
-				str = dialysis_dialyszers + "/" + dialysis_irrigation + "/" + dialysis_strainer
+				str = dialysis_dialyszers + "/" + dialysis_irrigation + " " + dialysis_strainer
 			}
 			service.ModifyScheduleMode(mode_id, patient, recordDate.Unix(), adminUserInfo.CurrentOrgId, str)
 		}
@@ -858,7 +858,8 @@ func (c *DialysisApiController) PostSoulution() {
 		if filedConfig.ID > 0 {
 			str = dialyzerPerfusionApparatus
 		} else {
-			str = dialysis_dialyszers + "/" + dialysis_irrigation + "/" + dialysis_strainer
+			str = dialysis_dialyszers + "/" + dialysis_irrigation + " " + dialysis_strainer
+
 		}
 		service.ModifyScheduleMode(mode_id, patient, recordDate.Unix(), adminUserInfo.CurrentOrgId, str)
 	}
@@ -1353,6 +1354,8 @@ func (c *DialysisApiController) PostDouleCheck() {
 	pipeline_connection_desc := c.GetString("pipeline_connection_desc")
 	collator, _ := c.GetInt64("collator", 0)
 	employee_number := c.GetString("employee_number")
+	dialyzer_batch_number := c.GetString("dialyzer_batch_number")
+	needle_batch_number := c.GetString("needle_batch_number")
 	if id <= 0 {
 		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
 		return
@@ -1423,6 +1426,8 @@ func (c *DialysisApiController) PostDouleCheck() {
 		UpdatedTime:                time.Now().Unix(),
 		CheckDate:                  recordDate.Unix(),
 		EmployeeNumber:             employee_number,
+		DialyzerBatchNumber:        dialyzer_batch_number,
+		NeedleBatchNumber:          needle_batch_number,
 	}
 
 	_, check := service.FindDoubleCheckByReordDate(id, recordDate.Unix(), adminUserInfo.CurrentOrgId)
@@ -1460,6 +1465,7 @@ func (c *DialysisApiController) PostDouleCheck() {
 		doubleCheck.CreatedTime = check.CreatedTime
 		doubleCheck.UpdatedTime = time.Now().Unix()
 		doubleCheck.ID = check.ID
+
 		redis := service.RedisClient()
 		err := service.UpdateDoubleCheck(&doubleCheck)
 		key := strconv.FormatInt(adminUserInfo.CurrentOrgId, 10) + ":" + strconv.FormatInt(id, 10) + ":" + strconv.FormatInt(recordDate.Unix(), 10) + ":double_check"
@@ -4391,7 +4397,7 @@ func (this *DialysisApiController) GetTodayMonitor() {
 			}
 
 			//长沙南雅
-			if adminInfo.CurrentOrgId == 10395 || adminInfo.CurrentOrgId == 10138 || adminInfo.CurrentOrgId == 10278 || adminInfo.CurrentOrgId == 10340 || adminInfo.CurrentOrgId == 10432 || adminInfo.CurrentOrgId == 10441 || adminInfo.CurrentOrgId == 10445 || adminInfo.CurrentOrgId == 9829 || adminInfo.CurrentOrgId == 10440 || adminInfo.CurrentOrgId == 10469 {
+			if adminInfo.CurrentOrgId == 10395 || adminInfo.CurrentOrgId == 10138 || adminInfo.CurrentOrgId == 10278 || adminInfo.CurrentOrgId == 10340 || adminInfo.CurrentOrgId == 10432 || adminInfo.CurrentOrgId == 10441 || adminInfo.CurrentOrgId == 10445 || adminInfo.CurrentOrgId == 9829 || adminInfo.CurrentOrgId == 10440 || adminInfo.CurrentOrgId == 10469 || adminInfo.CurrentOrgId == 10471 {
 				ultrafiltration_rate = math.Floor(prescription.TargetUltrafiltration * 60 / 1000 / float64(totalMin) * 1000)
 
 				record.UltrafiltrationRate = ultrafiltration_rate
@@ -4420,7 +4426,7 @@ func (this *DialysisApiController) GetTodayMonitor() {
 	}
 
 	//长沙南雅
-	if adminInfo.CurrentOrgId == 10395 || adminInfo.CurrentOrgId == 10138 || adminInfo.CurrentOrgId == 10278 || adminInfo.CurrentOrgId == 10432 || adminInfo.CurrentOrgId == 10441 || adminInfo.CurrentOrgId == 10445 || adminInfo.CurrentOrgId == 10469 {
+	if adminInfo.CurrentOrgId == 10395 || adminInfo.CurrentOrgId == 10138 || adminInfo.CurrentOrgId == 10278 || adminInfo.CurrentOrgId == 10432 || adminInfo.CurrentOrgId == 10441 || adminInfo.CurrentOrgId == 10445 || adminInfo.CurrentOrgId == 10469 || adminInfo.CurrentOrgId == 10471 {
 
 		if ultrafiltration_rate > 0 {
 			ultrafiltration_volume := math.Floor(float64(record.OperateTime+3600-fristrecord.OperateTime) / 3600 * ultrafiltration_rate)
@@ -6033,14 +6039,17 @@ func (this *DialysisApiController) GetDialysisAdviceToday() {
 
 	schedule_type, _ := this.GetInt64("schedule_type")
 
-	partion_type, _ := this.GetInt64("partion_type")
+	//partion_type, _ := this.GetInt64("partion_type")
 
+	partion_type := this.GetString("partion_type")
+	var ids []string
+	ids = strings.Split(partion_type, ",")
 	start_time := this.GetString("selected_date")
 	timeLayout := "2006-01-02"
 	loc, _ := time.LoadLocation("Local")
 	startTime, _ := time.ParseInLocation(timeLayout+" 15:04:05", start_time+" 00:00:00", loc)
 
-	list, err := service.GetDialysisAdviceSchedulistTen(orgId, schedule_type, partion_type, startTime.Unix())
+	list, err := service.GetDialysisAdviceSchedulistTen(orgId, schedule_type, ids, startTime.Unix())
 
 	drug, _ := service.GetAllBaseDrugListTwenty(orgId)
 	_, config := service.FindXTHisRecordByOrgId(orgId)

controllers/doctors_api_controller.go

@@ -123,6 +123,8 @@ func (c *DoctorsApiController) ScheduleAdvices() {
 		hisAdvices, err := service.GetHisDoctorAdvicesTwentyOne(orgID, date.Unix(), delivery_way, schedule_type, partition_type, patient_id, excution_way, 0, execution_frequency)
 		adminUser, _ := service.GetAllAdminUsers(orgID, adminUserInfo.CurrentAppId)
 		project, _ := service.GetPCHisPrescriptionProject(orgID, date.Unix(), delivery_way, patientType, partition_type, patient_id, excution_way)
+
+		drug, _ := service.GetAllBaseDrugListTwenty(orgID)
 		for _, item := range project {
 			index := 0
 			for _, subItem := range item.HisPrescriptionTeamProject {
@@ -152,6 +154,7 @@ func (c *DoctorsApiController) ScheduleAdvices() {
 				"config":         config,
 				"project_config": project_config,
 				"project":        project,
+				"drug":           drug,
 			})
 		}
 	}
@@ -1485,7 +1488,8 @@ func (c *DoctorsApiController) CreateFirstDisease() {
 	diagnostic_basis := dataBody["diagnostic_basis"].(string)
 	differential_diagnosis := dataBody["differential_diagnosis"].(string)
 	treatment_plan := dataBody["treatment_plan"].(string)
-
+	inspect_date := dataBody["inspect_date"].(string)
+	project_id := dataBody["project_id"].(string)
 	orgId := c.GetAdminUserInfo().CurrentOrgId
 	firstdisease := models.XtPatientFirstDisease{
 		Title:                 title,
@@ -1502,6 +1506,8 @@ func (c *DoctorsApiController) CreateFirstDisease() {
 		Ctime:                 time.Now().Unix(),
 		Mtime:                 0,
 		Status:                1,
+		ProjectId:             project_id,
+		InspectDate:           inspect_date,
 	}
 
 	error := service.CreatePatientFirstDisease(firstdisease)
@@ -1540,9 +1546,14 @@ func (c *DoctorsApiController) GetFirstDetailById() {
 
 	id, _ := c.GetInt64("id")
 	list, err := service.GetFirstDetailById(id)
+	ids := strings.Split(list.ProjectId, ",")
+	datelist := strings.Split(list.InspectDate, ",")
+	fmt.Println("list232323232323w", datelist)
+	inspectlist, err := service.GetInspectionItemlist(list.PatientId, datelist, ids)
 	if err == nil {
 		c.ServeSuccessJSON(map[string]interface{}{
-			"detail": list,
+			"detail":      list,
+			"inspectlist": inspectlist,
 		})
 		return
 	}
@@ -1568,7 +1579,8 @@ func (c *DoctorsApiController) UpdateFirstDisease() {
 	diagnostic_basis := dataBody["diagnostic_basis"].(string)
 	differential_diagnosis := dataBody["differential_diagnosis"].(string)
 	treatment_plan := dataBody["treatment_plan"].(string)
-
+	inspect_date := dataBody["inspect_date"].(string)
+	project_id := dataBody["project_id"].(string)
 	orgId := c.GetAdminUserInfo().CurrentOrgId
 	firstdisease := models.XtPatientFirstDisease{
 		Title:                 title,
@@ -1586,6 +1598,8 @@ func (c *DoctorsApiController) UpdateFirstDisease() {
 		Mtime:                 0,
 		Status:                1,
 		ID:                    id,
+		InspectDate:           inspect_date,
+		ProjectId:             project_id,
 	}
 
 	error := service.UpdatePatientFirstDisease(firstdisease, id)

controllers/his_api_controller.go

@@ -1054,8 +1054,201 @@ func (c *HisApiController) CreateHisPrescription() {
 		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeChargeWrong)
 		return
 	}
-	//已发药和已收费限制逻辑
 
+	pharmacyConfig, _ := service.FindPharmacyConfig(adminInfo.CurrentOrgId)
+
+	fmt.Println("0230032032032032032032023---------------", pharmacyConfig.IsOpen)
+	//药品发药出库
+	if pharmacyConfig.IsOpen == 1 {
+		if dataBody["prescriptions"] != nil && reflect.TypeOf(dataBody["prescriptions"]).String() == "[]interface {}" {
+			prescriptions, _ := dataBody["prescriptions"].([]interface{})
+			if len(prescriptions) > 0 {
+				for _, item := range prescriptions {
+					items := item.(map[string]interface{})
+					if items["advices"] != nil && reflect.TypeOf(items["advices"]).String() == "[]interface {}" {
+						advices := items["advices"].([]interface{})
+						if len(advices) > 0 {
+							for _, advice := range advices {
+								var drug_id int64
+								var prescribing_number float64
+								var prescribingNumberUnit string
+
+								var adviceId int64
+								if advice.(map[string]interface{})["id"] != nil || reflect.TypeOf(advice.(map[string]interface{})["id"]).String() == "float64" {
+									drug_id = int64(advice.(map[string]interface{})["id"].(float64))
+								}
+								if advice.(map[string]interface{})["prescribing_number"] != nil || reflect.TypeOf(advice.(map[string]interface{})["prescribing_number"]).String() == "string" {
+									prescribing_number_str := advice.(map[string]interface{})["prescribing_number"].(string)
+									prescribing_number, _ = strconv.ParseFloat(prescribing_number_str, 64)
+								}
+
+								if advice.(map[string]interface{})["prescribing_number_unit"] != nil && reflect.TypeOf(advice.(map[string]interface{})["prescribing_number_unit"]).String() == "string" {
+									prescribingNumberUnit, _ = advice.(map[string]interface{})["prescribing_number_unit"].(string)
+								}
+
+								if advice.(map[string]interface{})["advice_id"] != nil || reflect.TypeOf(advice.(map[string]interface{})["advice_id"]).String() == "float64" {
+									adviceId = int64(advice.(map[string]interface{})["advice_id"].(float64))
+								}
+
+								drug, _ := service.FindBaseDrugLibRecordSeven(adminInfo.CurrentOrgId, drug_id)
+								if drug.ID == 0 {
+									c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+									return
+								}
+
+								//查询药品的所有库存
+								list, _ := service.GetDrugWarehouseInfoPrescriptionSeven(drug_id, adminInfo.CurrentOrgId, storeConfig.DrugStorehouseOut)
+
+								var total_count int64
+								for _, it := range list {
+									total_count += it.StockMaxNumber*drug.MinNumber + it.StockMinNumber
+								}
+								totals := strconv.FormatInt(total_count, 10)
+								//查询该药品是否存在开药记录
+								advicelist, _ := service.GetHisAdviceListByDrugIdEight(drug_id, patient_id, recordDateTime, adviceId)
+
+								//新增处方
+								if advicelist.ID == 0 {
+									all_count, _ := strconv.ParseFloat(totals, 64)
+									if prescribingNumberUnit == drug.MinUnit {
+
+										if drug.IsUse != 1 {
+											if prescribing_number > all_count {
+												c.ServeDynamicFailJsonSend(drug.DrugName + "库存不足")
+												return
+											}
+
+										}
+
+									}
+									if prescribingNumberUnit == drug.MaxUnit {
+										num := prescribing_number * float64(drug.MinNumber)
+										if drug.IsUse != 1 {
+											if num > all_count {
+												c.ServeDynamicFailJsonSend(drug.DrugName + "库存不足")
+												return
+											}
+										}
+									}
+								}
+
+								drugOutConfig, _ := service.GetDrugOpenConfigOne(adminInfo.CurrentOrgId)
+								if drugOutConfig.IsOpen != 1 {
+									//修改处方
+									for _, advice := range advices {
+										var drug_id int64
+										var prescribing_number float64
+										var prescribingNumberUnit string
+										var prescribingNumber string
+
+										var adviceId int64
+										if advice.(map[string]interface{})["id"] != nil || reflect.TypeOf(advice.(map[string]interface{})["id"]).String() == "float64" {
+											drug_id = int64(advice.(map[string]interface{})["id"].(float64))
+										}
+										if advice.(map[string]interface{})["prescribing_number"] != nil || reflect.TypeOf(advice.(map[string]interface{})["prescribing_number"]).String() == "string" {
+											prescribing_number_str := advice.(map[string]interface{})["prescribing_number"].(string)
+											prescribing_number, _ = strconv.ParseFloat(prescribing_number_str, 64)
+											prescribingNumber = advice.(map[string]interface{})["prescribing_number"].(string)
+										}
+
+										if advice.(map[string]interface{})["prescribing_number_unit"] != nil && reflect.TypeOf(advice.(map[string]interface{})["prescribing_number_unit"]).String() == "string" {
+											prescribingNumberUnit, _ = advice.(map[string]interface{})["prescribing_number_unit"].(string)
+										}
+
+										if advice.(map[string]interface{})["advice_id"] != nil || reflect.TypeOf(advice.(map[string]interface{})["advice_id"]).String() == "float64" {
+											adviceId = int64(advice.(map[string]interface{})["advice_id"].(float64))
+										}
+
+										drug, _ := service.FindBaseDrugLibRecordSeven(adminInfo.CurrentOrgId, drug_id)
+										if drug.ID == 0 {
+											c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+											return
+										}
+										//查询药品的所有库存
+										list, _ := service.GetDrugWarehouseInfoPrescriptionSeven(drug_id, adminInfo.CurrentOrgId, storeConfig.DrugStorehouseOut)
+										var total_count int64
+										for _, it := range list {
+											total_count += it.StockMaxNumber*drug.MinNumber + it.StockMinNumber
+										}
+										totals := strconv.FormatInt(total_count, 10)
+										//查询该药品是否存在开药记录
+										advicelist, _ := service.GetHisAdviceListByDrugIdEight(drug_id, patient_id, recordDateTime, adviceId)
+
+										//新增处方
+										if advicelist.ID == 0 {
+
+											all_count, _ := strconv.ParseFloat(totals, 64)
+											if prescribingNumberUnit == drug.MinUnit {
+												if drug.IsUse != 1 {
+													if prescribing_number > all_count {
+														c.ServeDynamicFailJsonSend(drug.DrugName + "库存不足")
+														return
+													}
+
+												}
+
+											} else {
+												if prescribingNumberUnit == drug.MaxUnit {
+													num := prescribing_number * float64(drug.MinNumber)
+													if drug.IsUse != 1 {
+														if num > all_count {
+															c.ServeDynamicFailJsonSend(drug.DrugName + "库存不足")
+															return
+														}
+
+													}
+
+												}
+											}
+										}
+										//修改处方
+										if advicelist.ID > 0 {
+
+											var device_number int64
+
+											if advicelist.PrescribingNumberUnit == drug.MaxUnit {
+												prescribingNumberOne := strconv.FormatFloat(advicelist.PrescribingNumber, 'f', -1, 64)
+												prescribingNumberInt, _ := strconv.ParseInt(prescribingNumberOne, 10, 64)
+												device_number = prescribingNumberInt * drug.MinNumber
+											}
+											if advicelist.PrescribingNumberUnit == drug.MinUnit {
+												prescribingNumberOne := strconv.FormatFloat(advicelist.PrescribingNumber, 'f', -1, 64)
+												prescribingNumberInt, _ := strconv.ParseInt(prescribingNumberOne, 10, 64)
+												device_number = prescribingNumberInt
+											}
+
+											var number_count int64
+											if prescribingNumberUnit == drug.MaxUnit {
+												prescribingNumberInt, _ := strconv.ParseInt(prescribingNumber, 10, 64)
+												number_count = prescribingNumberInt * drug.MinNumber
+											}
+											if prescribingNumberUnit == drug.MinUnit {
+												prescribingNumberInt, _ := strconv.ParseInt(prescribingNumber, 10, 64)
+												number_count = prescribingNumberInt
+											}
+
+											//如果修改的数量大于之前修改的数量
+											if (number_count - device_number) > 0 {
+												//如果修改的差数量 大于库存数量
+												if drug.IsUse != 1 {
+													if (number_count - device_number) > total_count {
+														c.ServeDynamicFailJsonSend(drug.DrugName + "库存不足")
+														return
+													}
+												}
+											}
+										}
+									}
+								}
+							}
+						}
+					}
+				}
+			}
+		}
+	}
+
+	//已发药和已收费限制逻辑
 	if drugStockConfig.IsOpen == 1 || settleConfig.IsOpen == 1 {
 		//校验库存总量
 		if dataBody["prescriptions"] != nil && reflect.TypeOf(dataBody["prescriptions"]).String() == "[]interface {}" {
@@ -1282,7 +1475,7 @@ func (c *HisApiController) CreateHisPrescription() {
 														c.ServeDynamicFailJsonSend(drug.DrugName + "该批次剩余库存不足,剩余库存:" + strconv.FormatInt(info.StockMaxNumber, 10) + drug.MaxUnit + strconv.FormatInt(info.StockMinNumber, 10) + drug.MinUnit)
 														return
 													}
-													if adminInfo.CurrentOrgId == 10215 || adminInfo.CurrentOrgId == 10164 || adminInfo.CurrentOrgId == 3877 || adminInfo.CurrentOrgId == 9671 {
+													if adminInfo.CurrentOrgId == 10215 || adminInfo.CurrentOrgId == 10164 || adminInfo.CurrentOrgId == 3877 {
 														// 查询该药品最后一次出库记录
 														outInfo, _ := service.GetLastDrugWarehouseOutByDrugIdTwenty(drug_id, patient_id, recordDateTime, adviceId)
 
@@ -1755,7 +1948,6 @@ func (c *HisApiController) CreateHisPrescription() {
 
 											}
 
-											//删除记录
 											service.DeleteAutoWarehouse(patient_id, recordDateTime)
 
 										}
@@ -2389,7 +2581,7 @@ func (c *HisApiController) CreateHisPrescription() {
 						//如果历史数和当前数据不想等才进行退库出库
 						if out_count != parseIntCount {
 							service.ConsumablePrescriptionDelivery(adminInfo.CurrentOrgId, item.PatientId, item.RecordDate, &dialyPrepareOne, &lastOut, creater, parseIntCount)
-							fmt.Println("9999999----------------------------------------")
+
 							service.UpdateAutomaticReduce(item.PatientId, item.RecordDate, item.ProjectId, item.ID)
 							detail := models.AutomaticReduceDetail{
 								WarehouseOutId:          0,

controllers/mobile_api_controllers/check_weight_api_controller.go

@@ -269,7 +269,7 @@ func (c *CheckWeightApiController) SavePatientInfoDialysis() {
 
 	template, _ := service.GetOrgInfoTemplate(adminUserInfo.Org.Id)
 
-	if template.TemplateId == 22 || template.TemplateId == 17 || template.TemplateId == 21 || template.TemplateId == 26 || template.TemplateId == 27 || template.TemplateId == 34 || template.TemplateId == 30 || template.TemplateId == 32 || template.TemplateId == 36 || template.TemplateId == 40 || template.TemplateId == 38 || template.TemplateId == 43 || template.TemplateId == 46 || template.TemplateId == 53 || template.TemplateId == 48 || adminUserInfo.Org.Id == 10345 || adminUserInfo.Org.Id == 10432 || adminUserInfo.Org.Id == 10441 || adminUserInfo.Org.Id == 10445 || adminUserInfo.Org.Id == 10138 || adminUserInfo.Org.Id == 10278 || adminUserInfo.Org.Id == 9829 || adminUserInfo.Org.Id == 10440 || adminUserInfo.Org.Id == 10469 {
+	if template.TemplateId == 22 || template.TemplateId == 17 || template.TemplateId == 21 || template.TemplateId == 26 || template.TemplateId == 27 || template.TemplateId == 34 || template.TemplateId == 30 || template.TemplateId == 32 || template.TemplateId == 36 || template.TemplateId == 40 || template.TemplateId == 38 || template.TemplateId == 43 || template.TemplateId == 46 || template.TemplateId == 53 || template.TemplateId == 48 || adminUserInfo.Org.Id == 10345 || adminUserInfo.Org.Id == 10432 || adminUserInfo.Org.Id == 10441 || adminUserInfo.Org.Id == 10445 || adminUserInfo.Org.Id == 10138 || adminUserInfo.Org.Id == 10278 || adminUserInfo.Org.Id == 9829 || adminUserInfo.Org.Id == 10440 || adminUserInfo.Org.Id == 10469 || adminUserInfo.Org.Id == 10471 {
 		if adminUserInfo.Org.Id != 10447 {
 			dewater_amount = dewater_amount * 1000
 		}
@@ -378,6 +378,7 @@ func (c *CheckWeightApiController) SavePatientInfoDialysis() {
 			newprescribe.RecordDate = theAssessmentDateTime
 			newprescribe.DewaterAmount = dewater_amount
 			newprescribe.TargetUltrafiltration = dewater_amount
+			newprescribe.PrescriptionWater = dewater_amount
 			newprescribe.Status = 1
 			if adminUserInfo.Org.Id != 10013 && adminUserInfo.Org.Id != 10014 {
 				newprescribe.Remark = dialysisSolution.Remark
@@ -461,6 +462,7 @@ func (c *CheckWeightApiController) SavePatientInfoDialysis() {
 				newprescribe.RecordDate = theAssessmentDateTime
 				newprescribe.DewaterAmount = dewater_amount
 				newprescribe.TargetUltrafiltration = dewater_amount
+				newprescribe.PrescriptionWater = dewater_amount
 				newprescribe.Status = 1
 				newprescribe.Remark = lastDialysisPrescribe.Remark
 				if adminUserInfo.Org.Id == 10340 {
@@ -681,7 +683,7 @@ func (c *CheckWeightApiController) SavePatientInfoDialysis() {
 					evaluation.VenousCatheterization = lastPredialysisEvaluation.VenousCatheterization
 				}
 
-				if adminUserInfo.Org.Id == 9829 || adminUserInfo.Org.Id == 10469 {
+				if adminUserInfo.Org.Id == 9829 || adminUserInfo.Org.Id == 10469 || adminUserInfo.Org.Id == 10471 {
 					evaluation.PulseFrequency = 80
 				}
 				if adminUserInfo.Org.Id == 10440 {
@@ -690,6 +692,9 @@ func (c *CheckWeightApiController) SavePatientInfoDialysis() {
 				if adminUserInfo.Org.Id == 10469 {
 					evaluation.Temperature = 36.5
 				}
+				if adminUserInfo.Org.Id == 10471 {
+					evaluation.Temperature = 36.5
+				}
 			}
 		} else {
 			evaluation.UpdatedTime = time.Now().Unix()

controllers/mobile_api_controllers/dialysis_api_controller.go

@@ -744,7 +744,8 @@ func (c *DialysisAPIController) PostDoubleCheck() {
 	pipeline_connection_desc := c.GetString("pipeline_connection_desc")
 	collator, _ := c.GetInt64("collator", 0)
 	employee_number := c.GetString("employee_number")
-
+	dialyzer_batch_number := c.GetString("dialyzer_batch_number")
+	needle_batch_number := c.GetString("needle_batch_number")
 	if id <= 0 {
 		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
 		return
@@ -828,6 +829,8 @@ func (c *DialysisAPIController) PostDoubleCheck() {
 		CheckDate:                  recordDate.Unix(),
 		UpdatedTime:                time.Now().Unix(),
 		EmployeeNumber:             employee_number,
+		DialyzerBatchNumber:        dialyzer_batch_number,
+		NeedleBatchNumber:          needle_batch_number,
 	}
 
 	_, check := service.FindDoubleCheckByReordDate(id, recordDate.Unix(), adminUserInfo.Org.Id)
@@ -885,6 +888,8 @@ func (c *DialysisAPIController) PostDoubleCheck() {
 		doubleCheck.CreatedTime = check.CreatedTime
 		doubleCheck.ID = check.ID
 		doubleCheck.EmployeeNumber = employee_number
+		doubleCheck.NeedleBatchNumber = needle_batch_number
+		doubleCheck.DialyzerBatchNumber = dialyzer_batch_number
 		err := service.UpdateDoubleCheck(&doubleCheck)
 		//针对长沙南雅
 		if adminUserInfo.Org.Id == 9671 || adminUserInfo.Org.Id == 10340 || adminUserInfo.Org.Id == 3877 {
@@ -1490,7 +1495,7 @@ func (c *DialysisAPIController) PostDialysisPrescription() {
 		if filedConfig.ID > 0 {
 			str = dialyzerPerfusionApparatus
 		} else {
-			str = dialysis_dialyszers + "/" + dialysis_irrigation + "/" + dialysis_strainer
+			str = dialysis_dialyszers + "/" + dialysis_irrigation + " " + dialysis_strainer
 		}
 		service.ModifyScheduleMode(mode_id, id, recordDate.Unix(), adminUserInfo.Org.Id, str)
 	}
@@ -2391,6 +2396,19 @@ func (c *DialysisAPIController) Finish() {
 		dialysisOrder.FinishModifier = adminUserInfo.AdminUser.Id
 		dialysisOrder.EndTime = endDate.Unix()
 
+		// 长沙南雅需求
+		if adminUserInfo.Org.Id == 9671 || adminUserInfo.Org.Id == 3877 || adminUserInfo.Org.Id == 10340 {
+
+			//获取最后1条监测的数据
+			fristrecordone, _ := service.FindFirstMonitorRecordToday(dialysisOrder.PatientId, dialysisOrder.UserOrgId, dialysisOrder.DialysisDate)
+			lastrecord, _ := service.FindLastMonitorRecordToday(dialysisOrder.PatientId, dialysisOrder.UserOrgId, dialysisOrder.DialysisDate)
+			var accumulatedBloodVolume float64
+			accumulatedBloodVolume = (lastrecord.BloodFlowVolume - 25) * (math.Floor(float64(lastrecord.OperateTime-fristrecordone.OperateTime)/3600) * 60) / 1000
+			fmt.Println("累计血容量", accumulatedBloodVolume)
+			err := service.UpdateLastMonitorRecordToday(accumulatedBloodVolume, lastrecord.ID)
+			fmt.Println(err)
+		}
+
 		go func() {
 			ssoDomain := beego.AppConfig.String("call_domain")
 			api := ssoDomain + "/index/downpatient"
@@ -3022,7 +3040,7 @@ func (c *DialysisAPIController) PostSolution() {
 		if filedConfig.ID > 0 {
 			str = dialyzerPerfusionApparatus
 		} else {
-			str = dialysis_dialyszers + "/" + dialysis_irrigation + "/" + dialysis_strainer
+			str = dialysis_dialyszers + "/" + dialysis_irrigation + " " + dialysis_strainer
 		}
 		service.ModifyScheduleMode(mode_id, patient.ID, recordDate.Unix(), adminUserInfo.Org.Id, str)
 	}
@@ -3604,10 +3622,9 @@ func (this *DialysisAPIController) GetLastMonitorRecordTody() {
 				record.UltrafiltrationRate = ultrafiltration_rate
 			}
 
-			fmt.Println("adminiNof2323323232", adminInfo.Org.Id)
-			if adminInfo.Org.Id == 10395 || adminInfo.Org.Id == 10138 || adminInfo.Org.Id == 10278 || adminInfo.Org.Id == 10340 || adminInfo.Org.Id == 10432 || adminInfo.Org.Id == 10441 || adminInfo.Org.Id == 10445 || adminInfo.Org.Id == 9829 || adminInfo.Org.Id == 10440 || adminInfo.Org.Id == 10469 {
+			if adminInfo.Org.Id == 10395 || adminInfo.Org.Id == 10138 || adminInfo.Org.Id == 10278 || adminInfo.Org.Id == 10340 || adminInfo.Org.Id == 10432 || adminInfo.Org.Id == 10441 || adminInfo.Org.Id == 10445 || adminInfo.Org.Id == 9829 || adminInfo.Org.Id == 10440 || adminInfo.Org.Id == 10469 || adminInfo.Org.Id == 10471 {
 				ultrafiltration_rate = math.Floor(prescription.TargetUltrafiltration * 60 / 1000 / float64(totalMin) * 1000)
-				fmt.Println("ooooooooooo", ultrafiltration_rate)
+
 				record.UltrafiltrationRate = ultrafiltration_rate
 			}
 			//if template.TemplateId == 47 {
@@ -3636,19 +3653,19 @@ func (this *DialysisAPIController) GetLastMonitorRecordTody() {
 	}
 
 	//长沙南雅
-	if adminInfo.Org.Id == 10395 || adminInfo.Org.Id == 10138 || adminInfo.Org.Id == 10278 || adminInfo.Org.Id == 10432 || adminInfo.Org.Id == 10441 || adminInfo.Org.Id == 10445 || adminInfo.Org.Id == 10469 {
-		fmt.Println("ultrafiltration_rate-------", ultrafiltration_rate)
+	if adminInfo.Org.Id == 10395 || adminInfo.Org.Id == 10138 || adminInfo.Org.Id == 10278 || adminInfo.Org.Id == 10432 || adminInfo.Org.Id == 10441 || adminInfo.Org.Id == 10445 || adminInfo.Org.Id == 10469 || adminInfo.Org.Id == 10471 {
+
 		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
 		}
 
 	}
 	//长沙南雅累计血容量自动计算
-	if adminInfo.Org.Id == 10340 || adminInfo.Org.Id == 9671 {
-		record.AccumulatedBloodVolume = (record.BloodFlowVolume - 25) * (math.Floor(float64(record.OperateTime+3600-fristrecord.OperateTime)/3600) * 60) / 1000
-	}
+	//if adminInfo.Org.Id == 10340 || adminInfo.Org.Id == 9671 ||  adminInfo.Org.Id == 3877{
+	//	record.AccumulatedBloodVolume = (record.BloodFlowVolume - 25) * (math.Floor(float64(record.OperateTime+3600-fristrecord.OperateTime)/3600) * 60) / 1000
+	//}
 
 	if template.TemplateId == 47 || template.TemplateId == 54 {
 		record.DisplacementQuantity = record.DisplacementQuantity + record.DisplacementQuantity
@@ -4564,6 +4581,7 @@ func (c *DialysisAPIController) CreateRemindDoctorAdvice() {
 	}
 
 	if len(advices) > 0 {
+
 		list, err := service.CreateMGroupAdvice(adminUserInfo.Org.Id, advices, groupNo)
 		key := strconv.FormatInt(adminUserInfo.Org.Id, 10) + ":" + strconv.FormatInt(patient, 10) + ":" + strconv.FormatInt(RecordDate, 10) + ":doctor_advices"
 		redis := service.RedisClient()
@@ -4904,8 +4922,6 @@ func (c *DialysisAPIController) CreateConsumables() {
 			}
 		}
 
-		fmt.Println("active------------------------------------", active)
-		fmt.Println("len------------------------------", len(goods))
 		//新增
 		if active == 1 && len(goods) > 0 {
 			for _, item := range dialysisBefor {
@@ -5677,124 +5693,89 @@ func (c *DialysisAPIController) EditConsumables() {
 
 				}
 
-				//退库
-				for _, item := range cancelbefor {
-					warehouseOut, _ := service.FindStockOutByIsSys(adminInfo.Org.Id, 1, record_time)
-					creater := adminInfo.AdminUser.Id
+				if len(cancelbefor) > 0 {
 					//退库
-					//err = ConsumablesDeliveryTotalSeven(adminInfo.Org.Id, patient_id, record_time, cancelbefor, adminInfo.AdminUser.Id, item.Count)
-					//查询该患者当天已经出库的耗材信息
+					for _, item := range cancelbefor {
+						warehouseOut, _ := service.FindStockOutByIsSys(adminInfo.Org.Id, 1, record_time)
+						creater := adminInfo.AdminUser.Id
 
-					warehouseOutInfos, _ := service.FindStockOutInfoByStockTwo(adminInfo.Org.Id, item.GoodTypeId, item.GoodId, record_time, patient_id)
+						//查询该患者当天已经出库的耗材信息
+						warehouseOutInfos, _ := service.FindStockOutInfoByStockTwo(adminInfo.Org.Id, item.GoodTypeId, item.GoodId, record_time, patient_id)
 
-					var delete_count int64 = 0
+						var delete_count int64 = 0
 
-					delete_count = warehouseOutInfos.Count - item.Count
+						delete_count = warehouseOutInfos.Count - item.Count
 
-					//增加库存数量
-					service.ModifyGoodAddInformation(item.GoodId, delete_count, adminInfo.Org.Id)
+						//增加库存数量
+						service.ModifyGoodAddInformation(item.GoodId, delete_count, adminInfo.Org.Id)
 
-					//增加出库库存数量
-					service.ModifyReduceGoodSumCount(houseConfig.StorehouseOutInfo, delete_count, adminInfo.Org.Id, item.GoodId)
+						//减少实际出库库存数量
+						service.ModifyReduceGoodSumCountTwenty(houseConfig.StorehouseOutInfo, delete_count, adminInfo.Org.Id, item.GoodId)
 
-					// 删除出库完成后，要增加对应批次的库存数量
+						// 删除出库完成后，要增加对应批次的库存数量
 
-					service.UpDateWarehouseInfoByStockDelete(warehouseOutInfos.WarehouseInfotId, delete_count, patient_id, record_time, item.GoodId)
+						service.UpDateWarehouseInfoByStockDelete(warehouseOutInfos.WarehouseInfotId, delete_count, patient_id, record_time, item.GoodId)
 
-					houseConfig, _ := service.GetAllStoreHouseConfig(adminInfo.Org.Id)
+						houseConfig, _ := service.GetAllStoreHouseConfig(adminInfo.Org.Id)
 
-					//更新剩余库存
-					goodListOne, _ := service.GetSumGoodList(adminInfo.Org.Id, houseConfig.StorehouseOutInfo, item.GoodId)
-					var flush_count int64
-					for _, it := range goodListOne {
-						flush_count += it.StockCount
-					}
-					service.UpdateSumGood(adminInfo.Org.Id, houseConfig.StorehouseOutInfo, item.GoodId, flush_count)
+						//更新剩余库存
+						goodListOne, _ := service.GetSumGoodList(adminInfo.Org.Id, houseConfig.StorehouseOutInfo, item.GoodId)
+						var flush_count int64
+						for _, it := range goodListOne {
+							flush_count += it.StockCount
+						}
+						service.UpdateSumGood(adminInfo.Org.Id, houseConfig.StorehouseOutInfo, item.GoodId, flush_count)
 
-					//查询剩余库存
-					goodList, _ := service.GetAllGoodSumCount(item.GoodId, adminInfo.Org.Id, houseConfig.StorehouseOutInfo)
-					var sum_count int64
-					for _, item := range goodList {
-						sum_count += item.StockCount
-					}
+						//查询剩余库存
+						goodList, _ := service.GetAllGoodSumCount(item.GoodId, adminInfo.Org.Id, houseConfig.StorehouseOutInfo)
+						var sum_count int64
+						for _, item := range goodList {
+							sum_count += item.StockCount
+						}
 
-					// 在出库记录表里记录退库详情
-					warehouseOutInfo := &models.WarehouseOutInfo{
-						WarehouseOutOrderNumber: warehouseOut.WarehouseOutOrderNumber,
-						WarehouseOutId:          warehouseOut.ID,
-						Status:                  1,
-						Ctime:                   time.Now().Unix(),
-						OrgId:                   adminInfo.Org.Id,
-						Type:                    1,
-						IsSys:                   1,
-						SysRecordTime:           record_time,
-						GoodTypeId:              item.GoodTypeId,
-						GoodId:                  item.GoodId,
-						PatientId:               patient_id,
-						ConsumableType:          2,
-						StorehouseId:            houseConfig.StorehouseOutInfo,
-						IsCheck:                 1,
-						OverCount:               sum_count,
-					}
-					warehouseOutInfo.Count = item.Count
-
-					stockInInfo, _ := service.FindLastStockInInfoRecord(item.GoodId, adminInfo.Org.Id)
-					warehouseOutInfo.Price = stockInInfo.Price
-					warehouseOutInfo.Dealer = stockInInfo.Dealer
-					warehouseOutInfo.Manufacturer = stockInInfo.Manufacturer
-					warehouseOutInfo.ExpiryDate = stockInInfo.ExpiryDate
-					warehouseOutInfo.ProductDate = stockInInfo.ProductDate
-					warehouseOutInfo.Number = warehouseOutInfos.Number
-					warehouseOutInfo.LicenseNumber = stockInInfo.LicenseNumber
-					warehouseOutInfo.WarehouseInfotId = stockInInfo.ID
-					//查找当天是否存在出库记录
-					_, errcod := service.GetWarehouseOutInfoIsExistOne(item.GoodId, patient_id, record_time, 0)
-
-					if errcod == gorm.ErrRecordNotFound {
-						service.AddSigleWarehouseOutInfo(warehouseOutInfo)
-						//插入详情明细表
-						stockFlow := models.VmStockFlow{
+						// 在出库记录表里记录退库详情
+						warehouseOutInfo := &models.WarehouseOutInfo{
 							WarehouseOutOrderNumber: warehouseOut.WarehouseOutOrderNumber,
 							WarehouseOutId:          warehouseOut.ID,
-							GoodId:                  item.GoodId,
-							Number:                  warehouseOutInfos.Number,
-							ProductDate:             stockInInfo.ProductDate,
-							ExpireDate:              stockInInfo.ExpiryDate,
-							Count:                   item.Count,
-							Price:                   stockInInfo.Price,
 							Status:                  1,
 							Ctime:                   time.Now().Unix(),
-							UserOrgId:               adminInfo.Org.Id,
-							Manufacturer:            stockInInfo.Manufacturer,
-							Dealer:                  stockInInfo.Dealer,
-							LicenseNumber:           stockInInfo.LicenseNumber,
-							IsEdit:                  2,
-							Creator:                 creater,
-							SystemTime:              record_time,
-							ConsumableType:          3,
-							WarehousingDetailId:     0,
+							OrgId:                   adminInfo.Org.Id,
+							Type:                    1,
 							IsSys:                   1,
-							UpdateCreator:           creater,
+							SysRecordTime:           record_time,
+							GoodTypeId:              item.GoodTypeId,
+							GoodId:                  item.GoodId,
 							PatientId:               patient_id,
+							ConsumableType:          2,
 							StorehouseId:            houseConfig.StorehouseOutInfo,
+							IsCheck:                 1,
+							OverCount:               sum_count,
 						}
-						exsit, errflow := service.GetStockFlowIsExsit(warehouseOutInfos.WarehouseInfotId, patient_id, record_time, item.GoodId)
-						if errflow == gorm.ErrRecordNotFound {
-							//创建流水表
-							err := service.CreateStockFlowOne(stockFlow)
-							fmt.Println("err", err)
-						} else if errflow == nil {
+						warehouseOutInfo.Count = item.Count
+
+						stockInInfo, _ := service.FindLastStockInInfoRecord(item.GoodId, adminInfo.Org.Id)
+						warehouseOutInfo.Price = stockInInfo.Price
+						warehouseOutInfo.Dealer = stockInInfo.Dealer
+						warehouseOutInfo.Manufacturer = stockInInfo.Manufacturer
+						warehouseOutInfo.ExpiryDate = stockInInfo.ExpiryDate
+						warehouseOutInfo.ProductDate = stockInInfo.ProductDate
+						warehouseOutInfo.Number = warehouseOutInfos.Number
+						warehouseOutInfo.LicenseNumber = stockInInfo.LicenseNumber
+						warehouseOutInfo.WarehouseInfotId = stockInInfo.ID
+						//查找当天是否存在出库记录
+						_, errcod := service.GetWarehouseOutInfoIsExistOne(item.GoodId, patient_id, record_time, 0)
+
+						if errcod == gorm.ErrRecordNotFound {
+							service.AddSigleWarehouseOutInfo(warehouseOutInfo)
 							//插入详情明细表
 							stockFlow := models.VmStockFlow{
-								ID:                      exsit.ID,
-								WarehousingId:           warehouseOutInfos.WarehouseInfotId,
 								WarehouseOutOrderNumber: warehouseOut.WarehouseOutOrderNumber,
 								WarehouseOutId:          warehouseOut.ID,
 								GoodId:                  item.GoodId,
 								Number:                  warehouseOutInfos.Number,
 								ProductDate:             stockInInfo.ProductDate,
 								ExpireDate:              stockInInfo.ExpiryDate,
-								Count:                   exsit.Count - delete_count,
+								Count:                   item.Count,
 								Price:                   stockInInfo.Price,
 								Status:                  1,
 								Ctime:                   time.Now().Unix(),
@@ -5812,131 +5793,207 @@ func (c *DialysisAPIController) EditConsumables() {
 								PatientId:               patient_id,
 								StorehouseId:            houseConfig.StorehouseOutInfo,
 							}
+							exsit, errflow := service.GetStockFlowIsExsit(warehouseOutInfos.WarehouseInfotId, patient_id, record_time, item.GoodId)
+							if errflow == gorm.ErrRecordNotFound {
+								//创建流水表
+								err := service.CreateStockFlowOne(stockFlow)
+								fmt.Println("err", err)
+							} else if errflow == nil {
+								//插入详情明细表
+								stockFlow := models.VmStockFlow{
+									ID:                      exsit.ID,
+									WarehousingId:           warehouseOutInfos.WarehouseInfotId,
+									WarehouseOutOrderNumber: warehouseOut.WarehouseOutOrderNumber,
+									WarehouseOutId:          warehouseOut.ID,
+									GoodId:                  item.GoodId,
+									Number:                  warehouseOutInfos.Number,
+									ProductDate:             stockInInfo.ProductDate,
+									ExpireDate:              stockInInfo.ExpiryDate,
+									Count:                   exsit.Count - delete_count,
+									Price:                   stockInInfo.Price,
+									Status:                  1,
+									Ctime:                   time.Now().Unix(),
+									UserOrgId:               adminInfo.Org.Id,
+									Manufacturer:            stockInInfo.Manufacturer,
+									Dealer:                  stockInInfo.Dealer,
+									LicenseNumber:           stockInInfo.LicenseNumber,
+									IsEdit:                  2,
+									Creator:                 creater,
+									SystemTime:              record_time,
+									ConsumableType:          3,
+									WarehousingDetailId:     0,
+									IsSys:                   1,
+									UpdateCreator:           creater,
+									PatientId:               patient_id,
+									StorehouseId:            houseConfig.StorehouseOutInfo,
+								}
 
-							service.UpdatedStockFlowOne(stockFlow, warehouseOut.ID, patient_id, record_time, item.GoodId)
-						}
+								service.UpdatedStockFlowOne(stockFlow, warehouseOut.ID, patient_id, record_time, item.GoodId)
+							}
 
-					} else if errcod == nil {
-						service.UpdatedWarehouseOutInfo(warehouseOutInfo, item.GoodId, patient_id, record_time, 0)
+						} else if errcod == nil {
+							service.UpdatedWarehouseOutInfo(warehouseOutInfo, item.GoodId, patient_id, record_time, 0)
 
-						fmt.Println("进来-------------------------------------------------")
+							//查询剩余库存
+							goodList, _ := service.GetAllGoodSumCount(item.GoodId, adminInfo.Org.Id, houseConfig.StorehouseOutInfo)
+							var sum_count int64
+							for _, item := range goodList {
+								sum_count += item.StockCount
+							}
 
-						//查询剩余库存
-						goodList, _ := service.GetAllGoodSumCount(item.GoodId, adminInfo.Org.Id, houseConfig.StorehouseOutInfo)
-						var sum_count int64
-						for _, item := range goodList {
-							sum_count += item.StockCount
+							//创建退库单,生成退库数据
+							houseConfig, _ := service.GetAllStoreHouseConfig(adminInfo.Org.Id)
+							good, _ := service.FindGoodInfoByIdTwo(item.GoodId)
+
+							operation_time := time.Now().Unix()
+							creater := adminInfo.AdminUser.Id
+							//创建退库单
+							timeStr := time.Now().Format("2006-01-02")
+							timeArr := strings.Split(timeStr, "-")
+							total, _ := service.FindAllCancelStockTotal(adminInfo.Org.Id)
+							total = total + 1
+							orderNumber := "CKTKD" + strconv.FormatInt(adminInfo.Org.Id, 10) + timeArr[0] + timeArr[1] + timeArr[2] + "000" + strconv.FormatInt(total, 10)
+
+							cancelStock := models.CancelStock{
+								OrderNumber:  orderNumber,
+								OperaTime:    operation_time,
+								OrgId:        adminInfo.Org.Id,
+								Creater:      creater,
+								Ctime:        time.Now().Unix(),
+								Status:       1,
+								ReturnTime:   record_time,
+								Type:         1,
+								StorehouseId: houseConfig.StorehouseOutInfo,
+								IsCheck:      1,
+							}
+							_, msgerrkonde := service.GetCancelStockDetailByOrderNumberOne(record_time, adminInfo.Org.Id)
+							if msgerrkonde == gorm.ErrRecordNotFound {
+								service.AddSigleCancelStock(&cancelStock)
+							}
+							cancel, _ := service.GetLastCancelStockById(adminInfo.Org.Id)
+
+							//查询是否有出库
+							info, _ := service.GetLastWarehoseByGoodId(item.GoodId, patient_id, record_time)
+
+							manufacturer, _ := service.GetManufactureById(info.Manufacturer)
+							deaerler, _ := service.GetDealerById(info.Dealer)
+
+							if info.ID > 0 {
+								cancelInfo, _ := service.GetLastCancelStockInfoByGoodId(item.GoodId)
+								cancelStockInfo := models.CancelStockInfo{
+									GoodId:          item.GoodId,
+									CancelStockId:   cancel.ID,
+									GoodTypeId:      good.GoodTypeId,
+									Count:           delete_count,
+									Price:           info.Price,
+									Total:           0,
+									ProductDate:     info.ProductDate,
+									ExpiryDate:      info.ExpiryDate,
+									Ctime:           time.Now().Unix(),
+									Status:          1,
+									OrgId:           adminInfo.Org.Id,
+									OrderNumber:     cancel.OrderNumber,
+									Type:            0,
+									Dealer:          deaerler.DealerName,
+									Manufacturer:    manufacturer.ManufacturerName,
+									Number:          info.Number,
+									RegisterAccount: "",
+									Remark:          "",
+									WarehouseInfoId: info.WarehouseInfotId,
+									PatientId:       info.PatientId,
+									RecordDate:      info.SysRecordTime,
+									StorehouseId:    houseConfig.StorehouseOutInfo,
+									IsCheck:         1,
+								}
+
+								service.CreateCancelStockInfoOne(&cancelStockInfo)
+
+								//退库数量增加
+								service.UpdateSumAddCancelCount(adminInfo.Org.Id, item.GoodId, houseConfig.StorehouseOutInfo, delete_count)
+
+								//查询剩余库存
+								goodList, _ := service.GetSumGoodList(adminInfo.Org.Id, houseConfig.StorehouseOutInfo, item.GoodId)
+								var over_count int64
+								for _, it := range goodList {
+									over_count += it.StockCount
+								}
+
+								flow := models.VmStockFlow{
+									WarehousingId:           info.WarehouseInfotId,
+									GoodId:                  item.GoodId,
+									Number:                  info.Number,
+									LicenseNumber:           info.LicenseNumber,
+									Count:                   delete_count,
+									UserOrgId:               adminInfo.Org.Id,
+									PatientId:               patient_id,
+									SystemTime:              info.SysRecordTime,
+									ConsumableType:          7,
+									IsSys:                   0,
+									WarehousingOrder:        "",
+									WarehouseOutId:          info.WarehouseOutId,
+									WarehouseOutOrderNumber: info.WarehouseOutOrderNumber,
+									IsEdit:                  0,
+									CancelStockId:           cancel.ID,
+									CancelOrderNumber:       cancel.OrderNumber,
+									Manufacturer:            manufacturer.ID,
+									Dealer:                  0,
+									Creator:                 adminInfo.AdminUser.Id,
+									UpdateCreator:           0,
+									Status:                  1,
+									Ctime:                   time.Now().Unix(),
+									Mtime:                   0,
+									Price:                   info.Price,
+									WarehousingDetailId:     info.WarehouseInfotId,
+									WarehouseOutDetailId:    info.ID,
+									CancelOutDetailId:       cancelInfo.ID,
+									ProductDate:             info.ProductDate,
+									ExpireDate:              info.ExpiryDate,
+									StorehouseId:            houseConfig.StorehouseOutInfo,
+									OverCount:               over_count,
+								}
+								service.CreateStockFlowOne(flow)
+
+							}
 						}
-						//插入详情明细表
-						stockFlow := models.VmStockFlow{
-							WarehousingId:           warehouseOutInfos.WarehouseInfotId,
-							WarehouseOutOrderNumber: warehouseOut.WarehouseOutOrderNumber,
-							WarehouseOutId:          warehouseOut.ID,
+
+						//更改自动出库的表格
+						details := models.BloodAutomaticReduceDetail{
+							WarehouseOutId:          warehouseOutInfo.ID,
+							WarehouseOutOrderNumber: warehouseOutInfo.WarehouseOutOrderNumber,
+							PatientId:               patient_id,
+							Ctime:                   time.Now().Unix(),
+							Mtime:                   time.Now().Unix(),
+							Status:                  1,
+							RecordTime:              record_time,
+							OrgId:                   adminInfo.Org.Id,
 							GoodId:                  item.GoodId,
-							Number:                  warehouseOutInfos.Number,
-							ProductDate:             stockInInfo.ProductDate,
-							ExpireDate:              stockInInfo.ExpiryDate,
+							GoodTypeId:              item.GoodTypeId,
 							Count:                   item.Count,
-							Price:                   stockInInfo.Price,
-							Status:                  1,
-							Ctime:                   time.Now().Unix(),
-							UserOrgId:               adminInfo.Org.Id,
-							Manufacturer:            stockInInfo.Manufacturer,
-							Dealer:                  stockInInfo.Dealer,
-							LicenseNumber:           stockInInfo.LicenseNumber,
-							IsEdit:                  2,
-							Creator:                 creater,
-							SystemTime:              record_time,
-							ConsumableType:          3,
-							WarehousingDetailId:     0,
-							IsSys:                   1,
-							UpdateCreator:           creater,
-							PatientId:               patient_id,
-							ReturnCount:             delete_count,
 							StorehouseId:            houseConfig.StorehouseOutInfo,
-							OverCount:               sum_count,
 						}
-						exsit, errflows := service.GetStockFlowIsExsit(warehouseOutInfos.WarehouseInfotId, patient_id, record_time, item.GoodId)
+						//查询当天耗材是否已经存在数据
+						_, errcode := service.GetAutoMaticReduceDetail(adminInfo.Org.Id, patient_id, record_time, item.GoodId, item.GoodTypeId)
 
-						if errflows == gorm.ErrRecordNotFound {
-							//创建流水表
-							service.CreateStockFlowOne(stockFlow)
-						} else if errflows == nil {
-							stockFlow := models.VmStockFlow{
-								WarehousingId:           warehouseOutInfos.WarehouseInfotId,
-								ID:                      exsit.ID,
-								WarehouseOutOrderNumber: warehouseOut.WarehouseOutOrderNumber,
-								WarehouseOutId:          warehouseOut.ID,
-								GoodId:                  item.GoodId,
-								Number:                  warehouseOutInfos.Number,
-								ProductDate:             stockInInfo.ProductDate,
-								ExpireDate:              stockInInfo.ExpiryDate,
-								Count:                   exsit.Count - delete_count,
-								Price:                   stockInInfo.Price,
-								Status:                  1,
-								Ctime:                   time.Now().Unix(),
-								UserOrgId:               adminInfo.Org.Id,
-								Manufacturer:            stockInInfo.Manufacturer,
-								Dealer:                  stockInInfo.Dealer,
-								LicenseNumber:           stockInInfo.LicenseNumber,
-								IsEdit:                  2,
-								Creator:                 creater,
-								SystemTime:              record_time,
-								ConsumableType:          3,
-								WarehousingDetailId:     0,
-								IsSys:                   1,
-								UpdateCreator:           creater,
-								PatientId:               patient_id,
-								ReturnCount:             delete_count,
-								StorehouseId:            houseConfig.StorehouseOutInfo,
-								OverCount:               exsit.OverCount + delete_count,
-							}
-							fmt.Println("stockFlow--------------------", stockFlow.OverCount)
-							service.UpdatedStockFlowFive(stockFlow, warehouseOut.ID, patient_id, record_time, item.GoodId)
-						}
+						if errcode == gorm.ErrRecordNotFound {
+							service.CreateAutoReduceRecord(&details)
 
-					}
+						} else if errcode == nil {
+							service.DeleteAutoRedeceDetailTwo(adminInfo.Org.Id, patient_id, record_time, item.GoodId, item.GoodTypeId)
+							service.CreateAutoReduceRecord(&details)
 
-					//更改自动出库的表格
-					details := models.BloodAutomaticReduceDetail{
-						WarehouseOutId:          warehouseOutInfo.ID,
-						WarehouseOutOrderNumber: warehouseOutInfo.WarehouseOutOrderNumber,
-						PatientId:               patient_id,
-						Ctime:                   time.Now().Unix(),
-						Mtime:                   time.Now().Unix(),
-						Status:                  1,
-						RecordTime:              record_time,
-						OrgId:                   adminInfo.Org.Id,
-						GoodId:                  item.GoodId,
-						GoodTypeId:              item.GoodTypeId,
-						Count:                   item.Count,
-						StorehouseId:            houseConfig.StorehouseOutInfo,
-					}
-					//查询当天耗材是否已经存在数据
-					_, errcode := service.GetAutoMaticReduceDetail(adminInfo.Org.Id, patient_id, record_time, item.GoodId, item.GoodTypeId)
-
-					if errcode == gorm.ErrRecordNotFound {
-						service.CreateAutoReduceRecord(&details)
+						}
 
-					} else if errcode == nil {
-						service.DeleteAutoRedeceDetailTwo(adminInfo.Org.Id, patient_id, record_time, item.GoodId, item.GoodTypeId)
-						service.CreateAutoReduceRecord(&details)
+						//查询默认仓库
+						storeHouseConfig, _ := service.GetAllStoreHouseConfig(adminInfo.Org.Id)
+						stockList, _ := service.GetStockCountByGoodId(item.GoodId, storeHouseConfig.StorehouseOutInfo, adminInfo.Org.Id)
+						var total_count int64
+						for _, it := range stockList {
+							total_count += it.StockCount
+						}
+						//基础库插入数据
+						service.UpdateGoodInfoReduceSumCount(item.GoodId, total_count, adminInfo.Org.Id)
 
 					}
-
-					//errOne := service.UpDateWarehouStockFlowByStockDelete(warehouseOutInfos.WarehouseInfotId, record_time, item.GoodId, delete_count, patient_id)
-					//fmt.Println("errOne", errOne)
-
-					//查询默认仓库
-					storeHouseConfig, _ := service.GetAllStoreHouseConfig(adminInfo.Org.Id)
-					stockList, _ := service.GetStockCountByGoodId(item.GoodId, storeHouseConfig.StorehouseOutInfo, adminInfo.Org.Id)
-					var total_count int64
-					for _, it := range stockList {
-						total_count += it.StockCount
-					}
-					//基础库插入数据
-					service.UpdateGoodInfoReduceSumCount(item.GoodId, total_count, adminInfo.Org.Id)
-
 				}
 
 				fmt.Println("lnet---------------------------", len(outbefor))
@@ -5950,26 +6007,9 @@ func (c *DialysisAPIController) EditConsumables() {
 						//计算当前出库和最后一次出库数据相差数据
 						last_total = item.Count - goodInfoOne.Count
 
-						//查询该批次剩余库存
-						lastInfo, _ := service.GetLastStockOut(goodInfoOne.WarehouseInfotId)
-
-						if lastInfo.StockCount == 0 {
-							//查询该耗材的总库存
-							wareinfo, _ := service.GetStockGoodCount(item.GoodId)
-							if wareinfo.StockCount == 0 {
-								goodObj, _ := service.GetGoodInformationByGoodId(item.GoodId)
-								c.ServeSuccessJSON(map[string]interface{}{
-									"message":            "1",
-									"good_name":          goodObj.GoodName,
-									"specification_name": goodObj.SpecificationName,
-								})
-								return
-							}
-
-						}
-
 						//查询该耗材的总库存
 						wareinfo, _ := service.GetStockGoodCount(item.GoodId)
+
 						// 如果库存差大于剩余库存则提示库存不足
 						if last_total > wareinfo.StockCount {
 							goodObj, _ := service.GetGoodInformationByGoodId(item.GoodId)
@@ -6035,8 +6075,7 @@ func (c *DialysisAPIController) EditConsumables() {
 								ProjectId:    0,
 								StorehouseId: houseConfig.StorehouseOutInfo,
 							}
-							//fmt.Println("prepare", prepare.Count)
-							//fmt.Println("count", item.Count)
+
 							service.ConsumablesGoodDelivery(adminInfo.Org.Id, patient_id, record_time, &prepare, &out, item.Count)
 							//增加出库数量
 							service.ModifyGoodSumCount(houseConfig.StorehouseOutInfo, prepare.Count, adminInfo.Org.Id, item.GoodId)
@@ -6096,6 +6135,7 @@ func (c *DialysisAPIController) EditConsumables() {
 					for _, it := range goodList {
 						flush_count += it.StockCount
 					}
+
 					service.UpdateSumGood(adminInfo.Org.Id, storeHouseConfig.StorehouseOutInfo, it.GoodId, flush_count)
 
 				}
@@ -6360,13 +6400,19 @@ func (c *DialysisAPIController) CreateOtherStockOutInfo() {
 				}
 				project_id := int64(items["project_id"].(float64))
 
+				new_count := int64(items["new_count"].(float64))
+				old_count := int64(items["old_count"].(float64))
+
 				prepare := &models.DialysisBeforePrepareGoods{
 					GoodId:       good_id,
 					GoodTypeId:   good_type_id,
 					Count:        count,
 					ProjectId:    project_id,
 					StorehouseId: houseConfig.StorehouseOutInfo,
+					NewCount:     new_count,
+					OldCount:     old_count,
 				}
+
 				beforePrepares = append(beforePrepares, prepare)
 
 				newPrepare := &models.NewDialysisBeforePrepareGoods{
@@ -6375,25 +6421,35 @@ func (c *DialysisAPIController) CreateOtherStockOutInfo() {
 					Count:        count,
 					ProjectId:    project_id,
 					StorehouseId: houseConfig.StorehouseOutInfo,
+					NewCount:     new_count,
+					OldCount:     old_count,
 				}
+
 				newBeforePrepares = append(newBeforePrepares, newPrepare)
+
 			}
 		}
 	}
 
 	//查询是否有库存
+
 	for _, item := range beforePrepares {
-		storeConfig, _ := service.GetAllStoreHouseConfig(adminInfo.Org.Id)
-		warehouse, _ := service.FindFirstWarehousingInfoByStockTwo(item.GoodId, item.GoodTypeId, storeConfig.StorehouseOutInfo)
-		if item.Count > warehouse.Count {
-			goodObj, _ := service.GetGoodInformationByGoodId(item.GoodId)
-			c.ServeSuccessJSON(map[string]interface{}{
-				"message":            "1",
-				"good_name":          goodObj.GoodName,
-				"specification_name": goodObj.SpecificationName,
-			})
-			return
+
+		if item.NewCount > 0 {
+			storeConfig, _ := service.GetAllStoreHouseConfig(adminInfo.Org.Id)
+			warehouse, _ := service.FindFirstWarehousingInfoByStockTwo(item.GoodId, item.GoodTypeId, storeConfig.StorehouseOutInfo)
+
+			if item.Count > warehouse.Count {
+				goodObj, _ := service.GetGoodInformationByGoodId(item.GoodId)
+				c.ServeSuccessJSON(map[string]interface{}{
+					"message":            "1",
+					"good_name":          goodObj.GoodName,
+					"specification_name": goodObj.SpecificationName,
+				})
+				return
+			}
 		}
+
 	}
 
 	//出库逻辑

controllers/mobile_api_controllers/patient_api_controller.go

@@ -3640,7 +3640,6 @@ func (c *PatientApiController) CreateGroupAdvice() {
 			return
 		}
 		advice_date, _ := dataBody["advice_date"].(string)
-		fmt.Println("advice_date----------------------------------", advice_date)
 
 		var advicedateunix int64
 		if len(advice_date) > 0 {
@@ -3674,12 +3673,16 @@ func (c *PatientApiController) CreateGroupAdvice() {
 			return
 		}
 		startTime, _ := dataBody["start_time"].(string)
+
 		if len(startTime) == 0 {
 			utils.ErrorLog("len(start_time) == 0")
 			c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
 			return
 		}
 		theTime, err = time.ParseInLocation(timeLayout+" 15:04:05", startTime, loc)
+
+		theTimeOne, _ := time.ParseInLocation("2006-01-02 15:04:05", startTime2+" 00:00:00", loc)
+
 		if err != nil {
 			utils.ErrorLog(err.Error())
 			c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
@@ -3707,8 +3710,15 @@ func (c *PatientApiController) CreateGroupAdvice() {
 			advice.Remark = Remark
 			advice.AdviceType = adviceType
 			advice.StartTime = StartTime
-			advice.AdviceDate = AdviceDate
-			advice.RecordDate = RecordDate
+			if adminUserInfo.Org.Id == 10340 {
+				advice.AdviceDate = AdviceDate
+				advice.RecordDate = RecordDate
+			}
+			if adminUserInfo.Org.Id != 10340 {
+				advice.AdviceDate = theTimeOne.Unix()
+				advice.RecordDate = theTimeOne.Unix()
+			}
+
 			advice.Status = 1
 			advice.CreatedTime = time.Now().Unix()
 			advice.UpdatedTime = time.Now().Unix()

controllers/new_mobile_api_controllers/dialysis_parameter_api_controller.go

@@ -30,18 +30,12 @@ func (this *DialysisParamerterApiController) GetMobileDialysisParameters() {
 	loc, _ := time.LoadLocation("Local")
 	adminUserInfo := this.GetMobileAdminUserInfo()
 	orgid := adminUserInfo.Org.Id
-	fmt.Println(orgid)
 	keywords := this.GetString("keyword")
 	start_time := this.GetString("start_time")
-	fmt.Println("start_time", start_time)
 	limit, _ := this.GetInt64("limit")
-	fmt.Println(limit)
 	page, _ := this.GetInt64("page")
-	fmt.Println(page)
 	partitionType, _ := this.GetInt64("partitionType")
-	fmt.Println("partiontype", partitionType)
 	scheduleType, _ := this.GetInt64("scheduleType")
-	fmt.Println(scheduleType)
 
 	theTime, _ := time.ParseInLocation(timeLayout+" 15:04:05", start_time+" 00:00:00", loc)
 	if len(keywords) > 0 {

controllers/new_mobile_api_controllers/mobile_his_api_controller.go

@@ -1255,3 +1255,17 @@ func RemoveRepeatedPatient(patient []*service.Patients) (newArr []*service.Patie
 	}
 	return
 }
+
+func (c *MobileHisApiController) GetPatientPlan() {
+
+	plan, _ := service.GetPatientPlan(10340)
+
+	for _, item := range plan {
+		service.UpdatePatienPlan(item.ID, item.TreatmentPlan)
+	}
+	c.ServeSuccessJSON(map[string]interface{}{
+		"plan": plan,
+		"msg":  "ok",
+	})
+	return
+}

controllers/new_mobile_api_controllers/new_mobile_api_router_register.go

@@ -180,4 +180,6 @@ func NewMobileAPIControllersRegisterRouters() {
 	beego.Router("/m/api/hisproject/delete", &MobileHisApiController{}, "Post:DeleteProject")
 	beego.Router("/m/api/prescription/create", &MobileHisApiController{}, "Post:CreateHisPrescription")
 
+	beego.Router("/m/api/patient/getpatientplan", &MobileHisApiController{}, "Get:GetPatientPlan")
+
 }

controllers/patient_api_controller.go

@@ -84,7 +84,7 @@ func PatientApiRegistRouters() {
 
 }
 
-//GetPatientsList 取患者列表
+// GetPatientsList 取患者列表
 func (c *PatientApiController) GetPatientsList() {
 	var err error
 	defer func() {
@@ -157,7 +157,7 @@ func (c *PatientApiController) GetPatientsList() {
 
 }
 
-//GetPatientTotal
+// GetPatientTotal
 func (c *PatientApiController) GetPatientTotal() {
 	adminUserInfo := c.GetAdminUserInfo()
 
@@ -182,7 +182,7 @@ func (c *PatientApiController) GetPatientsAllList() {
 	return
 }
 
-//GenerateDialysisNo 生成透析号
+// GenerateDialysisNo 生成透析号
 func (c *PatientApiController) GenerateDialysisNo() {
 	adminUserInfo := c.GetAdminUserInfo()
 
@@ -206,7 +206,7 @@ func (c *PatientApiController) GenerateDialysisNo() {
 	return
 }
 
-//CreatePatient 创建患者
+// CreatePatient 创建患者
 func (c *PatientApiController) CreatePatient() {
 	record_date := c.GetString("record_date")
 	is_infectious, _ := c.GetInt64("is_infectious")
@@ -443,7 +443,7 @@ func (c *PatientApiController) CreatePatient() {
 	return
 }
 
-//EditPatient 修改
+// EditPatient 修改
 func (c *PatientApiController) EditPatient() {
 	id, _ := c.GetInt64("id", 0)
 
@@ -1074,7 +1074,7 @@ func (c *PatientApiController) DeleteDialysisSolution() {
 	return
 }
 
-//GetDryWeights 取患者干体重调整铺
+// GetDryWeights 取患者干体重调整铺
 func (c *PatientApiController) GetDryWeights() {
 	page, _ := c.GetInt64("page", 1)
 	limit, _ := c.GetInt64("limit", 10)
@@ -1289,9 +1289,9 @@ func (c *PatientApiController) CreateGroupAdvice() {
 	Remark := ""
 	if dataBody["remark"] != nil && reflect.TypeOf(dataBody["remark"]).String() == "string" {
 		remark, _ := dataBody["remark"].(string)
+
 		Remark = remark
 	}
-
 	var advices []*models.GroupAdvice
 	if dataBody["adviceNames"] == nil || reflect.TypeOf(dataBody["adviceNames"]).String() != "[]interface {}" {
 		utils.ErrorLog("adviceNames")
@@ -1323,6 +1323,7 @@ func (c *PatientApiController) CreateGroupAdvice() {
 			return
 		}
 		adviceName, _ := adviceNameM["advice_name"].(string)
+		fmt.Println("adviceceNMAE--------------------------------", adviceName)
 		if len(adviceName) == 0 {
 			utils.ErrorLog("len(advice_name) == 0")
 			c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
@@ -1416,6 +1417,10 @@ func (c *PatientApiController) CreateGroupAdvice() {
 			advice.DrugNameId = drug_name_id
 		}
 
+		remark, _ := adviceNameM["remark"].(string)
+		fmt.Println("哦哦撒搜哦搜搜哦remark-----------------------------------", remark)
+		advice.Remark = remark
+
 		if adviceType == 1 {
 
 			if adviceNameM["frequency_type"] != nil || reflect.TypeOf(adviceNameM["frequency_type"]).String() == "float64" {
@@ -1470,6 +1475,7 @@ func (c *PatientApiController) CreateGroupAdvice() {
 					child.PatientId = patientInfo.ID
 					child.AdviceDoctor = adminUserInfo.AdminUser.Id
 					child.IsSettle = 2
+
 					if childMap["advice_name"] == nil || reflect.TypeOf(childMap["advice_name"]).String() != "string" {
 						utils.ErrorLog("child advice_name")
 						c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
@@ -1535,6 +1541,20 @@ func (c *PatientApiController) CreateGroupAdvice() {
 
 					child.DeliveryWay = advice.DeliveryWay
 					child.ExecutionFrequency = advice.ExecutionFrequency
+
+					if adminUserInfo.CurrentOrgId == 3877 || adminUserInfo.CurrentOrgId == 10340 || adminUserInfo.CurrentOrgId == 9671 {
+						if child.PrescribingNumber == 0 {
+							child.PrescribingNumber = 1
+						}
+						//查询该患者今日有没有双人核对
+						check, _ := service.MobileGetDoubleCheckSix(adminUserInfo.CurrentOrgId, patientInfo.ID, child.AdviceDate)
+
+						if check.ID > 0 {
+							child.Checker = check.Modifier
+							child.CheckState = 1
+							child.CheckTime = time.Now().Unix()
+						}
+					}
 					advice.Children = append(advice.Children, &child)
 				}
 			}
@@ -3014,7 +3034,7 @@ func (c *PatientApiController) DeleteGroupAdvice() {
 	return
 }
 
-//GetDoctorAdvices 医嘱列表
+// GetDoctorAdvices 医嘱列表
 func (c *PatientApiController) GetDoctorAdvices() {
 	id, _ := c.GetInt64("id", 0)
 	adviceType, _ := c.GetInt64("advice_type", 0)

controllers/pharmacy_controller.go

@@ -7,6 +7,8 @@ import (
 	"XT_New/utils"
 	"fmt"
 	"github.com/astaxie/beego"
+	"math"
+	"strconv"
 	"time"
 )
 
@@ -78,16 +80,7 @@ func (this *PharmacyController) TodayNumber() {
 	times := this.GetString("time", "")
 	timeLayout := "2006-01-02"
 	loc, _ := time.LoadLocation("Local")
-	//shift, err := this.GetInt64("shift", 0) //班次
-	//if err != nil {
-	//	this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
-	//	return
-	//}
-	//partition, err := this.GetInt64("partition", 0) //分区
-	//if err != nil {
-	//	this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
-	//	return
-	//}
+
 	var stime, etime int64
 	if times == "" {
 		stime, etime = service.GetNowTime()
@@ -96,26 +89,47 @@ func (this *PharmacyController) TodayNumber() {
 		stime = stmp.Unix()
 		etime = stime + 86399
 	}
-	//查询表里当天的数据
-	var wtotal int
-	wtotal, err = service.GetTodayPharmacy(stime, etime, orgid, 1)
-	if err != nil {
-		utils.ErrorLog(err.Error())
-		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+
+	if orgid != 9671 && orgid != 10188 && orgid != 10217 && orgid != 3877 && orgid != 10164 {
+		//查询表里当天的数据
+		var wtotal int
+		wtotal, err = service.GetTodayPharmacy(stime, etime, orgid, 1)
+
+		if err != nil {
+			utils.ErrorLog(err.Error())
+			this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+			return
+		}
+
+		var itotal int
+		itotal, err = service.GetTodayPharmacy(stime, etime, orgid, 0)
+
+		if err != nil {
+			utils.ErrorLog(err.Error())
+			this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+			return
+		}
+		this.ServeSuccessJSON(map[string]interface{}{
+			"wtotal": wtotal,
+			"itotal": itotal,
+		})
 		return
 	}
-	var itotal int
-	itotal, err = service.GetTodayPharmacy(stime, etime, orgid, 0)
-	if err != nil {
-		utils.ErrorLog(err.Error())
-		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+
+	if orgid == 9671 || orgid == 10188 || orgid == 10217 || orgid == 3877 || orgid == 10164 {
+		var wtotal int
+		var itotal int
+		//查找出库数量
+		wtotal, _ = service.GetTodayAdviceCount(stime, etime, orgid, 1)
+
+		itotal, _ = service.GetTodayAdviceCount(stime, etime, orgid, 0)
+		this.ServeSuccessJSON(map[string]interface{}{
+			"wtotal": wtotal,
+			"itotal": itotal,
+		})
 		return
 	}
-	this.ServeSuccessJSON(map[string]interface{}{
-		"wtotal": wtotal,
-		"itotal": itotal,
-	})
-	return
+
 }
 func (this *PharmacyController) IssuedDrug() {
 	var err error
@@ -150,24 +164,43 @@ func (this *PharmacyController) IssuedDrug() {
 		stime = stmp.Unix()
 		etime = stime + 86399
 	}
-	//查询表里当天的数据
-	var flist []*models.TmpPatient
-	flist, err = service.GetTodayDrug(stime, etime, orgid, 1, keyword)
-	if err != nil {
-		utils.ErrorLog(err.Error())
-		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
-		return
+
+	if orgid == 10164 || orgid == 3877 || orgid == 10188 || orgid == 10217 || orgid == 9671 {
+		list, _ := service.GetTodayAdviceCountOne(stime, etime, orgid, 1)
+		fmt.Println("list23323232323232", list)
+		var flist []models.TmpPatientOne
+		if len(list) > 0 {
+			for _, item := range list {
+				patientlist, _ := service.GetPatientByAdviceId(item.PatientId)
+				flist = append(flist, patientlist)
+			}
+		}
+		this.ServeSuccessJSON(map[string]interface{}{
+			"list": flist,
+		})
 	}
-	listt, err := service.PartitionAndLayout(stime, etime, orgid, shift, partition, flist)
-	if err != nil {
-		utils.ErrorLog(err.Error())
-		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+
+	if orgid != 10164 && orgid == 3877 && orgid != 10188 && orgid != 10217 && orgid != 9671 {
+		//查询表里当天的数据
+		var flist []*models.TmpPatient
+		flist, err = service.GetTodayDrug(stime, etime, orgid, 1, keyword)
+		if err != nil {
+			utils.ErrorLog(err.Error())
+			this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+			return
+		}
+		listt, err := service.PartitionAndLayout(stime, etime, orgid, shift, partition, flist)
+		if err != nil {
+			utils.ErrorLog(err.Error())
+			this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+			return
+		}
+		this.ServeSuccessJSON(map[string]interface{}{
+			"list": listt,
+		})
 		return
 	}
-	this.ServeSuccessJSON(map[string]interface{}{
-		"list": listt,
-	})
-	return
+
 }
 func (this *PharmacyController) WaitingDrug() {
 	var err error
@@ -202,24 +235,47 @@ func (this *PharmacyController) WaitingDrug() {
 		stime = stmp.Unix()
 		etime = stime + 86399
 	}
-	//查询表里当天的数据
-	var flist []*models.TmpPatient
-	flist, err = service.GetTodayDrug(stime, etime, orgid, 0, keyword)
-	if err != nil {
-		utils.ErrorLog(err.Error())
-		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+
+	if orgid != 9671 && orgid != 10188 && orgid != 10217 && orgid != 3877 && orgid != 10164 {
+		//查询表里当天的数据
+		var flist []*models.TmpPatient
+		flist, err = service.GetTodayDrug(stime, etime, orgid, 0, keyword)
+
+		if err != nil {
+			utils.ErrorLog(err.Error())
+			this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+			return
+		}
+		listt, err := service.PartitionAndLayout(stime, etime, orgid, shift, partition, flist)
+		if err != nil {
+			utils.ErrorLog(err.Error())
+			this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+			return
+		}
+		this.ServeSuccessJSON(map[string]interface{}{
+			"list": listt,
+		})
 		return
 	}
-	listt, err := service.PartitionAndLayout(stime, etime, orgid, shift, partition, flist)
-	if err != nil {
-		utils.ErrorLog(err.Error())
-		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+
+	//当天已发药的人数
+	if orgid == 9671 || orgid == 10188 || orgid == 10217 || orgid == 3877 || orgid == 10164 {
+
+		list, _ := service.GetTodayAdviceCountOne(stime, etime, orgid, 0)
+
+		var flist []models.TmpPatientOne
+		if len(list) > 0 {
+			for _, item := range list {
+				patientlist, _ := service.GetPatientByAdviceId(item.PatientId)
+				flist = append(flist, patientlist)
+			}
+		}
+		this.ServeSuccessJSON(map[string]interface{}{
+			"list": flist,
+		})
 		return
 	}
-	this.ServeSuccessJSON(map[string]interface{}{
-		"list": listt,
-	})
-	return
+
 }
 
 //
@@ -290,6 +346,47 @@ func (this *PharmacyController) DispensingMedicine() {
 		etime = stime + 86399
 	}
 
+	advicelist, _ := service.FindeHisAdviceDocAdvice(orgid, patient_id, stime, etime)
+	if len(advicelist) > 0 {
+		var total int64
+		var prescribing_number_total int64
+		for _, item := range advicelist {
+			houseConfig, _ := service.GetAllStoreHouseConfig(orgid)
+			//查询该药品是否有库存
+			list, _ := service.GetDrugTotalCountTwenty(item.DrugId, item.UserOrgId, houseConfig.DrugStorehouseOut)
+
+			//查询改药品信息
+			medical, _ := service.GetBaseDrugMedical(item.DrugId)
+			//判断单位是否相等
+			if medical.MaxUnit == item.PrescribingNumberUnit {
+				prescribingNumber_temp := strconv.FormatFloat(math.Abs(item.PrescribingNumber), 'f', 0, 64)
+				count, _ := strconv.ParseInt(prescribingNumber_temp, 10, 64)
+				//转化为最小单位
+				total = list.Count*medical.MinNumber + list.StockMinNumber
+				prescribing_number_total = count * medical.MinNumber
+			}
+			if medical.MinUnit == item.PrescribingNumberUnit {
+				prescribingNumber_temp := strconv.FormatFloat(math.Abs(item.PrescribingNumber), 'f', 0, 64)
+				count, _ := strconv.ParseInt(prescribingNumber_temp, 10, 64)
+				total = list.Count*medical.MinNumber + list.StockMinNumber
+				prescribing_number_total = count
+			}
+
+			if medical.IsUse != 1 {
+				//如果出库数量大于库存数量
+				if prescribing_number_total > total {
+					err := fmt.Errorf(service.FindDrugsName(item.DrugId) + "库存不足")
+					if err != nil {
+						utils.ErrorLog(err.Error())
+						this.ServeFailJsonSend(enums.ErrorCodeParamWrong, err.Error())
+						return
+					}
+				}
+			}
+
+		}
+	}
+
 	err = service.DispensingMedicine(orgid, patient_id, stime, etime, creater)
 	if err != nil {
 		utils.ErrorLog(err.Error())

controllers/print_data_api_controller.go

@@ -37,7 +37,7 @@ func (this *PrintDataAPIController) ScheduleDialysisRecordPrintData() {
 	idStrs := strings.Split(schIDStr, ",")
 	adminUserInfo := this.GetAdminUserInfo()
 
-	if this.GetAdminUserInfo().CurrentOrgId == 10016 || this.GetAdminUserInfo().CurrentOrgId == 9882 || this.GetAdminUserInfo().CurrentOrgId == 10138 || this.GetAdminUserInfo().CurrentOrgId == 10278 || this.GetAdminUserInfo().CurrentOrgId == 9841 || this.GetAdminUserInfo().CurrentOrgId == 9845 || this.GetAdminUserInfo().CurrentOrgId == 10081 || this.GetAdminUserInfo().CurrentOrgId == 10215 || this.GetAdminUserInfo().CurrentOrgId == 10121 || this.GetAdminUserInfo().CurrentOrgId == 10234 {
+	if this.GetAdminUserInfo().CurrentOrgId == 10016 || this.GetAdminUserInfo().CurrentOrgId == 9882 || this.GetAdminUserInfo().CurrentOrgId == 10138 || this.GetAdminUserInfo().CurrentOrgId == 10278 || this.GetAdminUserInfo().CurrentOrgId == 9841 || this.GetAdminUserInfo().CurrentOrgId == 9845 || this.GetAdminUserInfo().CurrentOrgId == 10081 || this.GetAdminUserInfo().CurrentOrgId == 10215 || this.GetAdminUserInfo().CurrentOrgId == 10121 || this.GetAdminUserInfo().CurrentOrgId == 10234 || this.GetAdminUserInfo().CurrentOrgId == 10188 || this.GetAdminUserInfo().CurrentOrgId == 10217 || this.GetAdminUserInfo().CurrentOrgId == 10340 {
 		schedules, getScheduleErr := service.GetSchedulesSeven(adminUserInfo.CurrentOrgId, idStrs)
 		for _, item := range schedules {
 
@@ -136,7 +136,7 @@ func (this *PrintDataAPIController) ScheduleDialysisRecordPrintData() {
 		})
 	}
 
-	if this.GetAdminUserInfo().CurrentOrgId != 10016 && this.GetAdminUserInfo().CurrentOrgId != 9882 && this.GetAdminUserInfo().CurrentOrgId != 10138 && this.GetAdminUserInfo().CurrentOrgId != 10278 && this.GetAdminUserInfo().CurrentOrgId != 9841 && this.GetAdminUserInfo().CurrentOrgId != 9845 && this.GetAdminUserInfo().CurrentOrgId != 10081 && this.GetAdminUserInfo().CurrentOrgId != 10215 && this.GetAdminUserInfo().CurrentOrgId != 10121 && this.GetAdminUserInfo().CurrentOrgId != 10234 {
+	if this.GetAdminUserInfo().CurrentOrgId != 10016 && this.GetAdminUserInfo().CurrentOrgId != 9882 && this.GetAdminUserInfo().CurrentOrgId != 10138 && this.GetAdminUserInfo().CurrentOrgId != 10278 && this.GetAdminUserInfo().CurrentOrgId != 9841 && this.GetAdminUserInfo().CurrentOrgId != 9845 && this.GetAdminUserInfo().CurrentOrgId != 10081 && this.GetAdminUserInfo().CurrentOrgId != 10215 && this.GetAdminUserInfo().CurrentOrgId != 10121 && this.GetAdminUserInfo().CurrentOrgId != 10234 && this.GetAdminUserInfo().CurrentOrgId != 10188 && this.GetAdminUserInfo().CurrentOrgId != 10217 && this.GetAdminUserInfo().CurrentOrgId != 10340 {
 		schedules, getScheduleErr := service.GetSchedules(adminUserInfo.CurrentOrgId, idStrs)
 		for _, item := range schedules {
 			list, _ := service.GetDialysisOrderCountSeven(item.PatientID, item.ScheduleDate)
@@ -259,6 +259,8 @@ func (this *PrintDataAPIController) CourseRecordPrintData() {
 	patient, _ := service.GetPatientDetail(adminUserInfo.CurrentOrgId, patient_id)
 
 	adminUser, _ := service.GetAllAdminUsers(adminUserInfo.CurrentOrgId, adminUserInfo.CurrentAppId)
+
+	operators, err := service.GetAdminUserEsTwo(adminUserInfo.CurrentOrgId)
 	if err != nil {
 		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
 		return
@@ -267,6 +269,7 @@ func (this *PrintDataAPIController) CourseRecordPrintData() {
 			"record":    record,
 			"patient":   patient,
 			"adminUser": adminUser,
+			"operators": operators,
 		})
 	}
 }

controllers/self_drug_api_congtroller.go

@@ -2716,7 +2716,7 @@ func (this *SelfDrugApiController) GetInventoryModeList() {
 	})
 }
 
-//库存优化接口
+// 库存优化接口
 func (this *SelfDrugApiController) GetStorehouseList() {
 
 	orgId := this.GetAdminUserInfo().CurrentOrgId

models/dialysis.go

@@ -549,6 +549,8 @@ type DoubleCheck struct {
 	CheckTime                  int64  `gorm:"column:check_time" json:"check_time"`
 	FirstCheckTime             int64  `gorm:"column:first_check_time" json:"first_check_time"`
 	EmployeeNumber             string `gorm:"column:employee_number" json:"employee_number" form:"employee_number"`
+	DialyzerBatchNumber        string `gorm:"column:dialyzer_batch_number" json:"dialyzer_batch_number" form:"dialyzer_batch_number"`
+	NeedleBatchNumber          string `gorm:"column:needle_batch_number" json:"needle_batch_number" form:"needle_batch_number"`
 }
 
 func (DoubleCheck) TableName() string {
@@ -1103,6 +1105,7 @@ type DialysisBeforePrepareGoods struct {
 	PatientId         int64  `gorm:"column:patient_id" json:"patient_id" form:"patient_id"`
 	OrderId           int64  `gorm:"column:order_id" json:"order_id" form:"order_id"`
 	NewCount          int64  `gorm:"column:new_count" json:"new_count" form:"new_count"`
+	OldCount          int64  `gorm:"column:old_count" json:"old_count" form:"old_count"`
 }
 
 type NewDialysisBeforePrepareGoods struct {
@@ -1119,6 +1122,7 @@ type NewDialysisBeforePrepareGoods struct {
 	ChildNewDialysisBeforePrepareGoods []*NewDialysisBeforePrepareGoods `gorm:"ForeignKey:GoodId;AssociationForeignKey:GoodId" json:"child"`
 	PatientId                          int64                            `gorm:"column:patient_id" json:"patient_id" form:"patient_id"`
 	OrderId                            int64                            `gorm:"column:order_id" json:"order_id" form:"order_id"`
+	OldCount                           int64                            `gorm:"column:old_count" json:"old_count" form:"old_count"`
 }
 
 type OldDialysisBeforePrepareGoods struct {

models/patient_models.go

@@ -1176,6 +1176,7 @@ type XtPatients struct {
 	UserSysBeforeCount           int64   `gorm:"column:user_sys_before_count" json:"user_sys_before_count" form:"user_sys_before_count"`
 	SchRemark                    string  `gorm:"column:sch_remark" json:"sch_remark" form:"sch_remark"`
 	ScheduleRemark               string  `gorm:"column:schedule_remark" json:"schedule_remark" form:"schedule_remark"`
+	TreatmentPlan                string  `gorm:"column:treatment_plan" json:"treatment_plan" form:"treatment_plan"`
 }
 
 func (XtPatients) TableName() string {
@@ -1817,6 +1818,8 @@ type XtPatientFirstDisease struct {
 	Ctime                 int64  `gorm:"column:ctime" json:"ctime" form:"ctime"`
 	Mtime                 int64  `gorm:"column:mtime" json:"mtime" form:"mtime"`
 	Status                int64  `gorm:"column:status" json:"status" form:"status"`
+	ProjectId             string `gorm:"column:project_id" json:"project_id" form:"project_id"`
+	InspectDate           string `gorm:"column:inspect_date" json:"inspect_date" form:"inspect_date"`
 }
 
 func (XtPatientFirstDisease) TableName() string {

models/pharmacy_models.go

@@ -31,6 +31,17 @@ type TmpPatient struct {
 	PatientID  int64
 	Name       string
 	DialysisNo string //透析号
+
+}
+
+type TmpPatientOne struct {
+	PatientID  int64  `gorm:"column:id" json:"PatientID" form:"id"`
+	DialysisNo string `gorm:"column:dialysis_no" json:"DialysisNo" form:"dialysis_no"`
+	Name       string `gorm:"column:name" json:"Name" form:"name"`
+}
+
+func (TmpPatientOne) TableName() string {
+	return "xt_patients"
 }
 
 //药品信息

routers/router.go

@@ -11,7 +11,7 @@ import (
 func init() {
 	beego.InsertFilter("*", beego.BeforeRouter, cors.Allow(&cors.Options{
 		//AllowAllOrigins:  true,
-		AllowOrigins: []string{"https://xt.kuyicloud.com", "http://localhost:9528", "http://localhost:9529", "http://localhost:9531", "http://xt.test.shengws.com", "http://new_mobile.test.sgjyun.com", "https://xt.test.shengws.com", "http://xt.test.sgjyun.com", "https://xt.test.sgjyun.com", "http://localhost:8081", "http://localhost:8082", "https://pad.kuyicloud.com", "http://pad.kuyicloud.com", "http://pad.test.sgjyun.com", "https://pad.test.sgjyun.com", "http://admin.xt.test.sgjyun.com", "http://admin.xt.kuyicloud.com", "http://mobile.sgjyun.com", "http://mobile.kuyicloud.com"},
+		AllowOrigins: []string{"https://xt.kuyicloud.com", "http://localhost:9528", "http://localhost:9529", "http://localhost:9531", "http://xt.test.shengws.com", "http://new_mobile.test.sgjyun.com", "https://api.xt.test.sgjyun.com", "https://xt.test.shengws.com", "http://xt.test.sgjyun.com", "https://xt.test.sgjyun.com", "http://localhost:8081", "http://localhost:8082", "https://pad.kuyicloud.com", "http://pad.kuyicloud.com", "http://pad.test.sgjyun.com", "https://pad.test.sgjyun.com", "http://admin.xt.test.sgjyun.com", "http://admin.xt.kuyicloud.com", "http://mobile.sgjyun.com", "http://mobile.kuyicloud.com", "https://mobile.kuyicloud.com"},
 		//AllowOrigins:     []string{"https://xt.kuyicloud.com", "http://localhost:9528", "http://xt.test.shengws.com","https://xt.test.shengws.com", "http://xt.test.sgjyun.com","https://xt.test.sgjyun.com", "http://localhost:8081", "http://localhost:8082", "https://pad.kuyicloud.com", "http://pad.kuyicloud.com", "http://pad.test.sgjyun.com","https://pad.test.sgjyun.com", "http://admin.xt.test.sgjyun.com", "http://admin.xt.kuyicloud.com","http://mobile.sgjyun.com","http://mobile.kuyicloud.com"},
 		AllowMethods:     []string{"GET", "POST", "PUT", "DELETE", "OPTIONS"},
 		AllowHeaders:     []string{"Origin", "Authorization", "Access-Control-Allow-Origin", "Access-Control-Allow-Headers", "Content-Type", "X-XSRF-TOKEN", "Permission", "KyToken"},

service/dialysis_service.go

@@ -1593,7 +1593,7 @@ func GetAllPcAdvicestByList(orgID int64, scheduleDate int64) (advices []*VMDocto
 	advice_list_str, _ := redis.Get(key).Result()
 
 	if len(advice_list_str) == 0 { //没有到缓存数据，从数据库中获取数据，进行缓存到redis
-		err = readDb.Where("status = 1 AND user_org_id = ? AND advice_type = 2 AND advice_date = ? ", orgID, scheduleDate).Find(&advices).Error
+		err = readDb.Where("status = 1 AND user_org_id = ? AND advice_type = 2 AND advice_date = ?", orgID, scheduleDate).Find(&advices).Error
 		if err != nil {
 			if err == gorm.ErrRecordNotFound {
 				if len(advices) <= 0 {
@@ -2084,3 +2084,9 @@ func UpdateDoctorAdviceList(id int64, checker int64) error {
 	err := XTWriteDB().Model(&advice).Where("id = ? and status =1", id).Updates(map[string]interface{}{"checker": checker, "check_state": 1, "check_time": time.Now().Unix()}).Error
 	return err
 }
+
+func UpdateLastMonitorRecordToday(accumulated_blood_volume float64, id int64) error {
+
+	err := XTWriteDB().Model(&models.MonitoringRecord{}).Where(" id = ? and status= 1", id).Update(map[string]interface{}{"accumulated_blood_volume": accumulated_blood_volume}).Error
+	return err
+}

service/dialysis_solution_service.go

@@ -495,7 +495,7 @@ func GetDialysisAdviceSchedulistSeven(orgID int64, schedule_type int64, partitio
 
 }
 
-func GetDialysisAdviceSchedulistTen(orgID int64, schedule_type int64, partition_id int64, scheduleDate int64) (schedule []*models.VmBloodScheduleOne, err error) {
+func GetDialysisAdviceSchedulistTen(orgID int64, schedule_type int64, partition_id []string, scheduleDate int64) (schedule []*models.VmBloodScheduleOne, err error) {
 
 	db := XTReadDB().Model(&models.VmBloodScheduleOne{}).Where("status = 1")
 
@@ -505,8 +505,8 @@ func GetDialysisAdviceSchedulistTen(orgID int64, schedule_type int64, partition_
 	if schedule_type > 0 {
 		db = db.Where("schedule_type = ?", schedule_type)
 	}
-	if partition_id > 0 {
-		db = db.Where("partition_id = ?", partition_id)
+	if len(partition_id) > 0 {
+		db = db.Where("partition_id in(?)", partition_id)
 	}
 
 	if orgID > 0 {

service/his_service.go

@@ -2702,3 +2702,15 @@ func GetLastOrderTX(user_org_id int64) (models.HisOrder, error) {
 	err := XTReadDB().Where("user_org_id = ? and status = 1", user_org_id).Last(&order).Error
 	return order, err
 }
+
+func GetPatientPlan(orgid int64) (patient []*models.XtPatients, err error) {
+
+	err = XTReadDB().Where("user_org_id = ? and status=  1", orgid).Find(&patient).Error
+	return patient, err
+}
+
+func UpdatePatienPlan(id int64, trement_plan string) error {
+
+	err := XTWriteDB().Model(&models.XtPatientsNew{}).Where("blood_id = ? and status = 1", id).Update(map[string]interface{}{"treatment_plan": trement_plan}).Error
+	return err
+}

service/mobile_dialysis_service.go

@@ -4357,8 +4357,14 @@ func GetPCHisPrescriptionProject(orgID int64, scheduleDate int64, deliverWay str
 func UpdateStockGoods(good_id int64, record_time int64, patient_id int64, count int64) error {
 
 	prepare := models.DialysisBeforePrepare{}
+	var err error
+	if count > 0 {
+		err = XTWriteDB().Model(&prepare).Where("good_id= ? and record_date = ? and patient_id = ? and count  <> 0 and status = 1", good_id, record_time, patient_id).Updates(map[string]interface{}{"count": count}).Error
+	}
+	if count <= 0 {
+		err = XTWriteDB().Model(&prepare).Where("good_id= ? and record_date = ? and patient_id = ? and count  <> 0 and status = 1", good_id, record_time, patient_id).Updates(map[string]interface{}{"count": count, "status": 0}).Error
+	}
 
-	err := XTWriteDB().Model(&prepare).Where("good_id= ? and record_date = ? and patient_id = ? and count  <> 0 and status = 1", good_id, record_time, patient_id).Updates(map[string]interface{}{"count": count}).Error
 	return err
 }
 
@@ -4477,6 +4483,12 @@ func GetFistMonitor(orgid int64, patient_id int64, dialysis_date int64) (models.
 }
 
 func MobileGetScheduleDoctorAdvicesOne(orgID int64, scheduleDate int64, adviceType int, patientType int, adminUserId int64, deliverWay string, scheduleType int64, partitonType int64, patient_id int64, execution_state int64, cost_type int64, execution_frequency string) ([]*MScheduleDoctorAdviceVM, error) {
+
+	fmt.Println("execution_frequency---------------------------", execution_frequency)
+	fmt.Println("cost_type-----------", cost_type)
+	fmt.Println("adviceType-----------", adviceType)
+	fmt.Println("patientType---------", patientType)
+	fmt.Println("len(deliverWay)--------", len(deliverWay))
 	var vms []*MScheduleDoctorAdviceVM
 	adviceWhere := ""
 	adviceCondition := []interface{}{}
@@ -5316,6 +5328,7 @@ func MobileGetScheduleDoctorAdvicesOne(orgID int64, scheduleDate int64, adviceTy
 		}
 
 	} else if adviceType == 2 && len(deliverWay) > 0 {
+
 		if patientType == 0 {
 			if patient_id > 0 {
 				if execution_state > 0 {
@@ -5592,6 +5605,11 @@ func MobileGetScheduleDoctorAdvicesOne(orgID int64, scheduleDate int64, adviceTy
 		}
 
 	} else if adviceType == 2 && len(deliverWay) <= 0 {
+		fmt.Println("寄哪里233223322323233232", patientType)
+		fmt.Println("patient_id", patient_id)
+		fmt.Println("execution_state000000", execution_state)
+		fmt.Println("cost_type", cost_type)
+		fmt.Println("len23323232", len(execution_frequency))
 		if patientType == 0 {
 			if patient_id > 0 {
 				if execution_state > 0 {
@@ -5668,8 +5686,14 @@ func MobileGetScheduleDoctorAdvicesOne(orgID int64, scheduleDate int64, adviceTy
 						}
 
 					} else {
-						adviceWhere = "status = 1 AND user_org_id = ? AND advice_type = 2 AND record_date = ?"
-						adviceCondition = append(adviceCondition, adviceWhere, orgID, scheduleDate)
+						if len(execution_frequency) > 0 {
+							adviceWhere = "status = 1 AND user_org_id = ? AND advice_type = 2 AND record_date = ? and execution_frequency = ?"
+							adviceCondition = append(adviceCondition, adviceWhere, orgID, scheduleDate, execution_frequency)
+						} else {
+							adviceWhere = "status = 1 AND user_org_id = ? AND advice_type = 2 AND record_date = ?"
+							adviceCondition = append(adviceCondition, adviceWhere, orgID, scheduleDate)
+						}
+
 					}
 
 				}

service/new_warehouse_service.go

@@ -26,8 +26,10 @@ func ConsumablesGoodDelivery(orgID int64, patient_id int64, record_time int64, g
 	// 如果没有对应的库存，则报错
 
 	warehouse, err := FindFirstWarehousingInfoByStock(goods.GoodId, goods.GoodTypeId, goods.StorehouseId)
-	if err != nil {
-		return errors.New("库存数量不足")
+	if goods.Count > 0 {
+		if err != nil {
+			return errors.New("库存数量不足")
+		}
 	}
 
 	stock_number = warehouse.StockCount
@@ -36,6 +38,7 @@ func ConsumablesGoodDelivery(orgID int64, patient_id int64, record_time int64, g
 	if stock_number >= deliver_number {
 
 		maxNumber = goods.Count
+
 		//出库
 		warehouse.StockCount = warehouse.StockCount - maxNumber
 		warehouse.Mtime = time.Now().Unix()
@@ -352,7 +355,7 @@ func ConsumablesGoodDelivery(orgID int64, patient_id int64, record_time int64, g
 			warehouseOutInfo.Price = goodsInfo.PackingPrice
 		}
 		_, errcodes := GetWarehouseOutInfoIsExistOne(goods.GoodId, patient_id, record_time, goods.ProjectId)
-		//fmt.Println("errcodes23332322332323223", errcodes, goods.ProjectId)
+
 		if errcodes == gorm.ErrRecordNotFound {
 			errOne := AddSigleWarehouseOutInfo(warehouseOutInfo)
 			if errOne != nil {
@@ -1494,11 +1497,14 @@ func BloodHisDrugDeliverInfo(orgID int64, prescribingNumber float64, warehouseou
 			cancel_count += item.Count
 		}
 
-		fmt.Println("deliver_number", deliver_number)
-		fmt.Println("out_count", out_count)
-		fmt.Println("cancel_count", cancel_count)
+		//fmt.Println("deliver_number", deliver_number)
+		//fmt.Println("out_count", out_count)
+		//fmt.Println("cancel_count", cancel_count)
+		//
+		//fmt.Println("出库数据", deliver_number)
+		//fmt.Println("出库流水---------------------", out_count, cancel_count)
 		//如果本次出库数据大于历史出库数据 新增1条流水
-		if deliver_number > (out_count - cancel_count) {
+		if deliver_number >= (out_count - cancel_count) {
 			drugflow := models.DrugFlow{
 				WarehouseOutOrderNumber: warehouseout.WarehouseOutOrderNumber,
 				WarehouseOutId:          warehouseout.ID,
@@ -3004,7 +3010,8 @@ func ConsumablesGoodDeliveryFivety(orgID int64, patient_id int64, record_time in
 		if warehouse.StockCount < 0 {
 			return errors.New("库存数量不足")
 		}
-		err := tx.Save(&warehouse).Error
+		var info models.WarehousingInfo
+		err := tx.Model(&info).Where("id = ?", warehouse.ID).Updates(map[string]interface{}{"stock_count": warehouse.StockCount}).Error
 		if err != nil {
 			return err
 		}
@@ -3548,3 +3555,590 @@ func ConsumablesGoodDeliveryFivety(orgID int64, patient_id int64, record_time in
 	}
 	return err
 }
+
+func ConsumablesGoodDeliveryNew(orgID int64, patient_id int64, record_time int64, goods *models.DialysisBeforePrepare, warehouseOut *models.WarehouseOut, count int64) (err error) {
+
+	//开事务
+	tx := XTWriteDB().Begin()
+	if err != nil {
+		utils.ErrorLog("事务失败，原因为: %v", err)
+		tx.Rollback()
+	} else {
+		fmt.Println("err-----------------------", err)
+		tx.Commit()
+	}
+	var deliver_number int64 = 0
+	var stock_number int64 = 0
+	var maxNumber int64 = 0
+
+	deliver_number = goods.Count
+
+	// 根据先进先出原则，查询最先入库的批次，进行出库
+	// 如果没有对应的库存，则报错
+
+	warehouse, err := FindFirstWarehousingInfoByStock(goods.GoodId, goods.GoodTypeId, goods.StorehouseId)
+	if goods.Count > 0 {
+		if err != nil {
+			return errors.New("库存数量不足")
+		}
+	}
+
+	stock_number = warehouse.StockCount
+
+	// 当库存数量大于或等于出库数量的话，则正常出库该批次
+	if stock_number >= deliver_number {
+
+		maxNumber = goods.Count
+
+		//出库
+		warehouse.StockCount = warehouse.StockCount - maxNumber
+		warehouse.Mtime = time.Now().Unix()
+		if warehouse.StockCount < 0 {
+			return errors.New("库存数量不足")
+		}
+
+		err := tx.Save(&warehouse).Error
+		if err != nil {
+			return err
+		}
+		//更新his_prescripton_project出库状态值
+		UpdateHisPrescriptionProjectStatus(goods.GoodId, record_time, orgID, patient_id)
+
+		var info []*models.WarehousingInfo
+		err = tx.Where("good_id = ? and org_id = ? and is_check =1 and status= 1 and stock_count > 0 and storehouse_id = ?", goods.GoodId, orgID, goods.StorehouseId).Find(&info).Error
+		var sum_count int64
+		for _, item := range info {
+			sum_count += item.StockCount
+		}
+
+		warehouseOutInfo := &models.WarehouseOutInfo{
+			WarehouseOutOrderNumber: warehouseOut.WarehouseOutOrderNumber,
+			WarehouseOutId:          warehouseOut.ID,
+			WarehouseInfotId:        warehouse.ID,
+			Status:                  1,
+			Ctime:                   time.Now().Unix(),
+			Remark:                  warehouse.Remark,
+			OrgId:                   orgID,
+			Type:                    1,
+			Manufacturer:            warehouse.Manufacturer,
+			Dealer:                  warehouse.Dealer,
+			IsSys:                   1,
+			SysRecordTime:           record_time,
+			GoodTypeId:              goods.GoodTypeId,
+			GoodId:                  goods.GoodId,
+			PatientId:               patient_id,
+			Number:                  warehouse.Number,
+			LicenseNumber:           warehouse.LicenseNumber,
+			Price:                   warehouse.PackingPrice,
+			ExpiryDate:              warehouse.ExpiryDate,
+			ProductDate:             warehouse.ProductDate,
+			ProjectId:               goods.ProjectId,
+			SupplyWarehouseId:       warehouse.SupplyWarehouseId,
+			StorehouseId:            goods.StorehouseId,
+			IsCheck:                 1,
+			OverCount:               sum_count,
+			RegisterNumber:          warehouse.RegisterNumber,
+		}
+		warehouseOutInfo.Count = count
+		if orgID == 9671 || orgID == 10265 {
+			goodsInfo, _ := FindeGoodInfo(orgID, goods.ProjectId)
+			warehouseOutInfo.Price = goodsInfo.PackingPrice
+		}
+		_, errcodes := GetWarehouseOutInfoIsExistOne(goods.GoodId, patient_id, record_time, goods.ProjectId)
+		if errcodes == gorm.ErrRecordNotFound {
+			err := tx.Create(&warehouseOutInfo).Error
+			if err != nil {
+				return err
+			}
+		} else if errcodes == nil {
+
+			outInfoOne, _ := GetWarehouseOutInfoIsExistTwo(goods.GoodId, patient_id, record_time, goods.ProjectId)
+			if count != outInfoOne.Count {
+
+				outInfo := models.WarehouseOutInfo{}
+				err := tx.Model(&outInfo).Where("good_id = ? and patient_id = ? and sys_record_time  =? and status = 1", goods.GoodId, patient_id, record_time).Updates(map[string]interface{}{"warehouse_out_id": warehouseOutInfo.WarehouseOutId, "WarehouseOutOrderNumber": warehouseOutInfo.WarehouseOutOrderNumber, "sys_record_time": warehouseOutInfo.SysRecordTime, "good_type_id": warehouseOutInfo.GoodTypeId, "patient_id": warehouseOutInfo.PatientId, "consumable_type": warehouseOutInfo.ConsumableType, "count": warehouseOutInfo.Count, "price": warehouseOutInfo.Price, "dealer": warehouseOutInfo.Dealer, "manufacturer": warehouseOutInfo.Manufacturer, "number": warehouseOutInfo.Number, "license_number": warehouseOutInfo.LicenseNumber, "over_count": warehouseOutInfo.OverCount}).Error
+				if err != nil {
+					return err
+				}
+			}
+
+		}
+		lastOut, _ := FindWarehouseOutInfoByPatientId(patient_id, record_time, goods.GoodId, orgID)
+
+		//查询已经出库的数据
+		flowGood, _ := GetStockFlowIsBatchNumber(warehouse.ID, patient_id, record_time, goods.GoodId)
+		var out_count int64
+		var out_count_one int64
+		for _, item := range flowGood {
+			out_count += item.Count
+		}
+
+		//查询退库数据
+		flowGoodTwo, _ := GetStockFlowIsBatchNumberThree(patient_id, record_time, goods.GoodId)
+		for _, item := range flowGoodTwo {
+			out_count_one += item.Count
+		}
+		//如果本次出库数据大于历史出库数据 新增1条流水
+		if count > (out_count - out_count_one) {
+
+			flow := models.VmStockFlow{
+				WarehouseOutId:          warehouseOut.ID,
+				WarehousingId:           warehouse.ID,
+				GoodId:                  goods.GoodId,
+				Number:                  warehouse.Number,
+				ProductDate:             warehouse.ProductDate,
+				ExpireDate:              warehouse.ExpiryDate,
+				Count:                   count - out_count + out_count_one,
+				Price:                   warehouse.PackingPrice,
+				Status:                  1,
+				Ctime:                   time.Now().Unix(),
+				UserOrgId:               orgID,
+				Manufacturer:            warehouse.Manufacturer,
+				Dealer:                  warehouse.Dealer,
+				LicenseNumber:           warehouse.LicenseNumber,
+				IsEdit:                  2,
+				Creator:                 warehouseOut.Creater,
+				SystemTime:              record_time,
+				ConsumableType:          3,
+				WarehouseOutDetailId:    lastOut.ID,
+				WarehouseOutOrderNumber: warehouseOut.WarehouseOutOrderNumber,
+				IsSys:                   1,
+				PatientId:               patient_id,
+				ProjectId:               goods.ProjectId,
+				SupplyWarehouseId:       warehouse.SupplyWarehouseId,
+				StorehouseId:            goods.StorehouseId,
+				OverCount:               sum_count,
+				BuyPrice:                warehouse.Price,
+				RegisterNumber:          warehouse.RegisterNumber,
+			}
+			if orgID == 9671 || orgID == 10265 {
+				goodsInfo, _ := FindeGoodInfo(orgID, goods.ProjectId)
+				flow.Price = goodsInfo.PackingPrice
+				flow.BuyPrice = goodsInfo.BuyPrice
+			}
+
+			err := tx.Create(&flow).Error
+			if err != nil {
+				return err
+			}
+
+		}
+
+		//如果本次出库数据小于历史出库数据 新增1条退库流水
+
+		if count < (out_count - out_count_one) {
+
+			operation_time := time.Now().Unix()
+
+			//创建退库单
+			timeStr := time.Now().Format("2006-01-02")
+			timeArr := strings.Split(timeStr, "-")
+			total, _ := FindAllCancelStockTotal(orgID)
+			total = total + 1
+			orderNumber := "CKTKD" + strconv.FormatInt(orgID, 10) + timeArr[0] + timeArr[1] + timeArr[2] + "000" + strconv.FormatInt(total, 10)
+
+			cancelStock := models.CancelStock{
+				OrderNumber:  orderNumber,
+				OperaTime:    operation_time,
+				OrgId:        orgID,
+				Creater:      warehouseOut.Creater,
+				Ctime:        time.Now().Unix(),
+				Status:       1,
+				ReturnTime:   record_time,
+				Type:         1,
+				StorehouseId: goods.StorehouseId,
+				IsCheck:      1,
+			}
+			_, msgerrkonde := GetCancelStockDetailByOrderNumberOne(record_time, orgID)
+			if msgerrkonde == gorm.ErrRecordNotFound {
+
+				err := tx.Create(&cancelStock).Error
+				if err != nil {
+					return err
+				}
+			}
+
+			cancel, _ := GetLastCancelStockById(orgID)
+
+			manufacturer, _ := GetManufactureById(warehouse.Manufacturer)
+			deaerler, _ := GetDealerById(warehouse.Dealer)
+			cancelStockInfo := models.CancelStockInfo{
+				GoodId:          goods.GoodId,
+				CancelStockId:   cancel.ID,
+				GoodTypeId:      goods.GoodTypeId,
+				Count:           out_count - out_count_one - count,
+				Price:           warehouse.PackingPrice,
+				Total:           0,
+				ProductDate:     warehouse.ProductDate,
+				ExpiryDate:      warehouse.ExpiryDate,
+				Ctime:           time.Now().Unix(),
+				Status:          1,
+				OrgId:           orgID,
+				OrderNumber:     cancel.OrderNumber,
+				Type:            0,
+				Dealer:          deaerler.DealerName,
+				Manufacturer:    manufacturer.ManufacturerName,
+				Number:          warehouse.Number,
+				RegisterAccount: "",
+				Remark:          "",
+				WarehouseInfoId: warehouse.ID,
+				PatientId:       patient_id,
+				RecordDate:      record_time,
+				StorehouseId:    goods.StorehouseId,
+				IsCheck:         1,
+			}
+			if orgID == 9671 || orgID == 10265 {
+				goodsInfo, _ := FindeGoodInfo(orgID, goods.ProjectId)
+				cancelStockInfo.Price = goodsInfo.PackingPrice
+			}
+
+			err := tx.Create(&cancelStockInfo).Error
+			if err != nil {
+				return err
+			}
+
+			cancelInfo, _ := GetLastCancelStockInfoByGoodId(goods.GoodId)
+
+			flow := models.VmStockFlow{
+				WarehousingId:           warehouse.ID,
+				GoodId:                  goods.GoodId,
+				Number:                  warehouse.Number,
+				LicenseNumber:           warehouse.LicenseNumber,
+				Count:                   out_count - out_count_one - count,
+				UserOrgId:               orgID,
+				PatientId:               patient_id,
+				SystemTime:              record_time,
+				ConsumableType:          7,
+				IsSys:                   1,
+				WarehousingOrder:        "",
+				WarehouseOutId:          lastOut.WarehouseOutId,
+				WarehouseOutOrderNumber: lastOut.WarehouseOutOrderNumber,
+				IsEdit:                  0,
+				CancelStockId:           cancel.ID,
+				CancelOrderNumber:       cancel.OrderNumber,
+				Manufacturer:            manufacturer.ID,
+				Dealer:                  0,
+				Creator:                 warehouseOut.Creater,
+				UpdateCreator:           0,
+				Status:                  1,
+				Ctime:                   time.Now().Unix(),
+				Mtime:                   0,
+				Price:                   warehouse.PackingPrice,
+				WarehousingDetailId:     warehouse.ID,
+				WarehouseOutDetailId:    lastOut.ID,
+				CancelOutDetailId:       cancelInfo.ID,
+				ProductDate:             warehouse.ProductDate,
+				ExpireDate:              warehouse.ExpiryDate,
+				StorehouseId:            goods.StorehouseId,
+				BuyPrice:                warehouse.Price,
+				ProjectId:               goods.ProjectId,
+				OverCount:               sum_count,
+				RegisterNumber:          warehouse.RegisterNumber,
+			}
+			if orgID == 9671 || orgID == 10265 {
+				goodsInfo, _ := FindeGoodInfo(orgID, goods.ProjectId)
+				flow.Price = goodsInfo.PackingPrice
+				flow.BuyPrice = goodsInfo.BuyPrice
+			}
+
+			err = tx.Create(&flow).Error
+			if err != nil {
+				return err
+			}
+		}
+
+		details := models.BloodAutomaticReduceDetail{
+			WarehouseOutId:          lastOut.ID,
+			WarehouseOutOrderNumber: warehouseOutInfo.WarehouseOutOrderNumber,
+			PatientId:               patient_id,
+			Ctime:                   time.Now().Unix(),
+			Mtime:                   time.Now().Unix(),
+			Status:                  1,
+			RecordTime:              record_time,
+			OrgId:                   orgID,
+			GoodId:                  goods.GoodId,
+			GoodTypeId:              goods.GoodTypeId,
+			Count:                   count,
+			ProjectId:               goods.ProjectId,
+			StorehouseId:            goods.StorehouseId,
+		}
+
+		////查询该耗材已经出库的数量
+		_, errcode := GetAutoMaticReduceDetailTwenty(orgID, patient_id, record_time, goods.GoodId, goods.GoodTypeId)
+		if errcode == gorm.ErrRecordNotFound {
+
+			err := tx.Create(&details).Error
+			if err != nil {
+				return err
+			}
+		} else if errcode == nil {
+
+			detail := models.BloodAutomaticReduceDetail{}
+			err := tx.Model(&detail).Where("org_id = ? and patient_id = ? and record_time = ? and status =1 and good_id = ? and good_type_id = ?", orgID, patient_id, record_time, goods.GoodId, goods.GoodTypeId).Updates(map[string]interface{}{"status": 0, "count": 0}).Error
+			if err != nil {
+				return err
+			}
+
+			err = tx.Create(&detail).Error
+			if err != nil {
+				return err
+			}
+		}
+
+		return nil
+	} else {
+
+		// 当刚批次的库存数量小于出库数量的话，则先把该批次出库完后，再进行递归出库
+		warehouse.StockCount = 0
+		warehouse.Mtime = time.Now().Unix()
+
+		err := tx.Save(&warehouse).Error
+		if err != nil {
+			return err
+		}
+		var info []*models.WarehousingInfo
+		err = tx.Where("good_id = ? and org_id = ? and is_check =1 and status= 1 and stock_count > 0 and storehouse_id = ?", goods.GoodId, orgID, goods.StorehouseId).Find(&info).Error
+		var sum_count int64
+		for _, item := range info {
+			sum_count += item.StockCount
+		}
+		warehouseOutInfo := &models.WarehouseOutInfo{
+			WarehouseOutOrderNumber: warehouseOut.WarehouseOutOrderNumber,
+			WarehouseOutId:          warehouseOut.ID,
+			WarehouseInfotId:        warehouse.ID,
+			Status:                  1,
+			Ctime:                   time.Now().Unix(),
+			Remark:                  warehouse.Remark,
+			OrgId:                   orgID,
+			Type:                    1,
+			Manufacturer:            warehouse.Manufacturer,
+			Dealer:                  warehouse.Dealer,
+			IsSys:                   1,
+			SysRecordTime:           record_time,
+			GoodTypeId:              goods.GoodTypeId,
+			GoodId:                  goods.GoodId,
+			PatientId:               patient_id,
+			Number:                  warehouse.Number,
+			LicenseNumber:           warehouse.LicenseNumber,
+			Price:                   warehouse.PackingPrice,
+			ExpiryDate:              warehouse.ExpiryDate,
+			ProductDate:             warehouse.ProductDate,
+			ProjectId:               goods.ProjectId,
+			SupplyWarehouseId:       warehouse.SupplyWarehouseId,
+			StorehouseId:            goods.StorehouseId,
+			IsCheck:                 1,
+			OverCount:               sum_count,
+			RegisterNumber:          warehouse.RegisterNumber,
+		}
+		warehouseOutInfo.Count = stock_number
+		if orgID == 9671 || orgID == 10265 {
+			goodsInfo, _ := FindeGoodInfo(orgID, goods.ProjectId)
+			warehouseOutInfo.Price = goodsInfo.PackingPrice
+		}
+		_, errcodes := GetWarehouseOutInfoIsExistOne(goods.GoodId, patient_id, record_time, goods.ProjectId)
+
+		if errcodes == gorm.ErrRecordNotFound {
+
+			errors := tx.Create(warehouseOutInfo).Error
+			if errors != nil {
+				return errors
+			}
+		} else if errcodes == nil {
+			goods.Count = deliver_number - stock_number
+			//更新数量为  该批次剩余数量  + 还有未出的数量
+			warehouseOutInfo.Count = stock_number
+			outInfoOne, _ := GetWarehouseOutInfoIsExistTwo(goods.GoodId, patient_id, record_time, goods.ProjectId)
+			if count != outInfoOne.Count {
+
+				outInfo := models.WarehouseOutInfo{}
+				err := tx.Model(&outInfo).Where("good_id = ? and patient_id = ? and sys_record_time  =? and status = 1", goods.GoodId, patient_id, record_time).Updates(map[string]interface{}{"warehouse_out_id": warehouseOutInfo.WarehouseOutId, "WarehouseOutOrderNumber": warehouseOutInfo.WarehouseOutOrderNumber, "sys_record_time": warehouseOutInfo.SysRecordTime, "good_type_id": warehouseOutInfo.GoodTypeId, "patient_id": warehouseOutInfo.PatientId, "consumable_type": warehouseOutInfo.ConsumableType, "count": warehouseOutInfo.Count, "price": warehouseOutInfo.Price, "dealer": warehouseOutInfo.Dealer, "manufacturer": warehouseOutInfo.Manufacturer, "number": warehouseOutInfo.Number, "license_number": warehouseOutInfo.LicenseNumber, "over_count": warehouseOutInfo.OverCount}).Error
+				if err != nil {
+					return err
+				}
+			}
+
+		}
+		lastOut, _ := FindWarehouseOutInfoByPatientId(patient_id, record_time, goods.GoodId, orgID)
+		//查询该该批次已经出库的数据
+		flowGood, _ := GetStockFlowIsBatchNumber(warehouse.ID, patient_id, record_time, goods.GoodId)
+		var out_count int64
+		var out_count_one int64
+		for _, item := range flowGood {
+			out_count += item.Count
+		}
+		flowGoodTwo, _ := GetStockFlowIsBatchNumberThree(patient_id, record_time, goods.GoodId)
+		for _, item := range flowGoodTwo {
+			out_count_one += item.Count
+		}
+		//如果出库数量 大于 历史出库数据 新增1条流水
+		if count > out_count-out_count_one {
+			flow := models.VmStockFlow{
+				WarehouseOutId:          warehouseOut.ID,
+				WarehousingId:           warehouse.ID,
+				GoodId:                  goods.GoodId,
+				Number:                  warehouse.Number,
+				ProductDate:             warehouse.ProductDate,
+				ExpireDate:              warehouse.ExpiryDate,
+				Count:                   stock_number,
+				Price:                   warehouse.PackingPrice,
+				Status:                  1,
+				Ctime:                   time.Now().Unix(),
+				UserOrgId:               orgID,
+				Manufacturer:            warehouse.Manufacturer,
+				Dealer:                  warehouse.Dealer,
+				LicenseNumber:           warehouse.LicenseNumber,
+				IsEdit:                  2,
+				Creator:                 warehouseOut.Creater,
+				SystemTime:              record_time,
+				ConsumableType:          3,
+				WarehouseOutDetailId:    lastOut.ID,
+				WarehouseOutOrderNumber: warehouseOut.WarehouseOutOrderNumber,
+				IsSys:                   1,
+				PatientId:               patient_id,
+				ProjectId:               goods.ProjectId,
+				SupplyWarehouseId:       warehouse.SupplyWarehouseId,
+				StorehouseId:            goods.StorehouseId,
+				OverCount:               sum_count,
+				BuyPrice:                warehouse.Price,
+				RegisterNumber:          warehouse.RegisterNumber,
+			}
+			if orgID == 9671 || orgID == 10265 {
+				goodsInfo, _ := FindeGoodInfo(orgID, goods.ProjectId)
+				flow.Price = goodsInfo.PackingPrice
+				flow.BuyPrice = goodsInfo.BuyPrice
+			}
+
+			err := tx.Create(&flow).Error
+			if err != nil {
+				return err
+			}
+		}
+		//退库
+		if count < out_count-out_count_one {
+			operation_time := time.Now().Unix()
+
+			//创建退库单
+			timeStr := time.Now().Format("2006-01-02")
+			timeArr := strings.Split(timeStr, "-")
+			total, _ := FindAllCancelStockTotal(orgID)
+			total = total + 1
+			orderNumber := "CKTKD" + strconv.FormatInt(orgID, 10) + timeArr[0] + timeArr[1] + timeArr[2] + "000" + strconv.FormatInt(total, 10)
+
+			cancelStock := models.CancelStock{
+				OrderNumber:  orderNumber,
+				OperaTime:    operation_time,
+				OrgId:        orgID,
+				Creater:      warehouseOut.Creater,
+				Ctime:        time.Now().Unix(),
+				Status:       1,
+				ReturnTime:   record_time,
+				Type:         1,
+				StorehouseId: goods.StorehouseId,
+				IsCheck:      1,
+			}
+			_, msgerrkonde := GetCancelStockDetailByOrderNumberOne(record_time, orgID)
+			if msgerrkonde == gorm.ErrRecordNotFound {
+
+				err := tx.Create(&cancelStock).Error
+				if err != nil {
+					return err
+				}
+			}
+
+			cancel, _ := GetLastCancelStockById(orgID)
+
+			manufacturer, _ := GetManufactureById(warehouse.Manufacturer)
+			deaerler, _ := GetDealerById(warehouse.Dealer)
+			cancelStockInfo := models.CancelStockInfo{
+				GoodId:          goods.GoodId,
+				CancelStockId:   cancel.ID,
+				GoodTypeId:      goods.GoodTypeId,
+				Count:           out_count - out_count_one - count,
+				Price:           warehouse.PackingPrice,
+				Total:           0,
+				ProductDate:     warehouse.ProductDate,
+				ExpiryDate:      warehouse.ExpiryDate,
+				Ctime:           time.Now().Unix(),
+				Status:          1,
+				OrgId:           orgID,
+				OrderNumber:     cancel.OrderNumber,
+				Type:            0,
+				Dealer:          deaerler.DealerName,
+				Manufacturer:    manufacturer.ManufacturerName,
+				Number:          warehouse.Number,
+				RegisterAccount: "",
+				Remark:          "",
+				WarehouseInfoId: warehouse.ID,
+				PatientId:       patient_id,
+				RecordDate:      record_time,
+				StorehouseId:    goods.StorehouseId,
+				IsCheck:         1,
+			}
+			if orgID == 9671 || orgID == 10265 {
+				goodsInfo, _ := FindeGoodInfo(orgID, goods.ProjectId)
+				cancelStockInfo.Price = goodsInfo.PackingPrice
+			}
+
+			err := tx.Create(&cancelStockInfo).Error
+			if err != nil {
+				return err
+			}
+
+			cancelInfo, _ := GetLastCancelStockInfoByGoodId(goods.GoodId)
+
+			flow := models.VmStockFlow{
+				WarehousingId:           warehouse.ID,
+				GoodId:                  goods.GoodId,
+				Number:                  warehouse.Number,
+				LicenseNumber:           warehouse.LicenseNumber,
+				Count:                   out_count - count,
+				UserOrgId:               orgID,
+				PatientId:               patient_id,
+				SystemTime:              record_time,
+				ConsumableType:          7,
+				IsSys:                   1,
+				WarehousingOrder:        "",
+				WarehouseOutId:          lastOut.WarehouseOutId,
+				WarehouseOutOrderNumber: lastOut.WarehouseOutOrderNumber,
+				IsEdit:                  0,
+				CancelStockId:           cancel.ID,
+				CancelOrderNumber:       cancel.OrderNumber,
+				Manufacturer:            manufacturer.ID,
+				Dealer:                  0,
+				Creator:                 warehouseOut.Creater,
+				UpdateCreator:           0,
+				Status:                  1,
+				Ctime:                   time.Now().Unix(),
+				Mtime:                   0,
+				Price:                   warehouse.PackingPrice,
+				WarehousingDetailId:     warehouse.ID,
+				WarehouseOutDetailId:    lastOut.ID,
+				CancelOutDetailId:       cancelInfo.ID,
+				ProductDate:             warehouse.ProductDate,
+				ExpireDate:              warehouse.ExpiryDate,
+				StorehouseId:            goods.StorehouseId,
+				BuyPrice:                warehouse.Price,
+				ProjectId:               goods.ProjectId,
+				OverCount:               sum_count,
+				RegisterNumber:          warehouse.RegisterNumber,
+			}
+			if orgID == 9671 || orgID == 10265 {
+				goodsInfo, _ := FindeGoodInfo(orgID, goods.ProjectId)
+				flow.Price = goodsInfo.PackingPrice
+				flow.BuyPrice = goodsInfo.BuyPrice
+			}
+			err = tx.Create(&flow).Error
+			if err != nil {
+				return err
+			}
+		}
+
+		// 清零完该库存后，还有剩余出库未出完，进行对应的递归操作
+		goods.Count = deliver_number - stock_number
+
+		ConsumablesGoodDelivery(orgID, patient_id, record_time, goods, warehouseOut, count)
+
+	}
+
+	return nil
+}

service/patientmanage_service.go

@@ -1055,7 +1055,7 @@ func GetInspectionDetail(patientid int64, date int64, orgid int64, projectid int
 	if projectid > 0 {
 		db = db.Where("x.project_id = ?", projectid)
 	}
-	err = db.Group("x.id").Select("x.id,x.patient_id,x.org_id,x.project_id,x.item_id,x.item_name,x.project_name,x.inspect_type,x.inspect_value,x.inspect_date,x.status,x.created_time,x.updated_time,r.range_type,r.range_min,r.range_max,r.range_value,r.range_options,r.unit").Joins("left join xt_inspection_reference as r on (r.item_id = x.item_id AND r.org_id > 0) OR ( x.item_id = r.id AND r.org_id = 0)   ").Scan(&inspection).Error
+	err = db.Group("x.id").Select("x.id,x.patient_id,x.org_id,x.project_id,x.item_id,x.item_name,x.project_name,x.inspect_type,x.inspect_value,x.inspect_date,x.status,x.created_time,x.updated_time,r.range_type,r.range_min,r.range_max,r.range_value,r.range_options,r.unit").Joins("left join xt_inspection_reference as r on (r.item_id = x.item_id AND r.org_id = x.org_id) OR ( x.item_id = r.id AND r.org_id = 0)   ").Scan(&inspection).Error
 	return inspection, err
 }
 
@@ -1948,7 +1948,7 @@ func GetFirstDetailById(id int64) (models.XtPatientFirstDisease, error) {
 
 func UpdatePatientFirstDisease(disease models.XtPatientFirstDisease, id int64) error {
 
-	err := XTWriteDB().Model(&models.XtPatientFirstDisease{}).Where("id =? and status = 1", id).Update(map[string]interface{}{"title": disease.Title, "doctor": disease.Doctor, "record_date": disease.RecordDate, "main_content": disease.MainContent, "patient_case": disease.PatientCase, "tentative_diagnosis": disease.TentativeDiagnosis, "diagnostic_basis": disease.DiagnosticBasis, "differential_diagnosis": disease.DifferentialDiagnosis, "treatment_plan": disease.TreatmentPlan}).Error
+	err := XTWriteDB().Model(&models.XtPatientFirstDisease{}).Where("id =? and status = 1", id).Update(map[string]interface{}{"title": disease.Title, "doctor": disease.Doctor, "record_date": disease.RecordDate, "main_content": disease.MainContent, "patient_case": disease.PatientCase, "tentative_diagnosis": disease.TentativeDiagnosis, "diagnostic_basis": disease.DiagnosticBasis, "differential_diagnosis": disease.DifferentialDiagnosis, "treatment_plan": disease.TreatmentPlan, "project_id": disease.ProjectId, "inspect_date": disease.InspectDate}).Error
 	return err
 }
 

service/pharmacy_service.go

@@ -30,7 +30,6 @@ func SaveErrs(org_id int64, input *context.BeegoInput, err error) {
 	XTWriteDB().Create(&tmp)
 }
 
-//
 func SavePharmacy() (err error) {
 	var advice_info []*models.HisDoctorAdviceInfo
 	err = XTReadDB().Raw("select * from xt_doctor_advice where id > 21780 and id < 21790").Scan(&advice_info).Error
@@ -40,18 +39,18 @@ func SavePharmacy() (err error) {
 	return nil
 }
 
-//查询药房中某一天的患者人数,is_medicine:0未发，1已发(改)
+// 查询药房中某一天的患者人数,is_medicine:0未发，1已发(改)
 func GetTodayPharmacy(stime, etime, orgid, is_medicine int64) (num int, err error) {
 	//orgid = 9675
 	InitDrugidIsNil(orgid, stime, etime)
 	var tmp []*models.TmpTTT
 	if is_medicine == 0 {
 		err = XTReadDB().Raw("select distinct patient_id from his_doctor_advice_info where "+
-			"status = 1 and created_time >= ? and created_time <= ? and user_org_id = ? and is_medicine = 0 and "+
+			"status = 1 and advice_date >= ? and advice_date <= ? and user_org_id = ? and is_medicine = 0 and "+
 			"drug_id in (select id from xt_base_drug where org_id = ? and is_pharmacy = 1) "+
 			"union "+
 			"select distinct patient_id from xt_doctor_advice where "+
-			"status = 1 and (advice_type = 2 or advice_type = 3) and created_time >= ? and created_time <= ? and user_org_id = ? and is_medicine = 0 and "+
+			"status = 1 and (advice_type = 2 or advice_type = 3) and advice_date >= ? and advice_date <= ? and user_org_id = ? and is_medicine = 0 and "+
 			"drug_id in (select id from xt_base_drug where org_id = ? and is_pharmacy = 1) ",
 			stime, etime, orgid, orgid, stime, etime, orgid, orgid).Scan(&tmp).Error
 		if err != nil {
@@ -59,11 +58,11 @@ func GetTodayPharmacy(stime, etime, orgid, is_medicine int64) (num int, err erro
 		}
 	} else {
 		err = XTReadDB().Raw("select distinct patient_id from his_doctor_advice_info where "+
-			"status = 1 and created_time >= ? and created_time <= ? and user_org_id = ? and is_medicine = 1 and "+
+			"status = 1 and advice_date >= ? and advice_date <= ? and user_org_id = ? and is_medicine = 1 and "+
 			"drug_id in (select id from xt_base_drug where org_id = ? and status = 1) "+
 			"union "+
 			"select distinct patient_id from xt_doctor_advice where "+
-			"status = 1 and (advice_type = 2 or advice_type = 3) and created_time >= ? and created_time <= ? and user_org_id = ? and is_medicine = 1 and "+
+			"status = 1 and (advice_type = 2 or advice_type = 3) and advice_date >= ? and advice_date <= ? and user_org_id = ? and is_medicine = 1 and "+
 			"drug_id in (select id from xt_base_drug where org_id = ? and status = 1) ",
 			stime, etime, orgid, orgid, stime, etime, orgid, orgid).Scan(&tmp).Error
 		if err != nil {
@@ -75,7 +74,53 @@ func GetTodayPharmacy(stime, etime, orgid, is_medicine int64) (num int, err erro
 
 }
 
-//(改)
+func GetTodayAdviceCount(stime, etime, orgid, is_medicine int64) (num int, err error) {
+
+	//orgid = 9675
+	InitDrugidIsNil(orgid, stime, etime)
+	var tmp []*models.TmpTTT
+	if is_medicine == 0 {
+		err = XTReadDB().Raw("select * from his_doctor_advice_info where status= 1 and advice_date>=? and advice_date<=? and user_org_id=? and is_medicine=0 group by patient_id",
+			stime, etime, orgid).Scan(&tmp).Error
+		if err != nil {
+			return
+		}
+	} else {
+		err = XTReadDB().Raw("select * from his_doctor_advice_info where status= 1 and advice_date>=? and advice_date<=? and user_org_id=? and is_medicine=1 group by patient_id",
+			stime, etime, orgid).Scan(&tmp).Error
+		if err != nil {
+			return
+		}
+	}
+
+	return len(tmp), err
+}
+
+func GetTodayAdviceCountOne(stime int64, etime int64, orgid int64, is_medicine int64) (advice []*models.HisDoctorAdviceInfo, err error) {
+
+	db := XTReadDB().Model(&advice).Where("status=1 and is_medicine = ?", is_medicine)
+	if stime > 0 {
+		db = db.Where("advice_date>=?", stime)
+	}
+	if etime > 0 {
+		db = db.Where("advice_date<=?", stime)
+	}
+	if orgid > 0 {
+		db = db.Where("user_org_id = ?", orgid)
+	}
+
+	err = db.Group("patient_id").Find(&advice).Error
+	return advice, err
+}
+
+func GetPatientByAdviceId(patient_id int64) (models.TmpPatientOne, error) {
+
+	patient := models.TmpPatientOne{}
+	err = XTReadDB().Where("id = ?", patient_id).Find(&patient).Error
+	return patient, err
+}
+
+// (改)
 func GetTodayDrug(stime, etime, orgid, is_medicine int64, keyword string) (list []*models.TmpPatient, err error) {
 	InitDrugidIsNil(orgid, stime, etime)
 	//病人
@@ -85,22 +130,22 @@ func GetTodayDrug(stime, etime, orgid, is_medicine int64, keyword string) (list
 		if keyword != "" {
 			keyword = "%" + keyword + "%"
 			err = XTReadDB().Raw("select a.* from(select distinct patient_id,dispensing_time from his_doctor_advice_info where "+
-				"status = 1 and created_time >= ? and created_time <= ? and user_org_id = ? and is_medicine = ? and "+
+				"status = 1 and advice_date >= ? and advice_date <= ? and user_org_id = ? and is_medicine = ? and "+
 				"patient_id in (select id from xt_patients where user_org_id = ? and name like ? or dialysis_no like ?) and "+
 				"drug_id in (select id from xt_base_drug where org_id = ? and is_pharmacy = 1) "+
 				"union "+
 				"select distinct patient_id,dispensing_time from xt_doctor_advice where "+
-				"status = 1 and (advice_type = 2 or advice_type = 3) and created_time >= ? and created_time <= ? and user_org_id = ? and is_medicine = ? and "+
+				"status = 1 and (advice_type = 2 or advice_type = 3) and advice_date >= ? and advice_date <= ? and user_org_id = ? and is_medicine = ? and "+
 				"patient_id in (select id from xt_patients where user_org_id = ? and name like ? or dialysis_no like ?) and "+
 				"drug_id in (select id from xt_base_drug where org_id = ? and is_pharmacy = 1))a order by dispensing_time desc ",
 				stime, etime, orgid, is_medicine, orgid, keyword, keyword, orgid, stime, etime, orgid, is_medicine, orgid, keyword, keyword, orgid).Scan(&tmp).Error
 		} else {
 			err = XTReadDB().Raw("select a.* from(select distinct patient_id,dispensing_time from his_doctor_advice_info where "+
-				"status = 1 and created_time >= ? and created_time <= ? and user_org_id = ? and is_medicine = ? and "+
+				"status = 1 and advice_date >= ? and advice_date <= ? and user_org_id = ? and is_medicine = ? and "+
 				"drug_id in (select id from xt_base_drug where org_id = ? and is_pharmacy = 1) "+
 				"union "+
 				"select distinct patient_id,dispensing_time from xt_doctor_advice where "+
-				"status = 1 and (advice_type = 2 or advice_type = 3) and created_time >= ? and created_time <= ? and user_org_id = ? and is_medicine = ? and "+
+				"status = 1 and (advice_type = 2 or advice_type = 3) and advice_date >= ? and advice_date <= ? and user_org_id = ? and is_medicine = ? and "+
 				"drug_id in (select id from xt_base_drug where org_id = ? and is_pharmacy = 1))a order by dispensing_time desc",
 				stime, etime, orgid, is_medicine, orgid, stime, etime, orgid, is_medicine, orgid).Scan(&tmp).Error
 		}
@@ -150,7 +195,7 @@ func GetTodayDrug(stime, etime, orgid, is_medicine int64, keyword string) (list
 
 }
 
-//查询患者（改）
+// 查询患者（改）
 func GetManyUsers(tmp []int64) (list []*models.TmpPatient, err error) {
 
 	for i := 0; i < len(tmp); i++ {
@@ -167,19 +212,19 @@ func GetManyUsers(tmp []int64) (list []*models.TmpPatient, err error) {
 	return
 }
 
-//查询患者当天时间段中的药,is_medicine:0未发，1已发(改)
+// 查询患者当天时间段中的药,is_medicine:0未发，1已发(改)
 func GetPatientMedication(orgid, patient_id, stime, etime, is_medicine int64) (pp []*models.PharmacyContent, err error) {
 	InitDrugidIsNil(orgid, stime, etime)
 	var tmp []*models.HisDoctorAdviceInfoL
 	if is_medicine == 0 {
 		err = XTReadDB().Model(&models.HisDoctorAdviceInfoL{}).Where(
-			"status = 1 and created_time >= ? and created_time <= ? and user_org_id = ? and patient_id = ? and is_medicine = ? and drug_id in (select id from xt_base_drug where org_id = ? and is_pharmacy = 1)", stime, etime, orgid, patient_id, is_medicine, orgid).Find(&tmp).Error
+			"status = 1 and advice_date >= ? and advice_date <= ? and user_org_id = ? and patient_id = ? and is_medicine = ? and drug_id in (select id from xt_base_drug where org_id = ? and is_pharmacy = 1)", stime, etime, orgid, patient_id, is_medicine, orgid).Find(&tmp).Error
 		if err != nil {
 			return pp, err
 		}
 	} else {
 		err = XTReadDB().Model(&models.HisDoctorAdviceInfoL{}).Where(
-			"status = 1 and created_time >= ? and created_time <= ? and user_org_id = ? and patient_id = ? and is_medicine = ? and drug_id in (select id from xt_base_drug where org_id = ? and status = 1)", stime, etime, orgid, patient_id, is_medicine, orgid).Find(&tmp).Error
+			"status = 1 and advice_date >= ? and advice_date <= ? and user_org_id = ? and patient_id = ? and is_medicine = ? and drug_id in (select id from xt_base_drug where org_id = ? and status = 1)", stime, etime, orgid, patient_id, is_medicine, orgid).Find(&tmp).Error
 		if err != nil {
 			return pp, err
 		}
@@ -202,13 +247,13 @@ func GetPatientMedication(orgid, patient_id, stime, etime, is_medicine int64) (p
 	var tmp_advice []*models.XtDoctorAdviceL
 	if is_medicine == 0 {
 		err = XTReadDB().Model(&models.XtDoctorAdviceL{}).Where(
-			"status = 1 and (advice_type = 2 or advice_type = 3) and created_time >= ? and created_time <= ? and user_org_id = ? and patient_id = ? and is_medicine = ? and drug_id in (select id from xt_base_drug where org_id = ? and is_pharmacy = 1)", stime, etime, orgid, patient_id, is_medicine, orgid).Find(&tmp_advice).Error
+			"status = 1 and (advice_type = 2 or advice_type = 3) and advice_date >= ? and advice_date <= ? and user_org_id = ? and patient_id = ? and is_medicine = ? and drug_id in (select id from xt_base_drug where org_id = ? and is_pharmacy = 1)", stime, etime, orgid, patient_id, is_medicine, orgid).Find(&tmp_advice).Error
 		if err != nil {
 			return pp, err
 		}
 	} else {
 		err = XTReadDB().Model(&models.XtDoctorAdviceL{}).Where(
-			"status = 1 and (advice_type = 2 or advice_type = 3) and created_time >= ? and created_time <= ? and user_org_id = ? and patient_id = ? and is_medicine = ? and drug_id in (select id from xt_base_drug where org_id = ? and status = 1)", stime, etime, orgid, patient_id, is_medicine, orgid).Find(&tmp_advice).Error
+			"status = 1 and (advice_type = 2 or advice_type = 3) and advice_date >= ? and advice_date <= ? and user_org_id = ? and patient_id = ? and is_medicine = ? and drug_id in (select id from xt_base_drug where org_id = ? and status = 1)", stime, etime, orgid, patient_id, is_medicine, orgid).Find(&tmp_advice).Error
 		if err != nil {
 			return pp, err
 		}
@@ -230,14 +275,14 @@ func GetPatientMedication(orgid, patient_id, stime, etime, is_medicine int64) (p
 	return
 }
 
-//获取创建者姓名(改)
+// 获取创建者姓名(改)
 func GetAdminUserName(doctor, orgid int64) string {
 	var tmp models.VmUserAdminRole
 	XTReadDB().Model(&models.VmUserAdminRole{}).Where("admin_user_id = ? and org_id = ? and status = 1", doctor, orgid).Find(&tmp)
 	return tmp.UserName
 }
 
-//查询该机构的药房配置,true: 通过药房发药，false：不通过药房发药。如果没有该机构的信息则生成一条数据
+// 查询该机构的药房配置,true: 通过药房发药，false：不通过药房发药。如果没有该机构的信息则生成一条数据
 func GetOrgIdPharmacyConfig(orgid int64) bool {
 	var total int
 	var tmp_pharmacy models.PharmacyConfig
@@ -263,7 +308,7 @@ func GetOrgIdPharmacyConfig(orgid int64) bool {
 	}
 }
 
-//修改该机构的药房配置
+// 修改该机构的药房配置
 func ModifyPharmacyConfig(orgid, isopen int64) (err error) {
 	if isopen == 1 || isopen == 2 {
 		err = XTWriteDB().Model(&models.PharmacyConfig{}).Where("user_org_id = ? and status = 1", orgid).Updates(map[string]interface{}{
@@ -276,21 +321,21 @@ func ModifyPharmacyConfig(orgid, isopen int64) (err error) {
 	return
 }
 
-//查询该药品是否通过药房发药.0否；1是
+// 查询该药品是否通过药房发药.0否；1是
 func DrugAllocation(drug_id int64) (is_pharmacy int64, err error) {
 	tmp := models.BaseDrugLib{}
 	err = XTReadDB().Model(&models.BaseDrugLib{}).Where("id = ?", drug_id).Find(&tmp).Error
 	return tmp.IsPharmacy, err
 }
 
-//根据id查询该药是否发药
+// 根据id查询该药是否发药
 func MedicineState(id int64) (is_medicine models.HisDoctorAdviceInfoL, err error) {
 	tmp := models.HisDoctorAdviceInfoL{}
 	err = XTReadDB().Model(&models.HisDoctorAdviceInfoL{}).Where("id = ?", id).Find(&tmp).Error
 	return tmp, err
 }
 
-//发药明细列表(
+// 发药明细列表(
 func DispensingDetailsList(stime, etime, orgid, page, limit int64, keyword string) (dislist []*models.DispensingList, total int64, err error) {
 	var fenye []*models.Pharmary //分页用的
 	offset := (page - 1) * limit
@@ -329,7 +374,7 @@ func DispensingDetailsList(stime, etime, orgid, page, limit int64, keyword strin
 	return
 }
 
-//处方详情//////////////////////
+// 处方详情//////////////////////
 func PrescriptionDetails(patient_id, record_date, orgid int64) (pre []*models.PrescripDetails, err error) {
 	var tmp []*models.HisDoctorAdviceInfoL
 	err = XTReadDB().Model(&models.HisDoctorAdviceInfoL{}).Where(
@@ -371,7 +416,7 @@ func PrescriptionDetails(patient_id, record_date, orgid int64) (pre []*models.Pr
 	return
 }
 
-//查询病人的his id
+// 查询病人的his id
 func GetHisID(prescription_id, orgid int64) (id int64) {
 	var tmp models.HisPrintPrescription
 	XTReadDB().Model(&models.HisPrintPrescription{}).Where("id = ?", prescription_id).Find(&tmp)
@@ -380,7 +425,7 @@ func GetHisID(prescription_id, orgid int64) (id int64) {
 	return fin.ID
 }
 
-//根据药品id获取药品信息
+// 根据药品id获取药品信息
 func GetDrugNameTX(id int64, tx *gorm.DB) (tmp models.SpBaseDrug, err error) {
 	err = tx.Model(&models.SpBaseDrug{}).Where("id = ? and status = 1", id).Find(&tmp).Error
 	return
@@ -392,7 +437,7 @@ func GetXtManufacturer(id int64, tx *gorm.DB) (name string, err error) {
 	return
 }
 
-//查询药品（使用keyword）
+// 查询药品（使用keyword）
 func GetManyDrugs(orgid int64, keyword string) (map[int64]models.PharmacyBaseDrug, error) {
 	var tmp []*models.PharmacyBaseDrug
 	tt := make(map[int64]models.PharmacyBaseDrug)
@@ -403,7 +448,7 @@ func GetManyDrugs(orgid int64, keyword string) (map[int64]models.PharmacyBaseDru
 	return tt, err
 }
 
-//查询(
+// 查询(
 func GetTodayMedicine(stime, etime, orgid, is_medicine int64, keyword string) (finlly []*models.ListOfDrugs, err error) {
 	InitDrugidIsNil(orgid, stime, etime)
 	var tmp []*models.TmpLLL
@@ -474,7 +519,7 @@ func GetTodayMedicine(stime, etime, orgid, is_medicine int64, keyword string) (f
 	return
 }
 
-//根据药品id获取药品规格(
+// 根据药品id获取药品规格(
 func FindDrugSpecifications(id int64) (name, specifications string) {
 	var tmp models.PharmacyBaseDrug
 	XTReadDB().Model(&models.PharmacyBaseDrug{}).Where("id = ?", id).Find(&tmp)
@@ -483,7 +528,7 @@ func FindDrugSpecifications(id int64) (name, specifications string) {
 	return
 }
 
-//根据药品id获取当前药品出库仓库的库存数量
+// 根据药品id获取当前药品出库仓库的库存数量
 func GetInventoryQuantity(orgid, drugid int64) (number string, err error) {
 	//获取药品拆零数量
 	var phar models.PharmacyBaseDrug
@@ -516,7 +561,7 @@ func GetInventoryQuantity(orgid, drugid int64) (number string, err error) {
 	return
 }
 
-//获取该药品的病人信息(
+// 获取该药品的病人信息(
 func FindMedicationList(orgid, drug_id, stime, etime, is_medicine int64) (pp []*models.PatientInformation, err error) { ///////////////
 	InitDrugidIsNil(orgid, stime, etime)
 	var tmp []*models.HisDoctorAdviceInfoL
@@ -566,7 +611,7 @@ func FindMedicationList(orgid, drug_id, stime, etime, is_medicine int64) (pp []*
 	return
 }
 
-//患者发药按钮点击（
+// 患者发药按钮点击（
 func DispensingMedicine(orgid, patient_id, stime, etime, creater int64) (err error) {
 	//开事务
 	tx := XTWriteDB().Begin()
@@ -581,7 +626,7 @@ func DispensingMedicine(orgid, patient_id, stime, etime, creater int64) (err err
 	time_now := time.Now().Unix()
 	var hids []*models.TmpID
 	var xids []*models.TmpID
-	err = tx.Raw("select id from his_doctor_advice_info where status = 1 and created_time >= ? and created_time <= ? "+
+	err = tx.Raw("select id from his_doctor_advice_info where status = 1 and advice_date >= ? and advice_date <= ? "+
 		"and user_org_id = ? and patient_id = ? and is_medicine = 0 and drug_id in (select id from xt_base_drug where org_id = ? and is_pharmacy = 1) ", stime, etime, orgid, patient_id, orgid).Scan(&hids).Error
 	if err != nil {
 		return
@@ -601,7 +646,7 @@ func DispensingMedicine(orgid, patient_id, stime, etime, creater int64) (err err
 			if PettyCash(v.DrugId) {
 				continue
 			}
-			//判断药品库存是否充足
+			////判断药品库存是否充足
 			kou := FenDrugInventory(v, orgid)
 			if !kou {
 				err = fmt.Errorf(FindDrugsName(v.DrugId) + "库存不足")
@@ -630,48 +675,52 @@ func DispensingMedicine(orgid, patient_id, stime, etime, creater int64) (err err
 		return err1
 	}
 
-	err = tx.Raw("select id from xt_doctor_advice where status = 1 and (advice_type = 2 or advice_type = 3) and created_time >= ? and created_time <= ? and "+
-		"user_org_id = ? and patient_id = ? and is_medicine = 0 and drug_id in (select id from xt_base_drug where org_id = ? and is_pharmacy = 1)", stime, etime, orgid, patient_id, orgid).Scan(&xids).Error
-	if err != nil {
-		return
-	}
-	xid := make([]int64, 0)
-	for _, v := range xids {
-		xid = append(xid, v.Id)
-	}
-	var advice []*models.HisDoctorAdviceInfo
-	err = tx.Raw("select * from xt_doctor_advice where id in (?) and status = 1", xid).Scan(&advice).Error
-	if err != nil {
-		return
-	}
-	for _, v := range advice {
-		tmp_bool := IsPharmacyConfig(orgid)
-		if tmp_bool {
-			if PettyCash(v.DrugId) {
-				continue
-			}
-			kou := FenDrugInventory(v, orgid)
-			if !kou {
-				err = fmt.Errorf(FindDrugsName(v.DrugId) + "库存不足")
-				return
-			}
-			//扣减库存
-			err = FenStock(orgid, creater, v)
-			if err != nil {
-				err = fmt.Errorf("!:%v", err)
-				return
+	//针对大丰响水
+	if orgid != 10217 && orgid != 10188 && orgid != 9671 && orgid != 10164 {
+		err = tx.Raw("select id from xt_doctor_advice where status = 1 and (advice_type = 2 or advice_type = 3) and advice_date >= ? and advice_date <= ? and "+
+			"user_org_id = ? and patient_id = ? and is_medicine = 0 and drug_id in (select id from xt_base_drug where org_id = ? and is_pharmacy = 1)", stime, etime, orgid, patient_id, orgid).Scan(&xids).Error
+		if err != nil {
+			return
+		}
+		xid := make([]int64, 0)
+		for _, v := range xids {
+			xid = append(xid, v.Id)
+		}
+		var advice []*models.HisDoctorAdviceInfo
+		err = tx.Raw("select * from xt_doctor_advice where id in (?) and status = 1", xid).Scan(&advice).Error
+		if err != nil {
+			return
+		}
+
+		for _, v := range advice {
+			tmp_bool := IsPharmacyConfig(orgid)
+			if tmp_bool {
+				if PettyCash(v.DrugId) {
+					continue
+				}
+				kou := FenDrugInventory(v, orgid)
+				if !kou {
+					err = fmt.Errorf(FindDrugsName(v.DrugId) + "库存不足")
+					return
+				}
+				//扣减库存
+				err = FenStock(orgid, creater, v)
+				if err != nil {
+					err = fmt.Errorf("!:%v", err)
+					return
+				}
 			}
 		}
-	}
-	//修改状态
-	errs1 := XTWriteDB().Model(&models.XtDoctorAdviceL{}).Where("id in (?)", xid).Updates(map[string]interface{}{
-		"is_medicine":     1,
-		"people":          0,
-		"dispensing_time": time_now,
-		"updated_time":    time.Now().Unix(),
-	}).Error
-	if errs1 != nil {
-		return errs1
+		//修改状态
+		errs1 := XTWriteDB().Model(&models.XtDoctorAdviceL{}).Where("id in (?)", xid).Updates(map[string]interface{}{
+			"is_medicine":     1,
+			"people":          0,
+			"dispensing_time": time_now,
+			"updated_time":    time.Now().Unix(),
+		}).Error
+		if errs1 != nil {
+			return errs1
+		}
 	}
 
 	//生成明细记录
@@ -688,7 +737,7 @@ func DispensingMedicine(orgid, patient_id, stime, etime, creater int64) (err err
 	return
 }
 
-//患者退药按钮点击
+// 患者退药按钮点击
 func DrugWithdrawal(orgid, patient_id, stime, etime, creater int64) (err error) {
 	//开事务
 	tx := XTWriteDB().Begin()
@@ -829,7 +878,7 @@ func DrugWithdrawal(orgid, patient_id, stime, etime, creater int64) (err error)
 	return
 }
 
-//获取患者名称
+// 获取患者名称
 func FindUserName(patient_id int64) (name string) {
 	var tmp models.GetHisName
 	XTReadDB().Model(&models.GetHisName{}).Where("id = ?", patient_id).Find(&tmp)
@@ -837,7 +886,7 @@ func FindUserName(patient_id int64) (name string) {
 	return
 }
 
-//获取药品名称
+// 获取药品名称
 func FindDrugsName(drug_id int64) (name string) {
 	var tmp models.Drug
 	XTReadDB().Model(&models.Drug{}).Where("id = ?", drug_id).Find(&tmp)
@@ -845,7 +894,7 @@ func FindDrugsName(drug_id int64) (name string) {
 	return
 }
 
-//药品发药按钮点击(
+// 药品发药按钮点击(
 func MedicineDeparture(ids string, creater, orgid int64) (err error) {
 	//开事务
 	tx := XTWriteDB().Begin()
@@ -995,14 +1044,14 @@ func MedicineDeparture(ids string, creater, orgid int64) (err error) {
 	return
 }
 
-//获取领药人姓名（
+// 获取领药人姓名（
 func GetUserAdminName(id, orgID int64) string {
 	var tmp models.XTSgjUserAdminRole
 	XTReadDB().Model(&models.XTSgjUserAdminRole{}).Where("admin_user_id = ? and org_id = ?", id, orgID).Find(&tmp)
 	return tmp.UserName
 }
 
-//根据id查询是否已发药,true已发药，false未发药gai
+// 根据id查询是否已发药,true已发药，false未发药gai
 func GiveTheMedicine(id int64) bool {
 	var xue models.PharmacyDoctorAdvice
 	XTReadDB().Model(&models.PharmacyDoctorAdvice{}).Where("id = ?", id).Find(&xue)
@@ -1012,7 +1061,7 @@ func GiveTheMedicine(id int64) bool {
 	return false
 }
 
-//查询改组中的药品是否包含已发药的，true已发药，false未发药
+// 查询改组中的药品是否包含已发药的，true已发药，false未发药
 func GiveGroupMedicine(orgid, groupNo int64) bool {
 	var total int
 	XTReadDB().Model(&models.DoctorAdvice{}).Where("user_org_id = ? and groupno = ? and status = 1 and is_medicine = 1", orgid, groupNo).Count(&total)
@@ -1022,7 +1071,7 @@ func GiveGroupMedicine(orgid, groupNo int64) bool {
 	return false
 }
 
-//查询处方中是否包含已发药的
+// 查询处方中是否包含已发药的
 func GiveChuMedicine(id int64) bool {
 	var total int
 	XTReadDB().Model(&models.HisDoctorAdviceInfoL{}).Where("prescription_id = ? and status = 1 and is_medicine = 1", id).Count(&total)
@@ -1032,7 +1081,7 @@ func GiveChuMedicine(id int64) bool {
 	return false
 }
 
-//根据处方id查找该处方中是否存在已发药的药品
+// 根据处方id查找该处方中是否存在已发药的药品
 func IsChuIssuedDrugs(prescription_id int64) bool {
 	var total int
 	XTReadDB().Model(&models.HisDoctorAdviceInfoL{}).Where("prescription_id = ? and status = 1 and is_medicine = 1", prescription_id).Count(&total)
@@ -1042,8 +1091,8 @@ func IsChuIssuedDrugs(prescription_id int64) bool {
 	return false
 }
 
-//判断该药品是否通过药房管理出库，true是，false否
-//id 药品id,org_id 机构id
+// 判断该药品是否通过药房管理出库，true是，false否
+// id 药品id,org_id 机构id
 func IsPharmacyDelivery(id, org_id int64) bool {
 	//判断药品是否通过药房管理
 	var total01 int
@@ -1057,7 +1106,7 @@ func IsPharmacyDelivery(id, org_id int64) bool {
 	return false
 }
 
-//判断机构是否通过药房管理出库
+// 判断机构是否通过药房管理出库
 func IsPharmacyConfig(orgid int64) (bo bool) {
 	var total int
 	XTReadDB().Model(&models.PharmacyConfig{}).Where("user_org_id = ? and is_open = 1 and status = 1", orgid).Count(&total)
@@ -1067,7 +1116,7 @@ func IsPharmacyConfig(orgid int64) (bo bool) {
 	return false
 }
 
-//根据患者id和发药时间，获取医生的id和姓名
+// 根据患者id和发药时间，获取医生的id和姓名
 func GetDoctorIds(id, recordtime, orgid int64) (doctor_id int64, doctor_name string, err error) {
 	var tmp []*models.TmpAdviceDoctor
 	//var tmp []int64
@@ -1091,7 +1140,7 @@ func MapToJson(param map[string]interface{}) string {
 	return dataString
 }
 
-//封装扣减库存
+// 封装扣减库存
 func FenStock(orgid, creater int64, v *models.HisDoctorAdviceInfo) (err error) {
 
 	err = HisDrugsDelivery(orgid, creater, v)
@@ -1118,7 +1167,7 @@ func FenStock(orgid, creater int64, v *models.HisDoctorAdviceInfo) (err error) {
 	return
 }
 
-//封装查询药品库存是否足够
+// 封装查询药品库存是否足够
 func FenDrugInventory(item *models.HisDoctorAdviceInfo, orgid int64) bool {
 	var total int64
 	var prescribing_number_total int64
@@ -1233,7 +1282,7 @@ func GetAdviceId2(id, orgid, execution_staff int64, thetime time.Time) (bo bool,
 	return false, err
 }
 
-//判断药品是否零用
+// 判断药品是否零用
 func PettyCash(id int64) bool {
 	drug := models.XtBaseDrug{}
 	XTReadDB().Model(&drug).Where("id = ? and status = 1", id).Find(&drug)
@@ -1243,16 +1292,16 @@ func PettyCash(id int64) bool {
 	return false
 }
 
-//初始化
+// 初始化
 func InitDrugidIsNil(orgid, stime, etime int64) {
 	var advice []*models.DoctorAdvice
 	XTReadDB().Model(&models.DoctorAdvice{}).Where("drug_id = 0 and user_org_id = ? and status = 1 and created_time >= ? and created_time <= ?", orgid, stime, etime).Find(&advice)
 	for _, v := range advice {
-		XTWriteDB().Exec("update xt_doctor_advice set drug_id = (select id from xt_base_drug where drug_name = ? and org_id = ?) where id = ?", v.AdviceName, v.UserOrgId, v.ID)
+		XTWriteDB().Exec("update xt_doctor_advice set drug_id = (select id from xt_base_drug where drug_name = ? and org_id = ? and status = 1 limit 1) where id = ?", v.AdviceName, v.UserOrgId, v.ID)
 	}
 }
 
-//改变处方状态(发药
+// 改变处方状态(发药
 func ChangeHisPrescription(tmp []int64) (err error) {
 	var advice_info []*models.HisDoctorAdviceInfo
 	err = XTReadDB().Model(&models.HisDoctorAdviceInfo{}).Where("id in (?) and status = 1", tmp).Find(&advice_info).Error
@@ -1279,7 +1328,7 @@ func ChangeHisPrescription(tmp []int64) (err error) {
 	return
 }
 
-//改变处方状态(退药
+// 改变处方状态(退药
 func ChangeHisPrescriptionT(tmp []int64) (err error) {
 	var advice_info []*models.HisDoctorAdviceInfo
 	err = XTReadDB().Model(&models.HisDoctorAdviceInfo{}).Where("id in (?) and status = 1", tmp).Find(&advice_info).Error
@@ -1311,7 +1360,7 @@ func ChangeHisPrescriptionT(tmp []int64) (err error) {
 	return
 }
 
-//改变处方状态
+// 改变处方状态
 func ChangeHisPrescriptionid(id string) (err error) {
 	var advice models.HisDoctorAdviceInfo
 	err = XTReadDB().Model(&models.HisDoctorAdviceInfo{}).Where("id = ? and status = 1", id).Find(&advice).Error
@@ -1331,7 +1380,7 @@ func ChangeHisPrescriptionid(id string) (err error) {
 	return
 }
 
-//获取药品规格
+// 获取药品规格
 func ReplacementDrugs(orgid int64, special bool) (list []*models.ReplacementDrugs, err error) {
 	var g errgroup.Group
 	var lib []*models.BaseDrugLib
@@ -1368,7 +1417,7 @@ func ReplacementDrugs(orgid int64, special bool) (list []*models.ReplacementDrug
 	return
 }
 
-//获取药品规格，不考虑特殊病
+// 获取药品规格，不考虑特殊病
 func ReplacementDrugsT(orgid int64) (list []*models.ReplacementDrugs, err error) {
 	var lib []*models.BaseDrugLib
 	err = readDb.Model(&models.BaseDrugLib{}).Where("org_id = ?  AND status = 1 and drug_status not like '%停用%' ", orgid).Find(&lib).Error
@@ -1390,14 +1439,14 @@ func ReplacementDrugsT(orgid int64) (list []*models.ReplacementDrugs, err error)
 	return
 }
 
-//根据药品id获取药品名字
+// 根据药品id获取药品名字
 func IdToDrugName(id int64) (name string) {
 	var lib models.BaseDrugLib
 	readDb.Model(&models.BaseDrugLib{}).Where("id = ?", id).Find(&lib)
 	return lib.DrugName
 }
 
-//获取项目和耗材和套餐
+// 获取项目和耗材和套餐
 func ProjectConsumables3(orgid int64) (list []*models.DropDownList, err error) {
 
 	var project []*models.XtHisProject
@@ -1439,7 +1488,7 @@ func ProjectConsumables3(orgid int64) (list []*models.DropDownList, err error) {
 	return
 }
 
-//获取项目和耗材
+// 获取项目和耗材
 func ProjectConsumables2(orgid int64, special bool) (list []*models.DropDownList, err error) {
 
 	var project []*models.XtHisProject
@@ -1477,7 +1526,7 @@ func ProjectConsumables2(orgid int64, special bool) (list []*models.DropDownList
 	return
 }
 
-//获取项目和耗材不考虑特殊病
+// 获取项目和耗材不考虑特殊病
 func ProjectConsumables2T(orgid int64) (list []*models.DropDownList, err error) {
 
 	var project []*models.XtHisProject
@@ -1507,7 +1556,7 @@ func ProjectConsumables2T(orgid int64) (list []*models.DropDownList, err error)
 	return
 }
 
-//查询药品
+// 查询药品
 func FindPatientDrug(orgid, patient_id, drugid, mode int64) bool {
 	var total int
 	XTReadDB().Model(&models.HisPrescriptionAdviceTemplate{}).Where("user_org_id = ? and patient_id = ? and drug_id = ? and status = 1 and "+
@@ -1519,7 +1568,7 @@ func FindPatientDrug(orgid, patient_id, drugid, mode int64) bool {
 	return false
 }
 
-//查询项目
+// 查询项目
 func FindPatientXiang(orgid, patient_id, drugid, mode int64) bool {
 	var total int
 	XTReadDB().Model(&models.HisPrescriptionProjectTemplate{}).Where("user_org_id = ? and patient_id = ? and project_id = ? and status = 1 and type = 2 and "+
@@ -1531,7 +1580,7 @@ func FindPatientXiang(orgid, patient_id, drugid, mode int64) bool {
 	return false
 }
 
-//查询耗材
+// 查询耗材
 func FindPatientXiang2(orgid, patient_id, drugid, mode int64) bool {
 	var total int
 	XTReadDB().Model(&models.HisPrescriptionProjectTemplate{}).Where("user_org_id = ? and patient_id = ? and project_id = ? and status = 1 and type = 3 and "+
@@ -1543,7 +1592,7 @@ func FindPatientXiang2(orgid, patient_id, drugid, mode int64) bool {
 	return false
 }
 
-//types处方类型，1.药品 2.项目,model透析模式
+// types处方类型，1.药品 2.项目,model透析模式
 func GetHisInfoTempalteId(model, orgid, types int64) (tp []int64) {
 	type tmpid struct {
 		Id int64
@@ -1557,7 +1606,7 @@ func GetHisInfoTempalteId(model, orgid, types int64) (tp []int64) {
 	return
 }
 
-//替换药品处方模板
+// 替换药品处方模板
 func ReplaceDrugPrescriptionTemplate(orgid, patient_id, drugid int64, ids []int64, s models.HisPrescriptionAdviceTemplate, tx *gorm.DB) (err error) {
 	err = tx.Model(&models.HisPrescriptionAdviceTemplate{}).Where("user_org_id = ? and patient_id = ? and drug_id = ? and "+
 		"status = 1 and prescription_id in (?)", orgid, patient_id, drugid, ids).Updates(map[string]interface{}{
@@ -1577,7 +1626,7 @@ func ReplaceDrugPrescriptionTemplate(orgid, patient_id, drugid int64, ids []int6
 	return err
 }
 
-//替换项目模板
+// 替换项目模板
 func ReplaceProjectPrescriptionTemplate(orgid, patient_id, drugid int64, ids []int64, s models.HisPrescriptionProjectTemplate, tx *gorm.DB) (err error) {
 	err = tx.Model(&models.HisPrescriptionProjectTemplate{}).Where("user_org_id = ? and patient_id = ? and project_id = ? and "+
 		"status = 1 and prescription_id in (?)", orgid, patient_id, drugid, ids).Updates(map[string]interface{}{
@@ -1599,7 +1648,7 @@ func ReplaceProjectPrescriptionTemplate(orgid, patient_id, drugid int64, ids []i
 	return err
 }
 
-//删除项目模板
+// 删除项目模板
 func DeleteProjectTemplate(orgid, patient_id, drugid int64, ids []int64, tx *gorm.DB) (err error) {
 	err = tx.Model(&models.HisPrescriptionProjectTemplate{}).Where("user_org_id = ? and patient_id = ? and project_id = ? and "+
 		"prescription_id in (?)", orgid, patient_id, drugid, ids).Updates(map[string]interface{}{
@@ -1609,7 +1658,7 @@ func DeleteProjectTemplate(orgid, patient_id, drugid int64, ids []int64, tx *gor
 	return err
 }
 
-//删除处方模板
+// 删除处方模板
 func DeletePrescriptionTemplate(orgid, patient_id, drugid int64, ids []int64, tx *gorm.DB) (err error) {
 	err = tx.Model(&models.HisPrescriptionAdviceTemplate{}).Where("user_org_id = ? and patient_id = ? and drug_id = ? and "+
 		"prescription_id in (?)", orgid, patient_id, drugid, ids).Updates(map[string]interface{}{
@@ -1619,7 +1668,7 @@ func DeletePrescriptionTemplate(orgid, patient_id, drugid int64, ids []int64, tx
 	return err
 }
 
-//根据透析模式和患者id获取该患者的处方内容
+// 根据透析模式和患者id获取该患者的处方内容
 func PTemplateInformation(orgid, mode_id, patient_id int64) (tmp interface{}, err error) {
 	//获取处方id
 	var tt []*models.HisPrescriptionTemplate
@@ -1695,7 +1744,7 @@ func DeleteOne(types, id int64) (err error) {
 
 }
 
-//收尾工作
+// 收尾工作
 func Scavenger(orgid int64) (err error) {
 	//开事务
 	tx := XTWriteDB().Begin()
@@ -1764,7 +1813,7 @@ func Scavenger(orgid int64) (err error) {
 	return
 }
 
-//分区和收费(患者发药
+// 分区和收费(患者发药
 func PartitionAndLayout(stime, etime, orgid, shift, partition int64, flist []*models.TmpPatient) (tmp []*models.TmpPatient, err error) {
 	//获取排班
 	var sch []*models.XtScheduleTwo
@@ -1794,7 +1843,7 @@ func PartitionAndLayout(stime, etime, orgid, shift, partition int64, flist []*mo
 	return
 }
 
-//分区和收费(药品发药
+// 分区和收费(药品发药
 func PartitionAndLayoutDrug(deliveryway string, stime, etime, orgid, shift, partition int64, flist []*models.PatientInformation) (tmp []*models.PatientInformation, err error) {
 	//获取排班
 	var sch []*models.XtScheduleTwo
@@ -1833,7 +1882,7 @@ func PartitionAndLayoutDrug(deliveryway string, stime, etime, orgid, shift, part
 	return
 }
 
-//给药途径
+// 给药途径
 func Administration(deliveryway string, orgid int64, flist []*models.ListOfDrugs) (tmp []*models.ListOfDrugs, err error) {
 	//查询药品
 	var pp []*models.PharmacyBaseDrug
@@ -1860,7 +1909,7 @@ func Administration(deliveryway string, orgid int64, flist []*models.ListOfDrugs
 	return
 }
 
-//计算总量
+// 计算总量
 func CalculateTheTotalAmount(tmp []*models.PatientInformation, drug_id int64) (total string, err error) {
 	//获取药品信息
 	var t models.SpBaseDrug
@@ -1912,3 +1961,24 @@ func GetAllValidDeviceZones02(orgID int64) ([]*models.DeviceZone, error) {
 	}
 	return zones, nil
 }
+
+func FindeHisAdviceDocAdvice(orgid int64, patient_id int64, stime int64, etime int64) (advice []*models.HisDoctorAdviceInfo, err error) {
+
+	db := XTReadDB().Model(&advice).Where("status= 1")
+
+	if orgid > 0 {
+		db = db.Where("user_org_id = ?", orgid)
+	}
+	if patient_id > 0 {
+		db = db.Where("patient_id = ?", patient_id)
+	}
+	if stime > 0 {
+		db = db.Where("advice_date >=?", stime)
+	}
+	if etime > 0 {
+		db = db.Where("advice_date<=?", etime)
+	}
+	err = db.Find(&advice).Error
+
+	return advice, err
+}

service/print_data_service/schedule_dialysis/print_schedule_dialysis_models.go

@@ -104,6 +104,7 @@ type DialysisOrderVM struct {
 	WashpipeNurse  int64           `gorm:"column:washpipe_nurse" json:"washpipe_nurse" form:"washpipe_nurse"`
 	UserOrgId      int64           `gorm:"column:user_org_id" json:"user_org_id" form:"user_org_id"`
 	QualityNurseId int64           `gorm:"column:quality_nurse_id" json:"quality_nurse_id" form:"quality_nurse_id"`
+	Url            string          `gorm:"column:url" json:"url" form:"url"`
 }
 
 func (DialysisOrderVM) TableName() string {

service/print_data_service/schedule_dialysis/print_schedule_dialysis_service.go

@@ -479,3 +479,11 @@ func GetBatchSummerVM(orgid int64, patient_id int64, assessment_date int64) (*Su
 	err := p_service.XTReadDB().Where("user_org_id = ? and patient_id = ? and assessment_date =? and status = 1", orgid, patient_id, assessment_date).Find(&SummerVM).Error
 	return &SummerVM, err
 }
+
+func GetAdminUserEsTwo(orgid int64) (admin []*models.UserAdminRoles, err error) {
+	db := p_service.UserReadDB().Table("sgj_user_admin_role as x").Where("x.status =1")
+	table := p_service.UserReadDB().Table("sgj_user_admin_electronic_signature as s")
+	fmt.Println("table", table)
+	err = db.Select("x.id,x.admin_user_id,x.user_name,x.org_id,s.creator,s.url,s.hash").Joins("left join sgj_user_admin_electronic_signature as s on s.creator = x.admin_user_id").Where("x.org_id = ?", orgid).Scan(&admin).Error
+	return admin, err
+}

service/stock_service.go

@@ -8508,3 +8508,11 @@ func GetGoodOutOpenConfigOne(user_org_id int64) (models.XtGoodOutConfig, error)
 	err := XTReadDB().Where("user_org_id = ? and status = 1", user_org_id).Find(&config).Error
 	return config, err
 }
+
+func UpdateDeleteAutoGood(good_id int64, record_date int64, patient_id int64) error {
+
+	err := XTWriteDB().Model(&models.AutomaticReduceDetail{}).Where("good_id = ? and record_time = ? and patient_id = ?", good_id, record_date, patient_id).Updates(map[string]interface{}{"status": 1}).Error
+
+	err = XTWriteDB().Model(&models.DialysisBeforePrepare{}).Where("good_id = ? and record_date = ? and patient_id = ?", good_id, record_date, patient_id).Updates(map[string]interface{}{"status": 1}).Error
+	return err
+}

service/warhouse_service.go

@@ -1208,6 +1208,7 @@ func ConsumablesDeliveryTotal(orgID int64, patient_id int64, record_time int64,
 
 	//查询该患者当天已经出库的耗材信息
 	goods_yc, _ := FindConsumablesByDateTwo(orgID, patient_id, record_time)
+
 	// 和新请求的出库数据进行对比，分出那些是继续出库的，那些是需要删除出库的
 	for i := len(goods_yc) - 1; i >= 0; i-- {
 		goods_yc_temp := goods_yc[i]
@@ -1244,7 +1245,8 @@ func ConsumablesDeliveryTotal(orgID int64, patient_id int64, record_time int64,
 
 	// goods_yc 这个数据就是需要已经出库了，但是现在需要删除出库的耗材数据
 	// goods 这个数据就是需要出库的耗材的数据(新增的数据)
-
+	fmt.Println("len233333333333333w", len(goods_yc))
+	fmt.Println("需要出库的数据", len(goods))
 	if len(goods) > 0 {
 		out, err := FindStockOutByIsSys(orgID, 1, record_time)
 		houseConfig, _ := GetAllStoreHouseConfig(orgID)
@@ -1293,15 +1295,15 @@ func ConsumablesDeliveryTotal(orgID int64, patient_id int64, record_time int64,
 
 			var cha_count int64
 			var cha_count_two int64
+			//查询已经出库的数量
 			flowGood, _ := GetStockFlowIsBatchNumberTwo(patient_id, record_time, item.GoodId)
 			var out_count int64
 			for _, item := range flowGood {
 				out_count += item.Count
 			}
+			//已经出库的数量 减掉目前需要出库的数据
 			cha_count = item.Count - out_count
-			//fmt.Println("item.Count", item.Count)
-			//fmt.Println("item.Count", out_count)
-			//fmt.Println("cha_count2323223232323223", cha_count)
+
 			cha_count_two = out_count - item.Count
 
 			prepare := models.DialysisBeforePrepare{
@@ -1313,17 +1315,22 @@ func ConsumablesDeliveryTotal(orgID int64, patient_id int64, record_time int64,
 			}
 
 			ConsumablesGoodDelivery(orgID, patient_id, record_time, &prepare, &out, newCount)
+
 			//数量增加
 			if cha_count > 0 {
 				//出库数量累加
 				ModifyGoodSumCount(houseConfig.StorehouseOutInfo, cha_count, orgID, item.GoodId)
 			}
-			//数量减少
+
+			//已经出库的数据 大于 目前需要出库的数据
 			if cha_count_two > 0 {
+
 				ModifyAddGoodSumCount(houseConfig.StorehouseOutInfo, cha_count_two, orgID, item.GoodId)
 				//退库数量增加
 				UpdateSumAddCancelCount(orgID, item.GoodId, houseConfig.StorehouseOutInfo, cha_count_two)
 
+				//生成退库单
+
 			}
 			//更新剩余库存
 			goodListSix, _ := GetSumGoodList(orgID, houseConfig.StorehouseOutInfo, item.GoodId)
@@ -1826,6 +1833,7 @@ func ConsumablesDeliveryDelete(orgID int64, patient_id int64, record_time int64,
 		if errThree != nil {
 			return errThree
 		}
+		fmt.Println("errThreee23333333333333333333333", errThree)
 		//查询剩余库存
 		houseConfig, _ := GetAllStoreHouseConfig(orgID)
 		goodList, _ := GetAllGoodSumCount(good_yc.GoodId, orgID, houseConfig.StorehouseOutInfo)
@@ -1833,6 +1841,7 @@ func ConsumablesDeliveryDelete(orgID int64, patient_id int64, record_time int64,
 		for _, item := range goodList {
 			sum_count += item.StockCount
 		}
+		fmt.Println("sum_count++++++++++++++++++++++++++++++++=", sum_count)
 		// 判断当前出库的数据和删除出库数量
 		if good_yc.Count <= ware.Count {
 			delete_count = good_yc.Count
@@ -1902,6 +1911,103 @@ func ConsumablesDeliveryDelete(orgID int64, patient_id int64, record_time int64,
 		//退库数量相加
 		UpdateSumAddCancelCount(good_yc.UserOrgId, good_yc.GoodId, houseConfig.StorehouseOutInfo, delete_count)
 
+		operation_time := time.Now().Unix()
+		//创建退库单
+		timeStr := time.Now().Format("2006-01-02")
+		timeArr := strings.Split(timeStr, "-")
+		total, _ := FindAllCancelStockTotal(good_yc.UserOrgId)
+		total = total + 1
+		orderNumber := "CKTKD" + strconv.FormatInt(good_yc.UserOrgId, 10) + timeArr[0] + timeArr[1] + timeArr[2] + "000" + strconv.FormatInt(total, 10)
+
+		cancelStock := models.CancelStock{
+			OrderNumber:  orderNumber,
+			OperaTime:    operation_time,
+			OrgId:        good_yc.UserOrgId,
+			Creater:      warehouseOut.Creater,
+			Ctime:        time.Now().Unix(),
+			Status:       1,
+			ReturnTime:   record_time,
+			Type:         1,
+			StorehouseId: houseConfig.StorehouseOutInfo,
+			IsCheck:      1,
+		}
+		_, msgerrkonde := GetCancelStockDetailByOrderNumberOne(record_time, good_yc.UserOrgId)
+		if msgerrkonde == gorm.ErrRecordNotFound {
+			AddSigleCancelStock(&cancelStock)
+		}
+		cancel, _ := GetLastCancelStockById(good_yc.UserOrgId)
+
+		manufacturer, _ := GetManufactureById(ware.Manufacturer)
+		deaerler, _ := GetDealerById(ware.Dealer)
+
+		cancelStockInfo := models.CancelStockInfo{
+			GoodId:          ware.GoodId,
+			CancelStockId:   cancel.ID,
+			GoodTypeId:      ware.GoodTypeId,
+			Count:           delete_count,
+			Price:           ware.Price,
+			Total:           0,
+			ProductDate:     ware.ProductDate,
+			ExpiryDate:      ware.ExpiryDate,
+			Ctime:           time.Now().Unix(),
+			Status:          1,
+			OrgId:           good_yc.UserOrgId,
+			OrderNumber:     cancel.OrderNumber,
+			Type:            0,
+			Dealer:          deaerler.DealerName,
+			Manufacturer:    manufacturer.ManufacturerName,
+			Number:          ware.Number,
+			RegisterAccount: "",
+			Remark:          "",
+			WarehouseInfoId: ware.WarehouseInfotId,
+			PatientId:       ware.PatientId,
+			RecordDate:      record_time,
+			StorehouseId:    houseConfig.StorehouseOutInfo,
+			IsCheck:         1,
+		}
+
+		CreateCancelStockInfoOne(&cancelStockInfo)
+		cancelInfo, _ := GetLastCancelStockInfoByGoodId(ware.GoodId)
+		goodListOne, _ := GetSumGoodList(good_yc.UserOrgId, houseConfig.StorehouseOutInfo, good_yc.GoodId)
+		var over_count int64
+		for _, it := range goodListOne {
+			over_count += it.StockCount
+		}
+		flow := models.VmStockFlow{
+			WarehousingId:           ware.WarehouseInfotId,
+			GoodId:                  ware.GoodId,
+			Number:                  ware.Number,
+			LicenseNumber:           ware.LicenseNumber,
+			Count:                   ware.Count,
+			UserOrgId:               ware.OrgId,
+			PatientId:               ware.PatientId,
+			SystemTime:              record_time,
+			ConsumableType:          7,
+			IsSys:                   0,
+			WarehousingOrder:        "",
+			WarehouseOutId:          ware.WarehouseOutId,
+			WarehouseOutOrderNumber: ware.WarehouseOutOrderNumber,
+			IsEdit:                  0,
+			CancelStockId:           cancel.ID,
+			CancelOrderNumber:       cancel.OrderNumber,
+			Manufacturer:            manufacturer.ID,
+			Dealer:                  0,
+			Creator:                 warehouseOut.Creater,
+			UpdateCreator:           0,
+			Status:                  1,
+			Ctime:                   time.Now().Unix(),
+			Mtime:                   0,
+			Price:                   ware.Price,
+			WarehousingDetailId:     ware.WarehouseInfotId,
+			WarehouseOutDetailId:    ware.ID,
+			CancelOutDetailId:       cancelInfo.ID,
+			ProductDate:             ware.ProductDate,
+			ExpireDate:              ware.ExpiryDate,
+			StorehouseId:            houseConfig.StorehouseOutInfo,
+			OverCount:               over_count,
+		}
+		CreateStockFlowOne(flow)
+
 		// 增加了对应的库存后，看看还有多少需要退库的
 		good_yc.Count = good_yc.Count - delete_count
 		if good_yc.Count == 0 {
@@ -6044,6 +6150,18 @@ func ModifyReduceGoodSumCount(storehouse_id int64, count int64, user_org_id int6
 	return err
 }
 
+func ModifyReduceGoodSumCountTwenty(storehouse_id int64, count int64, user_org_id int64, good_id int64) error {
+	ut := XTWriteDB().Begin()
+
+	err = ut.Model(&models.XtGoodStockCount{}).Where("storehouse_id = ? and status = 1 and user_org_id  = ? and good_id =?", storehouse_id, user_org_id, good_id).UpdateColumn("stock_out_count", gorm.Expr("stock_out_count - ?", count)).Error
+	if err != nil {
+		ut.Rollback()
+		return err
+	}
+	ut.Commit()
+	return err
+}
+
 func ModifyAddGoodSumCount(storehouse_id int64, count int64, user_org_id int64, good_id int64) error {
 	ut := XTWriteDB().Begin()