11月9日库存管理

controllers/dialysis_api_controller.go

@@ -3910,9 +3910,11 @@ func (c *DialysisApiController) GetInitPrintData() {
 	record_date, _ := c.GetInt64("record_date")
 	orgId := c.GetAdminUserInfo().CurrentOrgId
 	list, err := service.GetInitPrintData(patient_id, record_date, orgId)
+	assessmentAfterDislysis, _ := service.GetLastWeightAfter(patient_id, record_date, orgId)
 	if err == nil {
 		c.ServeSuccessJSON(map[string]interface{}{
-			"list": list,
+			"list":                    list,
+			"assessmentAfterDislysis": assessmentAfterDislysis,
 		})
 		return
 

controllers/his_api_controller.go

@@ -965,6 +965,8 @@ func (c *HisApiController) CreateHisPrescription() {
 	adminInfo := c.GetAdminUserInfo()
 	recordDateTime := theTime.Unix()
 
+	//查询默认出库仓库库存
+	storeConfig, _ := service.GetAllStoreHouseConfig(adminInfo.CurrentOrgId)
 	role, _ := service.GetAdminUserInfoByID(adminInfo.CurrentOrgId, doctor_id)
 
 	if his_patient_id == 0 { //前端传过来的挂号id为0时，进行多一步判断
@@ -981,69 +983,6 @@ func (c *HisApiController) CreateHisPrescription() {
 
 	_, stockConfig := service.FindAutomaticReduceRecordByOrgId(c.GetAdminUserInfo().CurrentOrgId)
 
-	//已发药和已收费限制逻辑
-	isMidicine := false
-	isCharge := false
-	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["id"] == nil || reflect.TypeOf(items["id"]).String() != "float64" {
-					utils.ErrorLog("id")
-					c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
-					return
-				}
-				id := int64(items["id"].(float64))
-				if id > 0 {
-					new_prescription, err := service.GetPrescriptionById(id, adminInfo.CurrentOrgId)
-					if err != nil {
-						if new_prescription.OrderStatus == 2 {
-							isCharge = true
-						}
-					}
-				}
-
-				if items["advices"] != nil && reflect.TypeOf(items["advices"]).String() == "[]interface {}" {
-					advices := items["advices"].([]interface{})
-					fmt.Println("~~~~~~~~4")
-
-					if len(advices) > 0 {
-						for _, advice := range advices {
-							fmt.Println("~~~~~~~~3")
-
-							var adviceId int64
-							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))
-							}
-							if adviceId > 0 {
-								his_advice_info, err := service.GetHisDoctorAdviceInfo(adviceId)
-								fmt.Println("~~~~~~~~1")
-								fmt.Println("~~~~~~~~1")
-
-								if err == nil {
-									if his_advice_info.IsMedicine == 1 {
-										fmt.Println("~~~~~~~~2")
-										isMidicine = true
-									}
-								}
-							}
-						}
-					}
-				}
-			}
-		}
-	}
-	if isMidicine == true {
-		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeMedicineWrong)
-		return
-	}
-	if isCharge == true {
-		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeChargeWrong)
-		return
-	}
-	//已发药和已收费限制逻辑
-
 	if drugStockConfig.IsOpen == 1 {
 		//校验库存总量
 		if dataBody["prescriptions"] != nil && reflect.TypeOf(dataBody["prescriptions"]).String() == "[]interface {}" {
@@ -1081,8 +1020,7 @@ func (c *HisApiController) CreateHisPrescription() {
 									c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
 									return
 								}
-								//查询默认出库仓库库存
-								storeConfig, _ := service.GetAllStoreHouseConfig(adminInfo.CurrentOrgId)
+
 								//查询药品的所有库存
 								list, _ := service.GetDrugWarehouseInfoPrescriptionSeven(drug_id, adminInfo.CurrentOrgId, storeConfig.DrugStorehouseOut)
 
@@ -1095,14 +1033,14 @@ func (c *HisApiController) CreateHisPrescription() {
 								advicelist, _ := service.GetHisAdviceListByDrugIdEight(drug_id, patient_id, recordDateTime, adviceId)
 
 								//查询最新批次库存
-								//info, _ := service.FindLastDrugWarehousingInfoByID(drug_id, storeConfig.DrugStorehouseOut)
-								//var batch_number_count int64
-								//batch_number_count = info.StockMaxNumber*drug.MinNumber + info.StockMinNumber
-								//batch_number_counts := strconv.FormatInt(batch_number_count, 10)
+								info, _ := service.FindLastDrugWarehousingInfoByID(drug_id, storeConfig.DrugStorehouseOut)
+								var batch_number_count int64
+								batch_number_count = info.StockMaxNumber*drug.MinNumber + info.StockMinNumber
+								batch_number_counts := strconv.FormatInt(batch_number_count, 10)
 								//新增处方
 								if advicelist.ID == 0 {
 									all_count, _ := strconv.ParseFloat(totals, 64)
-									//batch_number_all_count, _ := strconv.ParseFloat(batch_number_counts, 64)
+									batch_number_all_count, _ := strconv.ParseFloat(batch_number_counts, 64)
 									if prescribingNumberUnit == drug.MinUnit {
 
 										if drug.IsUse != 1 {
@@ -1111,10 +1049,10 @@ func (c *HisApiController) CreateHisPrescription() {
 												return
 											}
 
-											//if prescribing_number > batch_number_all_count {
-											//	c.ServeDynamicFailJsonSend(drug.DrugName + "该批次剩余库存不足,剩余库存:" + strconv.FormatInt(info.StockMaxNumber, 10) + drug.MaxUnit + strconv.FormatInt(info.StockMinNumber, 10) + drug.MinUnit)
-											//	return
-											//}
+											if prescribing_number > batch_number_all_count {
+												c.ServeDynamicFailJsonSend(drug.DrugName + "该批次剩余库存不足,剩余库存:" + strconv.FormatInt(info.StockMaxNumber, 10) + drug.MaxUnit + strconv.FormatInt(info.StockMinNumber, 10) + drug.MinUnit)
+												return
+											}
 
 										}
 
@@ -1127,10 +1065,10 @@ func (c *HisApiController) CreateHisPrescription() {
 												return
 											}
 
-											//if num > batch_number_all_count {
-											//	c.ServeDynamicFailJsonSend(drug.DrugName + "该批次剩余库存不足,剩余库存:" + strconv.FormatInt(info.StockMaxNumber, 10) + drug.MaxUnit + strconv.FormatInt(info.StockMinNumber, 10) + drug.MinUnit)
-											//	return
-											//}
+											if num > batch_number_all_count {
+												c.ServeDynamicFailJsonSend(drug.DrugName + "该批次剩余库存不足,剩余库存:" + strconv.FormatInt(info.StockMaxNumber, 10) + drug.MaxUnit + strconv.FormatInt(info.StockMinNumber, 10) + drug.MinUnit)
+												return
+											}
 										}
 									}
 								}
@@ -1167,9 +1105,8 @@ func (c *HisApiController) CreateHisPrescription() {
 											c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
 											return
 										}
-										houseConfig, _ := service.GetAllStoreHouseConfig(adminInfo.CurrentOrgId)
 										//查询药品的所有库存
-										list, _ := service.GetDrugWarehouseInfoPrescriptionSeven(drug_id, adminInfo.CurrentOrgId, houseConfig.DrugStorehouseOut)
+										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
@@ -1181,27 +1118,27 @@ func (c *HisApiController) CreateHisPrescription() {
 										//新增处方
 										if advicelist.ID == 0 {
 											//查询最新批次库存
-											//info, _ := service.FindLastDrugWarehousingInfoByID(drug_id, storeConfig.DrugStorehouseOut)
-											//var batch_number_count int64
-											//batch_number_count = info.StockMaxNumber*drug.MinNumber + info.StockMinNumber
-											//batch_number_counts := strconv.FormatInt(batch_number_count, 10)
+											info, _ := service.FindLastDrugWarehousingInfoByID(drug_id, storeConfig.DrugStorehouseOut)
+											var batch_number_count int64
+											batch_number_count = info.StockMaxNumber*drug.MinNumber + info.StockMinNumber
+											batch_number_counts := strconv.FormatInt(batch_number_count, 10)
 											all_count, _ := strconv.ParseFloat(totals, 64)
 											if prescribingNumberUnit == drug.MinUnit {
-												//batch_number_all_count, _ := strconv.ParseFloat(batch_number_counts, 64)
+												batch_number_all_count, _ := strconv.ParseFloat(batch_number_counts, 64)
 												if drug.IsUse != 1 {
 													if prescribing_number > all_count {
 														c.ServeDynamicFailJsonSend(drug.DrugName + "库存不足")
 														return
 													}
-													//if prescribing_number > batch_number_all_count {
-													//	c.ServeDynamicFailJsonSend(drug.DrugName + "该批次剩余库存不足,剩余库存:" + strconv.FormatInt(info.StockMaxNumber, 10) + drug.MaxUnit + strconv.FormatInt(info.StockMinNumber, 10) + drug.MinUnit)
-													//	return
-													//}
+													if prescribing_number > batch_number_all_count {
+														c.ServeDynamicFailJsonSend(drug.DrugName + "该批次剩余库存不足,剩余库存:" + strconv.FormatInt(info.StockMaxNumber, 10) + drug.MaxUnit + strconv.FormatInt(info.StockMinNumber, 10) + drug.MinUnit)
+														return
+													}
 												}
 
 											} else {
 												if prescribingNumberUnit == drug.MaxUnit {
-													//batch_number_all_count, _ := strconv.ParseFloat(batch_number_counts, 64)
+													batch_number_all_count, _ := strconv.ParseFloat(batch_number_counts, 64)
 													num := prescribing_number * float64(drug.MinNumber)
 													if drug.IsUse != 1 {
 														if num > all_count {
@@ -1209,10 +1146,10 @@ func (c *HisApiController) CreateHisPrescription() {
 															return
 														}
 
-														//if prescribing_number > batch_number_all_count {
-														//	c.ServeDynamicFailJsonSend(drug.DrugName + "该批次剩余库存不足,剩余库存:" + strconv.FormatInt(info.StockMaxNumber, 10) + drug.MaxUnit + strconv.FormatInt(info.StockMinNumber, 10) + drug.MinUnit)
-														//	return
-														//}
+														if prescribing_number > batch_number_all_count {
+															c.ServeDynamicFailJsonSend(drug.DrugName + "该批次剩余库存不足,剩余库存:" + strconv.FormatInt(info.StockMaxNumber, 10) + drug.MaxUnit + strconv.FormatInt(info.StockMinNumber, 10) + drug.MinUnit)
+															return
+														}
 													}
 
 												}
@@ -1220,10 +1157,11 @@ func (c *HisApiController) CreateHisPrescription() {
 										}
 										//修改处方
 										if advicelist.ID > 0 {
+											fmt.Println("232323232323232332323o2323o23o23o23o3o")
 											//查询最新批次库存
-											//info, _ := service.FindLastDrugWarehousingInfoByID(drug_id, storeConfig.DrugStorehouseOut)
-											//var batch_number_count int64
-											//batch_number_count = info.StockMaxNumber*drug.MinNumber + info.StockMinNumber
+											info, _ := service.FindLastDrugWarehousingInfoByID(drug_id, storeConfig.DrugStorehouseOut)
+											var batch_number_count int64
+											batch_number_count = info.StockMaxNumber*drug.MinNumber + info.StockMinNumber
 
 											var device_number int64
 
@@ -1247,7 +1185,8 @@ func (c *HisApiController) CreateHisPrescription() {
 												prescribingNumberInt, _ := strconv.ParseInt(prescribingNumber, 10, 64)
 												number_count = prescribingNumberInt
 											}
-
+											fmt.Println("number-count23323232233223", number_count)
+											fmt.Println("device_number232323322323233223", device_number)
 											//如果修改的数量大于之前修改的数量
 											if (number_count - device_number) > 0 {
 												//如果修改的差数量 大于库存数量
@@ -1256,64 +1195,249 @@ func (c *HisApiController) CreateHisPrescription() {
 														c.ServeDynamicFailJsonSend(drug.DrugName + "库存不足")
 														return
 													}
-													//if (number_count - device_number) > batch_number_count {
-													//	c.ServeDynamicFailJsonSend(drug.DrugName + "该批次剩余库存不足,剩余库存:" + strconv.FormatInt(info.StockMaxNumber, 10) + drug.MaxUnit + strconv.FormatInt(info.StockMinNumber, 10) + drug.MinUnit)
-													//	return
-													//}
+													fmt.Println("(number_count - device_number3232323232332", number_count-device_number)
+													fmt.Println("(number_count - device_number3232323232332", batch_number_count)
+													if (number_count - device_number) > batch_number_count {
+														c.ServeDynamicFailJsonSend(drug.DrugName + "该批次剩余库存不足,剩余库存:" + strconv.FormatInt(info.StockMaxNumber, 10) + drug.MaxUnit + strconv.FormatInt(info.StockMinNumber, 10) + drug.MinUnit)
+														return
+													}
+
+													// 查询该药品最后一次出库记录
+													outInfo, _ := service.GetLastDrugWarehouseOutByDrugIdTwenty(drug_id, patient_id, recordDateTime, adviceId)
+													var out_count int64
+													var in_count int64
+													var stock_max_number int64
+													var stock_min_number int64
+													for _, it := range outInfo {
+														if it.CountUnit == drug.MaxUnit {
+															it.Count = it.Count * drug.MinNumber
+														}
+														out_count += it.Count
+														warehouseInfoList, _ := service.GetDrugWarehouseInfoById(it.WarehouseInfoId)
+														stock_max_number = warehouseInfoList.StockMaxNumber
+														stock_min_number = warehouseInfoList.StockMinNumber
+														if warehouseInfoList.MaxUnit == drug.MaxUnit {
+															in_count = warehouseInfoList.WarehousingCount * drug.MinNumber
+														}
+														if warehouseInfoList.MaxUnit == drug.MinUnit {
+															in_count = warehouseInfoList.WarehousingCount
+														}
+													}
+													if (out_count + (number_count - device_number)) > in_count {
+														c.ServeDynamicFailJsonSend(drug.DrugName + "该批次剩余库存不足,剩余库存:" + strconv.FormatInt(stock_max_number, 10) + drug.MaxUnit + strconv.FormatInt(stock_min_number, 10) + drug.MinUnit)
+														return
+													}
+
 												}
 
 											}
-											//没通过药房发药的才退库
-											if drug.IsPharmacy != 1 {
-												if device_number != number_count {
 
-													// 查询该药品最后一次出库记录
-													druginfo, _ := service.GetLastDrugWarehouseOutByDrugId(drug_id, patient_id, recordDateTime, adviceId)
+											if device_number != number_count {
+
+												// 查询该药品最后一次出库记录
+												druginfo, _ := service.GetLastDrugWarehouseOutByDrugId(drug_id, patient_id, recordDateTime, adviceId)
+
+												//回退库存
+												if druginfo.CountUnit == drug.MaxUnit && drug.MaxUnit != drug.MinUnit {
+
+													service.ModefyDrugByWarehouseInfo(druginfo.WarehouseInfoId, number_count)
+												}
+												if druginfo.CountUnit == drug.MinUnit && drug.MaxUnit != drug.MinUnit {
+													var stock_max_number int64
+													var stock_min_number int64
+
+													if number_count >= drug.MinNumber {
 
-													//回退库存
-													if druginfo.CountUnit == drug.MaxUnit && drug.MaxUnit != drug.MinUnit {
+														stock_max_number = device_number / drug.MinNumber
+														service.ModefyDrugByWarehouseInfo(druginfo.WarehouseInfoId, stock_max_number)
+														stock_min_number = device_number % drug.MinNumber
+														service.ModefyDrugByWarehouseInfoOne(druginfo.WarehouseInfoId, stock_min_number)
 
-														service.ModefyDrugByWarehouseInfo(druginfo.WarehouseInfoId, number_count)
+													} else {
+
+														service.ModefyDrugByWarehouseInfoOne(druginfo.WarehouseInfoId, device_number)
 													}
-													if druginfo.CountUnit == drug.MinUnit && drug.MaxUnit != drug.MinUnit {
-														var stock_max_number int64
-														var stock_min_number int64
+												}
+
+												if druginfo.CountUnit == drug.MaxUnit && druginfo.CountUnit == drug.MinUnit && drug.MaxUnit == drug.MinUnit {
+													service.ModefyDrugByWarehouseInfo(druginfo.WarehouseInfoId, device_number)
+												}
+												//删除记录
+												service.DeleteDrugAutoWarehouseSeven(drug_id, patient_id, recordDateTime, adviceId)
+
+												//查询默认仓库剩余多少库存
+												var sum_count int64
+												stockInfo, _ := service.GetDrugAllStockInfo(storeConfig.DrugStorehouseOut, druginfo.OrgId, drug_id)
+												for _, its := range stockInfo {
+													sum_count += its.StockMaxNumber*drug.MinNumber + its.StockMinNumber
+												}
+												service.UpdateBaseDrugSumTwo(drug_id, sum_count, druginfo.OrgId)
+
+											}
+										}
+									}
+								}
+
+								//保存处方开药
+								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 number_count >= drug.MinNumber {
+										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))
+										}
 
-															stock_max_number = device_number / drug.MinNumber
-															service.ModefyDrugByWarehouseInfo(druginfo.WarehouseInfoId, stock_max_number)
-															stock_min_number = device_number % drug.MinNumber
-															service.ModefyDrugByWarehouseInfoOne(druginfo.WarehouseInfoId, stock_min_number)
+										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)
 
-														} else {
+										//新增处方
+										if advicelist.ID == 0 {
+											//查询最新批次库存
+											info, _ := service.FindLastDrugWarehousingInfoByID(drug_id, storeConfig.DrugStorehouseOut)
+											var batch_number_count int64
+											batch_number_count = info.StockMaxNumber*drug.MinNumber + info.StockMinNumber
+											batch_number_counts := strconv.FormatInt(batch_number_count, 10)
+											all_count, _ := strconv.ParseFloat(totals, 64)
+											if prescribingNumberUnit == drug.MinUnit {
+												batch_number_all_count, _ := strconv.ParseFloat(batch_number_counts, 64)
+												if drug.IsUse != 1 {
+													if prescribing_number > all_count {
+														c.ServeDynamicFailJsonSend(drug.DrugName + "库存不足")
+														return
+													}
+													if prescribing_number > batch_number_all_count {
+														c.ServeDynamicFailJsonSend(drug.DrugName + "该批次剩余库存不足,剩余库存:" + strconv.FormatInt(info.StockMaxNumber, 10) + drug.MaxUnit + strconv.FormatInt(info.StockMinNumber, 10) + drug.MinUnit)
+														return
+													}
+												}
 
-															service.ModefyDrugByWarehouseInfoOne(druginfo.WarehouseInfoId, device_number)
+											} else {
+												if prescribingNumberUnit == drug.MaxUnit {
+													batch_number_all_count, _ := strconv.ParseFloat(batch_number_counts, 64)
+													num := prescribing_number * float64(drug.MinNumber)
+													if drug.IsUse != 1 {
+														if num > all_count {
+															c.ServeDynamicFailJsonSend(drug.DrugName + "库存不足")
+															return
+														}
+
+														if prescribing_number > batch_number_all_count {
+															c.ServeDynamicFailJsonSend(drug.DrugName + "该批次剩余库存不足,剩余库存:" + strconv.FormatInt(info.StockMaxNumber, 10) + drug.MaxUnit + strconv.FormatInt(info.StockMinNumber, 10) + drug.MinUnit)
+															return
 														}
 													}
 
-													if druginfo.CountUnit == drug.MaxUnit && druginfo.CountUnit == drug.MinUnit && drug.MaxUnit == drug.MinUnit {
-														service.ModefyDrugByWarehouseInfo(druginfo.WarehouseInfoId, device_number)
+												}
+											}
+										}
+										//修改处方
+										if advicelist.ID > 0 {
+											//查询最新批次库存
+											info, _ := service.FindLastDrugWarehousingInfoByID(drug_id, storeConfig.DrugStorehouseOut)
+											var batch_number_count int64
+											batch_number_count = info.StockMaxNumber*drug.MinNumber + info.StockMinNumber
+
+											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 (number_count - device_number) > batch_number_count {
+														c.ServeDynamicFailJsonSend(drug.DrugName + "该批次剩余库存不足,剩余库存:" + strconv.FormatInt(info.StockMaxNumber, 10) + drug.MaxUnit + strconv.FormatInt(info.StockMinNumber, 10) + drug.MinUnit)
+														return
+													}
+
+													//查询历史出库数据总批次
+													// 查询该药品最后一次出库记录
+													outInfo, _ := service.GetLastDrugWarehouseOutByDrugIdTwenty(drug_id, patient_id, recordDateTime, adviceId)
+													var out_count int64
+													var in_count int64
+													var stock_max_number int64
+													var stock_min_number int64
+													for _, it := range outInfo {
+														if it.CountUnit == drug.MaxUnit {
+															it.Count = it.Count * drug.MinNumber
+														}
+														out_count += it.Count
+														warehouseInfoList, _ := service.GetDrugWarehouseInfoById(it.WarehouseInfoId)
+														stock_max_number = warehouseInfoList.StockMaxNumber
+														stock_min_number = warehouseInfoList.StockMinNumber
+														if warehouseInfoList.MaxUnit == drug.MaxUnit {
+															in_count = warehouseInfoList.WarehousingCount * drug.MinNumber
+														}
+														if warehouseInfoList.MaxUnit == drug.MinUnit {
+															in_count = warehouseInfoList.WarehousingCount
+														}
 													}
-													//删除记录
-													service.DeleteDrugAutoWarehouseSeven(drug_id, patient_id, recordDateTime, adviceId)
-
-													//查询默认仓库
-													storeHouseConfig, _ := service.GetAllStoreHouseConfig(druginfo.OrgId)
-													//查询默认仓库剩余多少库存
-													var sum_count int64
-													stockInfo, _ := service.GetDrugAllStockInfo(storeHouseConfig.DrugStorehouseOut, druginfo.OrgId, drug_id)
-													for _, its := range stockInfo {
-														sum_count += its.StockMaxNumber*drug.MinNumber + its.StockMinNumber
+													//fmt.Println("out_count23323232233233223",out_count)
+													//fmt.Println("+(number_count - device_number)",(number_count - device_number))
+													//fmt.Println("in_count23322323222222",in_count)
+													if (out_count + (number_count - device_number)) > in_count {
+														c.ServeDynamicFailJsonSend(drug.DrugName + "该批次剩余库存不足,剩余库存:" + strconv.FormatInt(stock_max_number, 10) + drug.MaxUnit + strconv.FormatInt(stock_min_number, 10) + drug.MinUnit)
+														return
 													}
-													service.UpdateBaseDrugSumTwo(drug_id, sum_count, druginfo.OrgId)
 
 												}
 											}
-
 										}
 									}
 								}
+
 							}
 						}
 					}
@@ -1406,8 +1530,7 @@ func (c *HisApiController) CreateHisPrescription() {
 												service.ModefyWarehouseInfo(item.Count, item.WarehouseInfotId)
 
 												//查询默认仓库
-												storeHouseConfig, _ := service.GetAllStoreHouseConfig(item.OrgId)
-												stockList, _ := service.GetStockCountByGoodId(item.GoodId, storeHouseConfig.StorehouseOutInfo, item.OrgId)
+												stockList, _ := service.GetStockCountByGoodId(item.GoodId, storeConfig.StorehouseOutInfo, item.OrgId)
 												var total_count int64
 												for _, it := range stockList {
 													total_count += it.StockCount
@@ -1472,7 +1595,6 @@ func (c *HisApiController) CreateHisPrescription() {
 		defer redis.Close()
 	} else {
 		hpInfo = models.HisPrescriptionInfo{
-
 			ID:                 info.ID,
 			UserOrgId:          adminInfo.CurrentOrgId,
 			RecordDate:         info.RecordDate,
@@ -1510,8 +1632,6 @@ func (c *HisApiController) CreateHisPrescription() {
 	var adviceList []models.HisDoctorAdviceInfo
 	var projectList []models.HisPrescriptionProject
 
-	//var hisLis  []models.HisList
-
 	if dataBody["prescriptions"] != nil && reflect.TypeOf(dataBody["prescriptions"]).String() == "[]interface {}" {
 		prescriptions, _ := dataBody["prescriptions"].([]interface{})
 
@@ -1605,7 +1725,6 @@ func (c *HisApiController) CreateHisPrescription() {
 					tempPrescription.Modifier = adminInfo.AdminUser.Id
 					tempPrescription.Mtime = time.Now().Unix()
 					tempPrescription.Doctor = role.UserName
-
 					//tempPrescription.OrderStatus = order_status
 					tempPrescription.PreTime = pTime
 					tempPrescription.MedType = med_type
@@ -1789,15 +1908,6 @@ func (c *HisApiController) CreateHisPrescription() {
 
 							service.SaveHisProjectTwo(&p)
 
-							//if p.Type == 3 { //处理透前准备耗材数量数据
-							//	consumables, _ := service.FindHisConsumablesByID(adminInfo.CurrentOrgId, patient_id, recordDateTime, p.ProjectId)
-							//	if consumables.ID > 0 {
-							//		cnt, _ := strconv.ParseInt(p.Count, 10, 64)
-							//		consumables.Count = cnt
-							//		service.UpdateConsumables(&consumables)
-							//	}
-							//}
-
 						}
 					}
 				}
@@ -1841,18 +1951,17 @@ func (c *HisApiController) CreateHisPrescription() {
 
 		//查询今日该患者开的药品处方
 		hisdoctorlist, _ := service.GetHisAdviceListByDrugIdTwo(patient_id, recordDateTime, adminInfo.CurrentOrgId)
-		storeHouseConfig, _ := service.GetAllStoreHouseConfig(adminInfo.CurrentOrgId)
 		drugOutConfig, _ := service.GetDrugOpenConfigOne(adminInfo.CurrentOrgId)
 		if drugOutConfig.IsOpen == 1 {
 			for _, item := range hisdoctorlist {
 				drug, _ := service.FindBaseDrugLibRecordSeven(adminInfo.CurrentOrgId, item.DrugId)
-
 				// 查询该药品最后一次出库记录
 				druginfo, _ := service.GetLastDrugWarehouseOutByDrugIdTwenty(item.DrugId, patient_id, recordDateTime, item.ID)
 
 				if len(druginfo) > 0 {
 					//回退库存
 					for _, it := range druginfo {
+
 						if it.CountUnit == drug.MaxUnit && drug.MaxUnit != drug.MinUnit {
 							service.ModifyDrugWarehouseInfoStockMaxNumber(it.Count, it.DrugId, it.OrgId, it.WarehouseInfoId)
 						}
@@ -1876,7 +1985,7 @@ func (c *HisApiController) CreateHisPrescription() {
 					}
 
 					//更新字典里面的库存
-					stockInfo, _ := service.GetDrugAllStockInfo(storeHouseConfig.DrugStorehouseOut, item.UserOrgId, item.DrugId)
+					stockInfo, _ := service.GetDrugAllStockInfo(storeConfig.DrugStorehouseOut, item.UserOrgId, item.DrugId)
 					var sum_count int64
 					for _, its := range stockInfo {
 						sum_count += its.StockMaxNumber*drug.MinNumber + its.StockMinNumber
@@ -2190,47 +2299,6 @@ func (c *HisApiController) DeletePrescription() {
 
 	_, stockConfig := service.FindAutomaticReduceRecordByOrgId(c.GetAdminUserInfo().CurrentOrgId)
 
-	//已收费和已发药限制逻辑
-	isCharge := false
-	isMedicine := false
-	new_prescription, p_err := service.GetPrescriptionById(prescription_id, c.GetAdminUserInfo().CurrentOrgId)
-	new_prescriptions, _ := service.GetHisPrescription(c.GetAdminUserInfo().CurrentOrgId, new_prescription.PatientId, new_prescription.RecordDate, new_prescription.PType)
-
-	for _, item := range new_prescriptions {
-		if item.IsMedicine == 1 {
-			isMedicine = true
-		}
-	}
-
-	for _, item := range new_prescriptions {
-		if item.OrderStatus == 2 {
-			isCharge = true
-		}
-	}
-
-	if p_err != nil {
-		if new_prescription.ID > 0 {
-			if new_prescription.OrderStatus == 2 {
-				isCharge = true
-			}
-		}
-	}
-	for _, item := range advices {
-		if item.IsMedicine == 1 {
-			isMedicine = true
-		}
-	}
-	if isCharge {
-		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDeletePChargeWrong)
-		return
-	}
-
-	if isMedicine {
-		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDeletePMedicineWrong)
-		return
-	}
-	//已收费和已发药限制逻辑
-
 	if len(projects) > 0 {
 		for _, item := range projects {
 			service.DeletePrintInfo(item.ID) //删除打印信息
@@ -2459,63 +2527,13 @@ func (c *HisApiController) DeletePrescription() {
 	return
 
 }
+
 func (c *HisApiController) DeleteDoctorAdvice() {
 	id, _ := c.GetInt64("id")
 	advice, _ := service.GetHisDoctorAdvicesById(id)
 
 	_, drugStockConfig := service.FindDrugStockAutomaticReduceRecordByOrgId(c.GetAdminUserInfo().CurrentOrgId)
 
-	//已收费和已发药的限制逻辑
-	isCharge := false
-	isMedicine := false
-	new_prescription, _ := service.GetPrescriptionById(advice.PrescriptionId, c.GetAdminUserInfo().CurrentOrgId)
-
-	//获取今天该患者所有处方，判断是否发药或者收费
-	new_prescriptions, _ := service.GetHisPrescription(c.GetAdminUserInfo().CurrentOrgId, new_prescription.PatientId, new_prescription.RecordDate, new_prescription.PType)
-	for _, item := range new_prescriptions {
-		if item.IsMedicine == 1 {
-			isMedicine = true
-		}
-	}
-	for _, item := range new_prescriptions {
-		if item.OrderStatus == 2 {
-			isCharge = true
-		}
-	}
-
-	if isMedicine {
-		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDeletePMedicineWrong)
-		return
-	}
-
-	if isCharge {
-		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDeletePChargeWrong)
-		return
-	}
-
-	advices, _ := service.GetHisPrescriptionAdviceByID(advice.PrescriptionId)
-	for _, item := range advices {
-		if item.IsMedicine == 1 {
-			isMedicine = true
-		}
-	}
-
-	if isMedicine {
-		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDeleteMedicineWrong)
-		return
-	}
-	if new_prescription.ID > 0 {
-		if new_prescription.OrderStatus == 2 {
-			isCharge = true
-		}
-	}
-
-	if isCharge {
-		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDeletePChargeWrongTwo)
-		return
-	}
-	//已收费和已发药的限制逻辑
-
 	err := service.DelelteDoctorAdvice(id, c.GetAdminUserInfo().CurrentOrgId)
 	redis := service.RedisClient()
 	keyFive := strconv.FormatInt(advice.UserOrgId, 10) + ":" + strconv.FormatInt(advice.AdviceDate, 10) + ":his_advices_list_all"
@@ -2555,6 +2573,7 @@ func (c *HisApiController) DeleteDoctorAdvice() {
 		return
 	}
 }
+
 func (c *HisApiController) DeleteProject() {
 	id, _ := c.GetInt64("id")
 	adminInfo := c.GetAdminUserInfo()
@@ -2562,40 +2581,6 @@ func (c *HisApiController) DeleteProject() {
 	//	var consumable models.DialysisBeforePrepare
 	_, stockConfig := service.FindAutomaticReduceRecordByOrgId(c.GetAdminUserInfo().CurrentOrgId)
 
-	isCharge := false
-	isMedicine := false
-	new_prescription, _ := service.GetPrescriptionById(project.PrescriptionId, c.GetAdminUserInfo().CurrentOrgId)
-	new_prescriptions, _ := service.GetHisPrescription(c.GetAdminUserInfo().CurrentOrgId, new_prescription.PatientId, new_prescription.RecordDate, new_prescription.PType)
-	for _, item := range new_prescriptions {
-		if item.IsMedicine == 1 {
-			isMedicine = true
-		}
-	}
-	for _, item := range new_prescriptions {
-		if item.OrderStatus == 2 {
-			isCharge = true
-		}
-	}
-	if isMedicine {
-		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDeletePMedicineWrong)
-		return
-	}
-	if isCharge {
-		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDeletePChargeWrong)
-		return
-	}
-
-	if new_prescription.ID > 0 {
-		if new_prescription.OrderStatus == 2 {
-			isCharge = true
-		}
-	}
-
-	if isCharge {
-		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDeletePChargeWrongTwo)
-		return
-	}
-
 	service.DeletePrintInfo(id)
 	label, _ := service.GetProjectById(adminInfo.CurrentOrgId, id, project.RecordDate, project.PatientId)
 	label.Status = 0
@@ -3508,7 +3493,7 @@ func (c *HisApiController) setAdviceWithJSON(advice *models.HisDoctorAdviceInfo,
 					advice.CheckState = hisAdvice.CheckState
 					advice.StartTime = hisAdvice.StartTime
 					advice.HospApprFlag = hisAdvice.HospApprFlag
-					advice.IsMedicine = hisAdvice.IsMedicine
+
 					if hisAdvice.UserOrgId == 10028 {
 						if hisAdvice.DeliveryWay != advice.DeliveryWay || hisAdvice.ExecutionFrequency != advice.ExecutionFrequency || hisAdvice.Day != advice.Day || hisAdvice.PrescribingNumber != advice.PrescribingNumber || hisAdvice.Price != advice.Price || hisAdvice.Remark != advice.Remark || hisAdvice.PrescribingNumberUnit != advice.PrescribingNumberUnit {
 							advice.ExecutionTime = 0
@@ -6238,7 +6223,7 @@ func (c *HisApiController) GetFaPiaoData() {
 				operationCostPartSelfTotal, _ = decimal.NewFromFloat(operationCostPartSelfTotal).Add(decimal.NewFromFloat(item.PreselfpayAmt)).Float64()
 			}
 
-			if item.MedChrgitmType == "08" || item.MedChrgitmType == "1401" { //材料费
+			if item.MedChrgitmType == "08" { //材料费
 				materialCostTotal, _ = decimal.NewFromFloat(materialCostTotal).Add(decimal.NewFromFloat(item.DetItemFeeSumamt)).Float64()
 				materialCostSelfTotal, _ = decimal.NewFromFloat(materialCostSelfTotal).Add(decimal.NewFromFloat(item.OverlmtAmt)).Float64()
 				materialCostPartSelfTotal, _ = decimal.NewFromFloat(materialCostPartSelfTotal).Add(decimal.NewFromFloat(item.PreselfpayAmt)).Float64()

service/gobal_config_service.go

@@ -18,12 +18,12 @@ func CreateDrugAutomaticReduceRecord(config *models.DrugStockConfig) (err error)
 }
 
 func FindAutomaticReduceRecordByOrgId(org_id int64) (err error, config models.GobalConfig) {
-	err = readDb.Model(&models.GobalConfig{}).Where("status = 1 AND org_id = ?", org_id).Find(&config).Error
+	err = readDb.Model(&models.GobalConfig{}).Where("status = 1 AND org_id = ?", org_id).First(&config).Error
 	return
 }
 
 func FindDrugStockAutomaticReduceRecordByOrgId(org_id int64) (err error, config models.DrugStockConfig) {
-	err = readDb.Model(&models.DrugStockConfig{}).Where("status = 1 AND org_id = ?", org_id).Find(&config).Error
+	err = readDb.Model(&models.DrugStockConfig{}).Where("status = 1 AND org_id = ?", org_id).First(&config).Error
 	return
 }
 func UpdateAutomaticReduceRecord(config *models.GobalConfig) (err error) {

service/mobile_dialysis_service.go

@@ -1334,7 +1334,7 @@ type MDoctorAdviceVM struct {
 	WeekDay               string  `gorm:"column:week_day" json:"week_day"`
 	TemplateId            string  `gorm:"column:template_id" json:"template_id"`
 	Modifier              int64   `gorm:"column:modifier" json:"modifier" form:"modifier"`
-	IsMedicine			  int64	  `gorm:"column:is_medicine" json:"is_medicine" form:"is_medicine"`
+	IsMedicine            int64   `gorm:"column:is_medicine" json:"is_medicine" form:"is_medicine"`
 }
 
 func (MDoctorAdviceVM) TableName() string {
@@ -2825,6 +2825,20 @@ func PCGetDialysisGoods(orgID int64, scheduleDate int64, schedule_type int64, pa
 	if len(keywords) != 0 {
 		keywords = "%" + keywords + "%"
 		db = db.Joins("JOIN xt_patients AS patient ON patient.id=xt_schedule.patient_id AND patient.status = 1 AND patient.user_org_id = ? AND patient.name Like ?", orgID, keywords)
+		if schedule_type != 0 {
+			db = db.Where("schedule_type = ?", schedule_type)
+		}
+		if partition_id != 0 {
+			db = db.Where("partition_id = ?", partition_id)
+		}
+		if good_type == 1 {
+			db = db.Where("patient_id in(?)", ids)
+		}
+		if good_type == 2 {
+			if len(ids) > 0 {
+				db = db.Where("patient_id not in(?)", ids)
+			}
+		}
 	} else {
 		if schedule_type != 0 {
 			db = db.Where("schedule_type = ?", schedule_type)
@@ -2836,7 +2850,9 @@ func PCGetDialysisGoods(orgID int64, scheduleDate int64, schedule_type int64, pa
 			db = db.Where("patient_id in(?)", ids)
 		}
 		if good_type == 2 {
-			db = db.Where("patient_id not in(?)", ids)
+			if len(ids) > 0 {
+				db = db.Where("patient_id not in(?)", ids)
+			}
 		}
 		db = db.Count(&total)
 		offset := (page - 1) * limit
@@ -3698,11 +3714,13 @@ func GetHisPrescriptionProject(org_id int64, patient_id int64, record_date int64
 
 func GetPCHisPrescriptionProject(orgID int64, scheduleDate int64, deliverWay string, patientType int, adminUserId int64, patient_id int64, execution_state int64) ([]*HisMScheduleProjectVM, error) {
 	var vms []*HisMScheduleProjectVM
-
+	fmt.Println("patient_id233232332", patient_id)
+	fmt.Println("execution_state2323323322332", execution_state)
+	fmt.Println("patientType2323323322332", patientType)
 	if patientType == 0 {
 
 		if patient_id > 0 {
-			if execution_state > 0 {
+			if execution_state == 1 {
 				db := readDb.
 					Table("xt_schedule").
 					Preload("SchedualPatient", "status = 1 AND user_org_id = ?", orgID).
@@ -3716,13 +3734,33 @@ func GetPCHisPrescriptionProject(orgID int64, scheduleDate int64, deliverWay str
 						return db.Where("status = 1 AND user_org_id = ? AND record_date = ? AND team_id = 0 and execution_state = ?", orgID, scheduleDate, execution_state).Preload("HisProject").Preload("GoodInfo", "status=1")
 					}).
 					Preload("HisPrescriptionTeamProject", func(db *gorm.DB) *gorm.DB {
-						return db.Where("status = 1 AND user_org_id = ? AND record_date = ? AND team_id > 0", orgID, scheduleDate).Preload("XtHisProjectTeam", "status = 1").Preload("HisProject").Preload("GoodInfo", "status=1")
+						return db.Where("status = 1 AND user_org_id = ? AND record_date = ? AND team_id > 0 and execution_state = ?", orgID, scheduleDate, execution_state).Preload("XtHisProjectTeam", "status = 1").Preload("HisProject").Preload("GoodInfo", "status=1")
 					}).Where("status = 1 AND user_org_id = ?", orgID)
 				if scheduleDate != 0 {
 					db = db.Where("schedule_date = ?", scheduleDate)
 				}
 				err = db.Find(&vms).Error
-			} else {
+			} else if execution_state == 2 {
+				db := readDb.
+					Table("xt_schedule").
+					Preload("SchedualPatient", "status = 1 AND user_org_id = ?", orgID).
+					Preload("DialysisOrder", func(db *gorm.DB) *gorm.DB {
+						return db.Where("status = 1 AND user_org_id = ? and patient_id = ?", orgID, patient_id).Preload("DeviceNumber", "status = 1 AND org_id= ?", orgID)
+					}).
+					Preload("DeviceNumber", "status = 1 AND org_id = ?", orgID).
+					Preload("DeviceNumber.Zone", "status = 1 AND org_id = ?", orgID).
+					Preload("Prescription", "status = 1 AND user_org_id = ? AND record_date = ? and patient_id = ?", orgID, scheduleDate, patient_id).
+					Preload("HisPrescriptionProject", func(db *gorm.DB) *gorm.DB {
+						return db.Where("status = 1 AND user_org_id = ? AND record_date = ? AND team_id = 0 and execution_state = 0", orgID, scheduleDate).Preload("HisProject").Preload("GoodInfo", "status=1")
+					}).
+					Preload("HisPrescriptionTeamProject", func(db *gorm.DB) *gorm.DB {
+						return db.Where("status = 1 AND user_org_id = ? AND record_date = ? AND team_id > 0 and execution_state = 0", orgID, scheduleDate).Preload("XtHisProjectTeam", "status = 1").Preload("HisProject").Preload("GoodInfo", "status=1")
+					}).Where("status = 1 AND user_org_id = ?", orgID)
+				if scheduleDate != 0 {
+					db = db.Where("schedule_date = ?", scheduleDate)
+				}
+				err = db.Find(&vms).Error
+			} else if execution_state == 0 {
 				db := readDb.
 					Table("xt_schedule").
 					Preload("SchedualPatient", "status = 1 AND user_org_id = ?", orgID).
@@ -3746,7 +3784,7 @@ func GetPCHisPrescriptionProject(orgID int64, scheduleDate int64, deliverWay str
 
 		} else {
 			if patient_id > 0 {
-				if execution_state > 0 {
+				if execution_state == 1 {
 					db := readDb.
 						Table("xt_schedule").
 						Preload("SchedualPatient", "status = 1 AND user_org_id = ? and id= ?", orgID, patient_id).
@@ -3760,13 +3798,33 @@ func GetPCHisPrescriptionProject(orgID int64, scheduleDate int64, deliverWay str
 							return db.Where("status = 1 AND user_org_id = ? AND record_date = ? AND team_id = 0 and execution_state = ?", orgID, scheduleDate, execution_state).Preload("HisProject").Preload("GoodInfo", "status=1")
 						}).
 						Preload("HisPrescriptionTeamProject", func(db *gorm.DB) *gorm.DB {
-							return db.Where("status = 1 AND user_org_id = ? AND record_date = ? AND team_id > 0", orgID, scheduleDate).Preload("XtHisProjectTeam", "status = 1").Preload("HisProject").Preload("GoodInfo", "status=1")
+							return db.Where("status = 1 AND user_org_id = ? AND record_date = ? AND team_id > 0 and execution_state = ?", orgID, scheduleDate, execution_state).Preload("XtHisProjectTeam", "status = 1").Preload("HisProject").Preload("GoodInfo", "status=1")
 						}).Where("status = 1 AND user_org_id = ?", orgID)
 					if scheduleDate != 0 {
 						db = db.Where("schedule_date = ?", scheduleDate)
 					}
 					err = db.Find(&vms).Error
-				} else {
+				} else if execution_state == 2 {
+					db := readDb.
+						Table("xt_schedule").
+						Preload("SchedualPatient", "status = 1 AND user_org_id = ? and id= ?", orgID, patient_id).
+						Preload("DialysisOrder", func(db *gorm.DB) *gorm.DB {
+							return db.Where("status = 1 AND user_org_id = ? and patient_id = ?", orgID, patient_id).Preload("DeviceNumber", "status = 1 AND org_id= ?", orgID)
+						}).
+						Preload("DeviceNumber", "status = 1 AND org_id = ?", orgID).
+						Preload("DeviceNumber.Zone", "status = 1 AND org_id = ?", orgID).
+						Preload("Prescription", "status = 1 AND user_org_id = ? AND record_date = ? and patient_id = ?", orgID, scheduleDate, patient_id).
+						Preload("HisPrescriptionProject", func(db *gorm.DB) *gorm.DB {
+							return db.Where("status = 1 AND user_org_id = ? AND record_date = ? AND team_id = 0 and execution_state = 0", orgID, scheduleDate).Preload("HisProject").Preload("GoodInfo", "status=1")
+						}).
+						Preload("HisPrescriptionTeamProject", func(db *gorm.DB) *gorm.DB {
+							return db.Where("status = 1 AND user_org_id = ? AND record_date = ? AND team_id > 0 and execution_state = 0", orgID, scheduleDate).Preload("XtHisProjectTeam", "status = 1").Preload("HisProject").Preload("GoodInfo", "status=1")
+						}).Where("status = 1 AND user_org_id = ?", orgID)
+					if scheduleDate != 0 {
+						db = db.Where("schedule_date = ?", scheduleDate)
+					}
+					err = db.Find(&vms).Error
+				} else if execution_state == 0 {
 					db := readDb.
 						Table("xt_schedule").
 						Preload("SchedualPatient", "status = 1 AND user_org_id = ? and id= ?", orgID, patient_id).
@@ -3789,7 +3847,7 @@ func GetPCHisPrescriptionProject(orgID int64, scheduleDate int64, deliverWay str
 				}
 
 			} else {
-				if execution_state > 0 {
+				if execution_state == 1 {
 					db := readDb.
 						Table("xt_schedule").
 						Preload("SchedualPatient", "status = 1 AND user_org_id = ?", orgID).
@@ -3803,13 +3861,34 @@ func GetPCHisPrescriptionProject(orgID int64, scheduleDate int64, deliverWay str
 							return db.Where("status = 1 AND user_org_id = ? AND record_date = ? AND team_id = 0 and execution_state = ?", orgID, scheduleDate, execution_state).Preload("HisProject").Preload("GoodInfo", "status=1")
 						}).
 						Preload("HisPrescriptionTeamProject", func(db *gorm.DB) *gorm.DB {
-							return db.Where("status = 1 AND user_org_id = ? AND record_date = ? AND team_id > 0", orgID, scheduleDate).Preload("XtHisProjectTeam", "status = 1").Preload("HisProject").Preload("GoodInfo", "status=1")
+							return db.Where("status = 1 AND user_org_id = ? AND record_date = ? AND team_id > 0 and execution_state = ?", orgID, scheduleDate, execution_state).Preload("XtHisProjectTeam", "status = 1").Preload("HisProject").Preload("GoodInfo", "status=1")
 						}).Where("status = 1 AND user_org_id = ?", orgID)
 					if scheduleDate != 0 {
 						db = db.Where("schedule_date = ?", scheduleDate)
 					}
 					err = db.Find(&vms).Error
-				} else {
+				} else if execution_state == 2 {
+					fmt.Println("j氯332n323232n323ℹ️33232323232")
+					db := readDb.
+						Table("xt_schedule").
+						Preload("SchedualPatient", "status = 1 AND user_org_id = ?", orgID).
+						Preload("DialysisOrder", func(db *gorm.DB) *gorm.DB {
+							return db.Where("status = 1 AND user_org_id = ?", orgID).Preload("DeviceNumber", "status = 1 AND org_id= ?", orgID)
+						}).
+						Preload("DeviceNumber", "status = 1 AND org_id = ?", orgID).
+						Preload("DeviceNumber.Zone", "status = 1 AND org_id = ?", orgID).
+						Preload("Prescription", "status = 1 AND user_org_id = ? AND record_date = ?", orgID, scheduleDate).
+						Preload("HisPrescriptionProject", func(db *gorm.DB) *gorm.DB {
+							return db.Where("status = 1 AND user_org_id = ? AND record_date = ? AND team_id = 0  and execution_state =0 ", orgID, scheduleDate).Preload("HisProject").Preload("GoodInfo", "status=1")
+						}).
+						Preload("HisPrescriptionTeamProject", func(db *gorm.DB) *gorm.DB {
+							return db.Where("status = 1 AND user_org_id = ? AND record_date = ? AND team_id > 0 and execution_state =0 ", orgID, scheduleDate).Preload("XtHisProjectTeam", "status = 1").Preload("HisProject").Preload("GoodInfo", "status=1")
+						}).Where("status = 1 AND user_org_id = ?", orgID)
+					if scheduleDate != 0 {
+						db = db.Where("schedule_date = ?", scheduleDate)
+					}
+					err = db.Find(&vms).Error
+				} else if execution_state == 0 {
 					db := readDb.
 						Table("xt_schedule").
 						Preload("SchedualPatient", "status = 1 AND user_org_id = ?", orgID).
@@ -3837,26 +3916,71 @@ func GetPCHisPrescriptionProject(orgID int64, scheduleDate int64, deliverWay str
 	}
 
 	if patientType > 0 {
-		db := readDb.
-			Table("xt_schedule").
-			Preload("SchedualPatient", "status = 1 AND user_org_id = ?", orgID).
-			Preload("DialysisOrder", func(db *gorm.DB) *gorm.DB {
-				return db.Where("status = 1 AND user_org_id = ?", orgID).Preload("DeviceNumber", "status = 1 AND org_id= ?", orgID)
-			}).
-			Preload("DeviceNumber", "status = 1 AND org_id = ?", orgID).
-			Preload("DeviceNumber.Zone", "status = 1 AND org_id = ?", orgID).
-			Preload("Prescription", "status = 1 AND user_org_id = ? AND record_date = ?", orgID, scheduleDate).
-			Preload("HisDoctorAdviceInfo", "status = 1 AND user_org_id = ? AND advice_date = ? and  (advice_doctor = ? or execution_staff = ?) ", orgID, scheduleDate, adminUserId, adminUserId).
-			Preload("HisPrescriptionProject", func(db *gorm.DB) *gorm.DB {
-				return db.Where("status = 1 AND user_org_id = ? AND record_date = ? AND team_id = 0", orgID, scheduleDate).Preload("HisProject").Preload("GoodInfo", "status=1")
-			}).
-			Preload("HisPrescriptionTeamProject", func(db *gorm.DB) *gorm.DB {
-				return db.Where("status = 1 AND user_org_id = ? AND record_date = ? AND team_id > 0", orgID, scheduleDate).Preload("XtHisProjectTeam", "status = 1").Preload("HisProject").Preload("GoodInfo", "status=1")
-			}).Where("status = 1 AND user_org_id = ?", orgID)
-		if scheduleDate != 0 {
-			db = db.Where("schedule_date = ?", scheduleDate)
+		if execution_state == 1 {
+			db := readDb.
+				Table("xt_schedule").
+				Preload("SchedualPatient", "status = 1 AND user_org_id = ?", orgID).
+				Preload("DialysisOrder", func(db *gorm.DB) *gorm.DB {
+					return db.Where("status = 1 AND user_org_id = ?", orgID).Preload("DeviceNumber", "status = 1 AND org_id= ?", orgID)
+				}).
+				Preload("DeviceNumber", "status = 1 AND org_id = ?", orgID).
+				Preload("DeviceNumber.Zone", "status = 1 AND org_id = ?", orgID).
+				Preload("Prescription", "status = 1 AND user_org_id = ? AND record_date = ?", orgID, scheduleDate).
+				Preload("HisDoctorAdviceInfo", "status = 1 AND user_org_id = ? AND advice_date = ? and  (advice_doctor = ? or execution_staff = ?) ", orgID, scheduleDate, adminUserId, adminUserId).
+				Preload("HisPrescriptionProject", func(db *gorm.DB) *gorm.DB {
+					return db.Where("status = 1 AND user_org_id = ? AND record_date = ? AND team_id = 0 and execution_state = 1", orgID, scheduleDate).Preload("HisProject").Preload("GoodInfo", "status=1")
+				}).
+				Preload("HisPrescriptionTeamProject", func(db *gorm.DB) *gorm.DB {
+					return db.Where("status = 1 AND user_org_id = ? AND record_date = ? AND team_id > 0", orgID, scheduleDate).Preload("XtHisProjectTeam", "status = 1").Preload("HisProject").Preload("GoodInfo", "status=1")
+				}).Where("status = 1 AND user_org_id = ?", orgID)
+			if scheduleDate != 0 {
+				db = db.Where("schedule_date = ?", scheduleDate)
+			}
+			err = db.Find(&vms).Error
+		} else if execution_state == 2 {
+			db := readDb.
+				Table("xt_schedule").
+				Preload("SchedualPatient", "status = 1 AND user_org_id = ?", orgID).
+				Preload("DialysisOrder", func(db *gorm.DB) *gorm.DB {
+					return db.Where("status = 1 AND user_org_id = ?", orgID).Preload("DeviceNumber", "status = 1 AND org_id= ?", orgID)
+				}).
+				Preload("DeviceNumber", "status = 1 AND org_id = ?", orgID).
+				Preload("DeviceNumber.Zone", "status = 1 AND org_id = ?", orgID).
+				Preload("Prescription", "status = 1 AND user_org_id = ? AND record_date = ?", orgID, scheduleDate).
+				Preload("HisDoctorAdviceInfo", "status = 1 AND user_org_id = ? AND advice_date = ? and  (advice_doctor = ? or execution_staff = ?) ", orgID, scheduleDate, adminUserId, adminUserId).
+				Preload("HisPrescriptionProject", func(db *gorm.DB) *gorm.DB {
+					return db.Where("status = 1 AND user_org_id = ? AND record_date = ? AND team_id = 0 and execution_state = 0", orgID, scheduleDate).Preload("HisProject").Preload("GoodInfo", "status=1")
+				}).
+				Preload("HisPrescriptionTeamProject", func(db *gorm.DB) *gorm.DB {
+					return db.Where("status = 1 AND user_org_id = ? AND record_date = ? AND team_id > 0", orgID, scheduleDate).Preload("XtHisProjectTeam", "status = 1").Preload("HisProject").Preload("GoodInfo", "status=1")
+				}).Where("status = 1 AND user_org_id = ?", orgID)
+			if scheduleDate != 0 {
+				db = db.Where("schedule_date = ?", scheduleDate)
+			}
+			err = db.Find(&vms).Error
+		} else if execution_state == 0 {
+			db := readDb.
+				Table("xt_schedule").
+				Preload("SchedualPatient", "status = 1 AND user_org_id = ?", orgID).
+				Preload("DialysisOrder", func(db *gorm.DB) *gorm.DB {
+					return db.Where("status = 1 AND user_org_id = ?", orgID).Preload("DeviceNumber", "status = 1 AND org_id= ?", orgID)
+				}).
+				Preload("DeviceNumber", "status = 1 AND org_id = ?", orgID).
+				Preload("DeviceNumber.Zone", "status = 1 AND org_id = ?", orgID).
+				Preload("Prescription", "status = 1 AND user_org_id = ? AND record_date = ?", orgID, scheduleDate).
+				Preload("HisDoctorAdviceInfo", "status = 1 AND user_org_id = ? AND advice_date = ? and  (advice_doctor = ? or execution_staff = ?) ", orgID, scheduleDate, adminUserId, adminUserId).
+				Preload("HisPrescriptionProject", func(db *gorm.DB) *gorm.DB {
+					return db.Where("status = 1 AND user_org_id = ? AND record_date = ? AND team_id = 0", orgID, scheduleDate).Preload("HisProject").Preload("GoodInfo", "status=1")
+				}).
+				Preload("HisPrescriptionTeamProject", func(db *gorm.DB) *gorm.DB {
+					return db.Where("status = 1 AND user_org_id = ? AND record_date = ? AND team_id > 0", orgID, scheduleDate).Preload("XtHisProjectTeam", "status = 1").Preload("HisProject").Preload("GoodInfo", "status=1")
+				}).Where("status = 1 AND user_org_id = ?", orgID)
+			if scheduleDate != 0 {
+				db = db.Where("schedule_date = ?", scheduleDate)
+			}
+			err = db.Find(&vms).Error
 		}
-		err = db.Find(&vms).Error
+
 	}
 
 	return vms, err

service/schedule_service.go

@@ -1174,12 +1174,18 @@ func GetInitPrintData(patient_id int64, scheduleDate int64, orgid int64) (list [
 		db = db.Where("x.schedule_date >=? and x.schedule_date<=?", scheduleDate, scheduleDate)
 	}
 	err = db.Select("x.id,x.user_org_id,x.partition_id,x.bed_id,x.patient_id,x.schedule_date,x.schedule_type,x.schedule_week,x.mode_id,x.is_export").Preload("XtPatients", "status = 1").Preload("DeviceZone", "status = 1").Preload("DeviceNumber", "status = 1").Preload("DialysisOrder", "status = 1 and dialysis_date =?", scheduleDate).Preload("XtAssessmentBeforeDislysis", "status = 1 and assessment_date =?", scheduleDate).Preload("DoctorAdvice", func(db *gorm.DB) *gorm.DB {
-		return db.Where("status =1 and parent_id = 0 and advice_date = ?", scheduleDate).Preload("ChildDoctorAdvice", "status = 1")
-	}).Preload("HisDoctorAdviceInfo", "status = 1 and advice_date = ?", scheduleDate).Preload("DialysisPrescription", "status = 1 and record_date = ?", scheduleDate).Preload("DialysisSolution", func(db *gorm.DB) *gorm.DB {
-		return db.Where("status =1").Order("id asc")
+		return db.Where("status =1 and parent_id = 0 and advice_date = ?", scheduleDate).Preload("ChildDoctorAdvice", "status = 1 and patient_id = ?", patient_id)
+	}).Preload("HisDoctorAdviceInfo", "status = 1 and advice_date = ? and patient_id = ?", scheduleDate, patient_id).Preload("DialysisPrescription", "status = 1 and record_date = ? and patient_id = ?", scheduleDate, patient_id).Preload("DialysisSolution", func(db *gorm.DB) *gorm.DB {
+		return db.Where("status =1 and patient_id = ?", patient_id).Order("id asc")
 	}).Preload("LastAfterWeight", func(db *gorm.DB) *gorm.DB {
-		return db.Where("user_org_id = ? and status = 1 and assessment_date < ?", orgid, scheduleDate)
+		return db.Where("user_org_id = ? and status = 1 and assessment_date < ? and patient_id = ?", orgid, scheduleDate, patient_id)
 	}).Find(&list).Error
 
 	return list, err
 }
+
+func GetLastWeightAfter(patient_id int64, scheduleDate int64, orgid int64) (models.AssessmentAfterDislysis, error) {
+	dislysis := models.AssessmentAfterDislysis{}
+	err := XTReadDB().Where("user_org_id = ? and  patient_id = ? and assessment_date < ? and status = 1", orgid, patient_id, scheduleDate).Order("id desc").First(&dislysis).Error
+	return dislysis, err
+}

service/secondary_service.go

@@ -827,7 +827,7 @@ func GetAllStoreHouseListTwo(orgid int64) (list []*models.VmStorehouseNameOne, e
 func GetAllStoreHouseConfig(orgid int64) (models.XtStorehouseConfig, error) {
 
 	config := models.XtStorehouseConfig{}
-	err = XTReadDB().Where("user_org_id = ? and status = 1", orgid).Find(&config).Error
+	err = XTReadDB().Where("user_org_id = ? and status = 1", orgid).First(&config).Error
 	return config, err
 }
 

service/stock_service.go

@@ -5236,7 +5236,7 @@ func GetHisAdviceListByDrugIdTwo(patient_id int64, advice_date int64, orgid int6
 func GetHisAdviceListByDrugIdEight(drugid int64, patient_id int64, advice_date int64, advice_id int64) (models.HisDoctorAdviceInfo, error) {
 
 	info := models.HisDoctorAdviceInfo{}
-	err := XTReadDB().Model(&info).Where("drug_id = ? and patient_id = ? and advice_date = ? and status = 1 and id =?", drugid, patient_id, advice_date, advice_id).Find(&info).Error
+	err := XTReadDB().Model(&info).Where("drug_id = ? and patient_id = ? and advice_date = ? and status = 1 and id =?", drugid, patient_id, advice_date, advice_id).First(&info).Error
 	return info, err
 }
 
@@ -6970,7 +6970,7 @@ func GetDrugOpenConfig(orgid int64) (*models.DrugOutConfig, error) {
 func GetDrugOpenConfigOne(orgid int64) (models.DrugOutConfig, error) {
 
 	config := models.DrugOutConfig{}
-	err := XTReadDB().Where("user_org_id = ? and status = 1", orgid).Find(&config).Error
+	err := XTReadDB().Where("user_org_id = ? and status = 1", orgid).First(&config).Error
 
 	return config, err
 }

service/warhouse_service.go

@@ -69,7 +69,7 @@ func DrugsDelivery(orgID int64, creater int64, advice *models.DoctorAdvice) (err
 		drup, _ := FindBaseDrugLibRecord(orgID, advice.DrugId)
 		if drup.ID > 0 {
 			prescribingNumber := advice.PrescribingNumber
-			fmt.Println("出库数量233322332233232233223323232我的", advice.PrescribingNumber, advice.PrescribingNumberUnit)
+
 			DrugDeliverInfo(orgID, prescribingNumber, &out, &drup, advice)
 
 		} else {
@@ -122,8 +122,7 @@ func DrugDeliverInfo(orgID int64, prescribingNumber float64, warehouseout *model
 		var stockMin int64
 		stockMax = lastWarehouse.StockMinNumber / drup.MinNumber
 		stockMin = lastWarehouse.StockMinNumber % drup.MinNumber
-		fmt.Println("stockMax332332332233232", stockMax)
-		fmt.Println("stockMax332332332233232", stockMin)
+
 		ChangeMaxNumber(lastWarehouse.ID, stockMax)
 		UpdateMinNumber(lastWarehouse.ID, stockMin)
 	}
@@ -142,8 +141,7 @@ func DrugDeliverInfo(orgID int64, prescribingNumber float64, warehouseout *model
 	//baseInfo, _ := FindBaseDrugLibRecord(advice.UserOrgId, advice.DrugId)
 
 	// 当库存数量大于或等于出库数量的话，则正常出库该批次
-	fmt.Println("剩余库存", stock_number)
-	fmt.Println("出库数量", deliver_number)
+
 	if stock_number >= deliver_number {
 
 		warehouseOutInfo := &models.DrugWarehouseOutInfo{
@@ -206,7 +204,7 @@ func DrugDeliverInfo(orgID int64, prescribingNumber float64, warehouseout *model
 		errOne := AddSigleDrugWarehouseOutInfo(warehouseOutInfo)
 		fmt.Println(errOne)
 		//查询是否存在数据
-		fmt.Println("deliver_number2o222222222222", deliver_number)
+
 		details := &models.DrugAutomaticReduceDetail{
 			WarehouseOutId:          warehouseout.ID,
 			WarehouseOutOrderNumber: warehouseout.WarehouseOutOrderNumber,
@@ -245,9 +243,6 @@ func DrugDeliverInfo(orgID int64, prescribingNumber float64, warehouseout *model
 			}
 		}
 
-		fmt.Println("maxNumber", maxNumber)
-		fmt.Println("minNumber", minNumber)
-
 		warehouse.StockMaxNumber = warehouse.StockMaxNumber - maxNumber
 
 		if warehouse.StockMaxNumber < 0 {
@@ -301,7 +296,7 @@ func DrugDeliverInfo(orgID int64, prescribingNumber float64, warehouseout *model
 
 		return nil
 	} else {
-		fmt.Println("库存数量", stock_number)
+
 		// 当该批次的库存数量小于出库数量的话，则先把该批次出库完后，再进行递归出库
 		warehouseOutInfo := &models.DrugWarehouseOutInfo{
 			WarehouseOutOrderNumber: warehouseout.WarehouseOutOrderNumber,
@@ -422,7 +417,7 @@ func DrugDeliverInfo(orgID int64, prescribingNumber float64, warehouseout *model
 
 		// 清零完该库存后，还有剩余出库未出完，进行对应的递归操作
 		prescribingNumber_two_temp := deliver_number - stock_number
-		fmt.Println("剩余库存", prescribingNumber_two_temp)
+
 		overPlusNumber := float64(prescribingNumber_two_temp)
 
 		advice.PrescribingNumber = float64(prescribingNumber_two_temp)
@@ -4984,7 +4979,7 @@ func AutoDrugDeliverInfoTwentyOne(orgID int64, prescribingNumber int64, warehous
 		}
 		// 清零完该库存后，还有剩余出库未出完，进行对应的递归操作
 		prescribingNumber_two_temp := deliver_number - stock_number
-		fmt.Println("深谷数据", prescribingNumber_two_temp)
+
 		advice.CountUnit = drup.MinUnit
 
 		AutoDrugDeliverInfoTwentyOne(orgID, prescribingNumber_two_temp, warehouseout, drup, advice)
@@ -5171,21 +5166,12 @@ func ConsumablesDeliveryThirty(orgID int64, record_time int64, goods *models.War
 // 药品手动出库 递归方式
 func AutoDrugDeliverInfoFourtyOne(orgID int64, prescribingNumber int64, warehouseout *models.DrugWarehouseOut, drup *models.BaseDrugLib, advice *models.DrugWarehouseOutInfo) (err error) {
 	//开事务
-	//tx := XTWriteDB().Begin()
 	// 判断处方里药品单位是拆零单位还是包装单位,	如果是包装单位，则根据规格，将包装数量转为拆零数量
 	var deliver_number int64 = 0
 	var stock_number int64 = 0
-	//fmt.Println("出库数量",prescribingNumber)
-	//fmt.Println("出库数量",drup.MinNumber)
-	//fmt.Println("dnaeiw",advice.CountUnit)
-	//if advice.CountUnit == drup.MaxUnit {
-	//  deliver_number = prescribingNumber * drup.MinNumber
-	//} else {
+
 	deliver_number = prescribingNumber
-	//}
-	//fmt.Println("出库数量2323223323232322323232323",deliver_number)
-	// 根据先进先出原则，查询最先入库的批次，进行出库
-	// 如果没有对应的库存，则报错
+
 	//开启事物
 	lastWarehouse, _ := FindLastDrugWarehousingInfoByID(advice.DrugId, warehouseout.StorehouseId)
 	if lastWarehouse.StockMinNumber >= drup.MinNumber {