11月8日库存管理

controllers/his_api_controller.go

@@ -1051,53 +1051,55 @@ func (c *HisApiController) CreateHisPrescription() {
 									}
 
 								}
-								//修改处方
-								//if advicelist.ID > 0 {
-								//all_count, _ := strconv.ParseFloat(totals, 64) //总库存
-								//var  his_count int64 //历史出库数据
-								//if(advicelist.PrescribingNumberUnit == drug.MaxUnit){
-								//  strPrescribingNumber := strconv.FormatFloat(advicelist.PrescribingNumber, 'E', -1, 64)
-								//  intPrescribingNumber, _ := strconv.ParseInt(strPrescribingNumber, 10, 64)
-								//  his_count = intPrescribingNumber * drug.MinNumber
-								//}
-								//if(advicelist.PrescribingNumberUnit == drug.MinUnit){
-								//  strPrescribingNumber := strconv.FormatFloat(advicelist.PrescribingNumber, 'E', -1, 64)
-								//  intPrescribingNumber, _ := strconv.ParseInt(strPrescribingNumber, 10, 64)
-								//  his_count = intPrescribingNumber
-								//}
-								//
-								//
-								// if prescribingNumberUnit == drug.MinUnit {
-								//
-								//   float_prescribing_number := strconv.FormatFloat(prescribing_number, 'f', -1, 64)
-								//   int_prescribing_number, _ := strconv.ParseInt(float_prescribing_number, 10, 64)
-								//   float_all_count := strconv.FormatFloat(all_count, 'f', -1, 64)
-								//   int_all_count, _ := strconv.ParseInt(float_all_count, 10, 64)
-								//
-								//   fmt.Println("总库存我的",int_all_count)
-								//   fmt.Println("现在出库库存",int_prescribing_number)
-								//   fmt.Println("历史出库数据",his_count)
-								//   if (int_prescribing_number - his_count) > int_all_count {
-								//     c.ServeDynamicFailJsonSend(drug.DrugName + "库存不足")
-								//     return
-								//   }
-								//
-								// }
-								// if prescribingNumberUnit == drug.MaxUnit {
-								//   float_all_count := strconv.FormatFloat(all_count, 'f', -1, 64)
-								//   int_all_count, _ := strconv.ParseInt(float_all_count, 10, 64)
-								//   num := prescribing_number * float64(drug.MinNumber)
-								//   num_str_count := strconv.FormatFloat(num, 'f', -1, 64)
-								//   num_int_count, _ := strconv.ParseInt(num_str_count, 10, 64)
-								//   fmt.Println("总库存我的",int_all_count)
-								//   fmt.Println("现在出库库存",num_str_count)
-								//   fmt.Println("历史出库数据",his_count)
-								//   if (num_int_count - his_count)  > int_all_count {
-								//     c.ServeDynamicFailJsonSend(drug.DrugName + "库存不足")
-								//     return
-								//   }
-								// }
-								//}
+								drugOutConfig, _ := service.GetDrugOpenConfigOne(adminInfo.CurrentOrgId)
+								if drugOutConfig.IsOpen != 1 {
+									//修改处方
+									if advicelist.ID > 0 {
+										all_count, _ := strconv.ParseFloat(totals, 64) //总库存
+										var his_count int64                            //历史出库数据
+										if advicelist.PrescribingNumberUnit == drug.MaxUnit {
+											strPrescribingNumber := strconv.FormatFloat(advicelist.PrescribingNumber, 'E', -1, 64)
+											intPrescribingNumber, _ := strconv.ParseInt(strPrescribingNumber, 10, 64)
+											his_count = intPrescribingNumber * drug.MinNumber
+										}
+										if advicelist.PrescribingNumberUnit == drug.MinUnit {
+											strPrescribingNumber := strconv.FormatFloat(advicelist.PrescribingNumber, 'E', -1, 64)
+											intPrescribingNumber, _ := strconv.ParseInt(strPrescribingNumber, 10, 64)
+											his_count = intPrescribingNumber
+										}
+
+										if prescribingNumberUnit == drug.MinUnit {
+
+											float_prescribing_number := strconv.FormatFloat(prescribing_number, 'f', -1, 64)
+											int_prescribing_number, _ := strconv.ParseInt(float_prescribing_number, 10, 64)
+											float_all_count := strconv.FormatFloat(all_count, 'f', -1, 64)
+											int_all_count, _ := strconv.ParseInt(float_all_count, 10, 64)
+
+											fmt.Println("总库存我的", int_all_count)
+											fmt.Println("现在出库库存", int_prescribing_number)
+											fmt.Println("历史出库数据", his_count)
+											if (int_prescribing_number - his_count) > int_all_count {
+												c.ServeDynamicFailJsonSend(drug.DrugName + "库存不足")
+												return
+											}
+
+										}
+										if prescribingNumberUnit == drug.MaxUnit {
+											float_all_count := strconv.FormatFloat(all_count, 'f', -1, 64)
+											int_all_count, _ := strconv.ParseInt(float_all_count, 10, 64)
+											num := prescribing_number * float64(drug.MinNumber)
+											num_str_count := strconv.FormatFloat(num, 'f', -1, 64)
+											num_int_count, _ := strconv.ParseInt(num_str_count, 10, 64)
+											fmt.Println("总库存我的", int_all_count)
+											fmt.Println("现在出库库存", num_str_count)
+											fmt.Println("历史出库数据", his_count)
+											if (num_int_count - his_count) > int_all_count {
+												c.ServeDynamicFailJsonSend(drug.DrugName + "库存不足")
+												return
+											}
+										}
+									}
+								}
 
 							}
 						}
@@ -1616,48 +1618,49 @@ func (c *HisApiController) CreateHisPrescription() {
 		hisdoctorlist, _ := service.GetHisAdviceListByDrugIdTwo(patient_id, recordDateTime, adminInfo.CurrentOrgId)
 		storeHouseConfig, _ := service.GetAllStoreHouseConfig(adminInfo.CurrentOrgId)
 		drugOutConfig, _ := service.GetDrugOpenConfigOne(adminInfo.CurrentOrgId)
-		for _, item := range hisdoctorlist {
-			drug, _ := service.FindBaseDrugLibRecordSeven(adminInfo.CurrentOrgId, item.DrugId)
-
-			// 查询该药品最后一次出库记录
-			druginfo, _ := service.GetLastDrugWarehouseOutByDrugIdTwenty(item.DrugId, patient_id, recordDateTime, item.ID)
-			fmt.Println("drugiNfo23323233232323233223", len(druginfo))
+		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)
+						}
+						if it.CountUnit == drug.MinUnit && drug.MaxUnit != drug.MinUnit {
+							service.ModifyDrugWarehouseInfoStockMinNumber(it.Count, it.DrugId, it.OrgId, it.WarehouseInfoId)
+						}
+						if it.CountUnit == drug.MaxUnit && drug.MaxUnit == drug.MinUnit {
 
-			if len(druginfo) > 0 {
-				//回退库存
-				for _, it := range druginfo {
-					fmt.Println("it", it.Count)
-					fmt.Println("countuntit", it.CountUnit)
-					if it.CountUnit == drug.MaxUnit && drug.MaxUnit != drug.MinUnit {
-						service.ModifyDrugWarehouseInfoStockMaxNumber(it.Count, it.DrugId, it.OrgId, it.WarehouseInfoId)
-					}
-					if it.CountUnit == drug.MinUnit && drug.MaxUnit != drug.MinUnit {
-						service.ModifyDrugWarehouseInfoStockMinNumber(it.Count, it.DrugId, it.OrgId, it.WarehouseInfoId)
-					}
-					if it.CountUnit == drug.MaxUnit && drug.MaxUnit == drug.MinUnit {
-						service.ModifyDrugWarehouseInfoStockMaxNumber(it.Count, it.DrugId, it.OrgId, it.WarehouseInfoId)
+							service.ModifyDrugWarehouseInfoStockMaxNumber(it.Count, it.DrugId, it.OrgId, it.WarehouseInfoId)
+						}
 					}
 				}
-			}
 
-			//删除记录
-			service.DeleteDrugAutoWarehouseSeven(item.DrugId, patient_id, recordDateTime, item.ID)
-			if drugOutConfig.IsOpen == 1 {
-				//出库
-				if drug.IsUse == 2 {
-					creater := adminInfo.AdminUser.Id
-					service.HisDrugsDelivery(item.UserOrgId, creater, item)
-				}
+				//删除记录
+				service.DeleteDrugAutoWarehouseSeven(item.DrugId, patient_id, recordDateTime, item.ID)
+				if drugOutConfig.IsOpen == 1 {
+					//出库
+					if drug.IsUse == 2 {
+						creater := adminInfo.AdminUser.Id
+						service.HisDrugsDelivery(item.UserOrgId, creater, item)
+					}
 
-				//更新字典里面的库存
-				stockInfo, _ := service.GetDrugAllStockInfo(storeHouseConfig.DrugStorehouseOut, item.UserOrgId, item.DrugId)
-				var sum_count int64
-				for _, its := range stockInfo {
-					sum_count += its.StockMaxNumber*drug.MinNumber + its.StockMinNumber
+					//更新字典里面的库存
+					stockInfo, _ := service.GetDrugAllStockInfo(storeHouseConfig.DrugStorehouseOut, item.UserOrgId, item.DrugId)
+					var sum_count int64
+					for _, its := range stockInfo {
+						sum_count += its.StockMaxNumber*drug.MinNumber + its.StockMinNumber
+					}
+					service.UpdateBaseDrugSumTwo(item.DrugId, sum_count, item.UserOrgId)
 				}
-				service.UpdateBaseDrugSumTwo(item.DrugId, sum_count, item.UserOrgId)
 			}
 		}
+
 	}
 
 	//redisClient := service.RedisClient()
@@ -2176,6 +2179,7 @@ func (c *HisApiController) DeletePrescription() {
 		}
 	}
 	if drugStockConfig.IsOpen == 1 {
+		fmt.Println("woowowowowowowowowowowowowowo", len(advices))
 		if len(advices) > 0 {
 			for _, item := range advices {
 				creater := c.GetAdminUserInfo().AdminUser.Id

controllers/mobile_api_controllers/patient_api_controller.go

@@ -1098,59 +1098,61 @@ func (c *PatientApiController) ExecDoctorAdvice() {
 
 					var total int64
 					var prescribing_number_total int64
-					//查询该药品是否有库存
-					houseConfig, _ := service.GetAllStoreHouseConfig(advice.UserOrgId)
-					list, _ := service.GetDrugTotalCount(advice.DrugId, advice.UserOrgId, houseConfig.DrugStorehouseOut)
-
-					//判断单位是否相等
-					if medical.MaxUnit == advice.PrescribingNumberUnit {
-						prescribingNumber_temp := strconv.FormatFloat(math.Abs(advice.PrescribingNumber), 'f', 0, 64)
-						count, _ := strconv.ParseInt(prescribingNumber_temp, 10, 64)
-						//转化为最小单位
-						total = list.Count*medical.MinNumber + list.StockMinNumber
-						prescribing_number_total = count * medical.MinNumber
-					}
-					//fmt.Println("医嘱开的数量", total)
-					if medical.MinUnit == advice.PrescribingNumberUnit {
-						prescribingNumber_temp := strconv.FormatFloat(math.Abs(advice.PrescribingNumber), 'f', 0, 64)
-						count, _ := strconv.ParseInt(prescribingNumber_temp, 10, 64)
-						total = list.Count*medical.MinNumber + list.StockMinNumber
-						prescribing_number_total = count
-					}
 
-					//fmt.Println("数量一", prescribing_number_total)
-					//fmt.Println("数量二", total)
+					config, _ := service.GetDrugOpenConfigOne(adminInfo.Org.Id)
+					if config.IsOpen != 1 {
+						//查询该药品是否有库存
+						houseConfig, _ := service.GetAllStoreHouseConfig(advice.UserOrgId)
+						list, _ := service.GetDrugTotalCount(advice.DrugId, advice.UserOrgId, houseConfig.DrugStorehouseOut)
+
+						//判断单位是否相等
+						if medical.MaxUnit == advice.PrescribingNumberUnit {
+							prescribingNumber_temp := strconv.FormatFloat(math.Abs(advice.PrescribingNumber), 'f', 0, 64)
+							count, _ := strconv.ParseInt(prescribingNumber_temp, 10, 64)
+							//转化为最小单位
+							total = list.Count*medical.MinNumber + list.StockMinNumber
+							prescribing_number_total = count * medical.MinNumber
+						}
+						//fmt.Println("医嘱开的数量", total)
+						if medical.MinUnit == advice.PrescribingNumberUnit {
+							prescribingNumber_temp := strconv.FormatFloat(math.Abs(advice.PrescribingNumber), 'f', 0, 64)
+							count, _ := strconv.ParseInt(prescribingNumber_temp, 10, 64)
+							total = list.Count*medical.MinNumber + list.StockMinNumber
+							prescribing_number_total = count
+						}
 
-					if (list.Count*medical.MinNumber + list.StockMinNumber) == 0 {
-						c.ServeSuccessJSON(map[string]interface{}{
-							"msg":    "3",
-							"advice": advice,
-							"ids":    ids,
-						})
-						return
-					}
-					if prescribing_number_total > total {
-						c.ServeSuccessJSON(map[string]interface{}{
-							"msg":    "2",
-							"advice": advice,
-							"ids":    ids,
-						})
-						return
-					}
-					if prescribing_number_total <= total {
-						if medical.IsUse == 2 {
-							config, _ := service.GetDrugOpenConfigOne(adminInfo.Org.Id)
-							if config.IsOpen != 1 {
-								service.HisDrugsDelivery(adminInfo.Org.Id, creater, &advice)
-								//更新字典里面的库存
-								stockInfo, _ := service.GetDrugAllStockInfo(storeHouseConfig.DrugStorehouseOut, item.UserOrgId, item.DrugId)
-								var sum_count int64
-								for _, its := range stockInfo {
-									sum_count += its.StockMaxNumber*medical.MinNumber + its.StockMinNumber
+						if (list.Count*medical.MinNumber + list.StockMinNumber) == 0 {
+							c.ServeSuccessJSON(map[string]interface{}{
+								"msg":    "3",
+								"advice": advice,
+								"ids":    ids,
+							})
+							return
+						}
+						if prescribing_number_total > total {
+							c.ServeSuccessJSON(map[string]interface{}{
+								"msg":    "2",
+								"advice": advice,
+								"ids":    ids,
+							})
+							return
+						}
+
+						if prescribing_number_total <= total {
+							if medical.IsUse == 2 {
+
+								if config.IsOpen != 1 {
+									service.HisDrugsDelivery(adminInfo.Org.Id, creater, &advice)
+									//更新字典里面的库存
+									stockInfo, _ := service.GetDrugAllStockInfo(storeHouseConfig.DrugStorehouseOut, item.UserOrgId, item.DrugId)
+									var sum_count int64
+									for _, its := range stockInfo {
+										sum_count += its.StockMaxNumber*medical.MinNumber + its.StockMinNumber
+									}
+									service.UpdateBaseDrugSumTwo(item.DrugId, sum_count, item.UserOrgId)
 								}
-								service.UpdateBaseDrugSumTwo(item.DrugId, sum_count, item.UserOrgId)
-							}
 
+							}
 						}
 					}
 				}

controllers/patient_api_controller.go

@@ -1608,8 +1608,7 @@ func (c *PatientApiController) ExecGroupAdvice() {
 	exceAdvice := models.DoctorAdvice{
 		ExecutionStaff: executionStaff,
 		ExecutionTime:  theTime.Unix(),
-		// Checker:        checker,
-		UpdatedTime: time.Now().Unix(),
+		UpdatedTime:    time.Now().Unix(),
 	}
 	err = service.ExceDoctorAdviceByGroupNo(&exceAdvice, groupNo, adminUserInfo.CurrentOrgId)
 
@@ -1618,6 +1617,124 @@ func (c *PatientApiController) ExecGroupAdvice() {
 		return
 	}
 
+	//查询自动扣减是否开启
+	_, drugStockConfig := service.FindDrugStockAutomaticReduceRecordByOrgId(adminUserInfo.CurrentOrgId)
+	//查询已经执行的医嘱
+	advicelist, _ := service.GetExceDoctorAdviceGroupNo(groupNo, adminUserInfo.CurrentOrgId)
+
+	if drugStockConfig.IsOpen == 1 {
+		for _, item := range advicelist {
+			medical, _ := service.GetBaseDrugMedical(advice.DrugId)
+			//查询这个患者这个患者这个药已经出库的所有数量
+			advicelist, _ := service.GetAllHisDoctorAdviceById(item.DrugId, item.PatientId, item.AdviceDate, item.UserOrgId)
+			drugoutlist, _ := service.GetAllDrugFlowById(item.DrugId, item.PatientId, item.AdviceDate, item.UserOrgId)
+			var total_count int64
+			var drug_count int64
+			for _, it := range advicelist {
+				if it.PrescribingNumberUnit == medical.MaxUnit {
+					prescribingNumber_temp := strconv.FormatFloat(math.Abs(it.PrescribingNumber), 'f', 0, 64)
+					prenumber, _ := strconv.ParseInt(prescribingNumber_temp, 10, 64)
+					total_count += prenumber * medical.MinNumber
+				}
+				if it.PrescribingNumberUnit == medical.MinUnit {
+					prescribingNumber_temp := strconv.FormatFloat(math.Abs(it.PrescribingNumber), 'f', 0, 64)
+					prenumber, _ := strconv.ParseInt(prescribingNumber_temp, 10, 64)
+					total_count += prenumber
+				}
+
+			}
+
+			for _, its := range drugoutlist {
+				if its.CountUnit == medical.MaxUnit {
+					drug_count += its.Count * medical.MinNumber
+				}
+				if its.CountUnit == medical.MinUnit {
+					drug_count += its.Count
+				}
+			}
+			if total_count == drug_count {
+				c.ServeSuccessJSON(map[string]interface{}{
+					"msg":    "1",
+					"advice": advice,
+				})
+				return
+			}
+
+			var total int64
+			var prescribing_number_total int64
+
+			//查询默认出库仓库
+			houseConfig, _ := service.GetAllStoreHouseConfig(advice.UserOrgId)
+
+			//查询该药品在默认仓库是否有库存
+			list, _ := service.GetDrugTotalCountTwenty(advice.DrugId, advice.UserOrgId, houseConfig.DrugStorehouseOut)
+
+			//判断单位是否相等
+			if medical.MaxUnit == advice.PrescribingNumberUnit {
+				prescribingNumber_temp := strconv.FormatFloat(math.Abs(advice.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 == advice.PrescribingNumberUnit {
+				prescribingNumber_temp := strconv.FormatFloat(math.Abs(advice.PrescribingNumber), 'f', 0, 64)
+				count, _ := strconv.ParseInt(prescribingNumber_temp, 10, 64)
+				total = list.Count*medical.MinNumber + list.StockMinNumber
+
+				prescribing_number_total = count
+
+			}
+
+			if (list.Count*medical.MinNumber + list.StockMinNumber) == 0 {
+				c.ServeSuccessJSON(map[string]interface{}{
+					"msg":    "3",
+					"advice": advice,
+				})
+				return
+			}
+			if prescribing_number_total > total {
+				c.ServeSuccessJSON(map[string]interface{}{
+					"msg":    "2",
+					"advice": advice,
+				})
+				return
+			}
+			if prescribing_number_total <= total {
+				if medical.IsUse == 2 {
+					service.DrugsDelivery(adminUserInfo.CurrentOrgId, item.ExecutionStaff, item)
+					//查询默认仓库
+					storeHouseConfig, _ := service.GetAllStoreHouseConfig(item.UserOrgId)
+					//查询默认仓库剩余多少库存
+					var sum_count int64
+					stockInfo, _ := service.GetDrugAllStockInfo(storeHouseConfig.DrugStorehouseOut, item.UserOrgId, item.DrugId)
+					for _, its := range stockInfo {
+						sum_count += its.StockMaxNumber*medical.MinNumber + its.StockMinNumber
+					}
+					service.UpdateBaseDrugSumTwo(item.DrugId, sum_count, item.UserOrgId)
+					break
+					c.ServeSuccessJSON(map[string]interface{}{
+						"msg":    "1",
+						"advice": advice,
+					})
+					return
+
+				}
+
+				if medical.IsUse == 1 {
+					c.ServeSuccessJSON(map[string]interface{}{
+						"msg":    "1",
+						"advice": advice,
+					})
+					return
+				}
+
+			}
+
+		}
+	}
+
 	advice.ExecutionStaff = executionStaff
 	advice.ExecutionTime = theTime.Unix()
 
@@ -1795,9 +1912,9 @@ func (c *PatientApiController) ExecDoctorAdvice() {
 					adviceSetting, _ := service.FindAdviceSettingById(item.UserOrgId)
 
 					if adviceSetting.IsAdviceOpen == 1 {
-
 						//查询是否出库按钮开启
 						prescriptionConfig, _ := service.FindPrescriptionConfigById(item.UserOrgId)
+						fmt.Println("prescriptionConfigwodweweeeweweweweweewewewwewew", prescriptionConfig)
 						if prescriptionConfig.IsOpen == 1 {
 							if medical.IsUse == 2 {
 								service.DrugsDelivery(item.UserOrgId, item.ExecutionStaff, item)
@@ -1869,9 +1986,6 @@ func (c *PatientApiController) ExecDoctorAdvice() {
 
 			if item.Way == 2 {
 				if privateDrugConfig != nil && privateDrugConfig.DrugStart == 1 {
-
-					//adviceName, _ := service.FindDoctorAdvice(adminUserInfo.CurrentOrgId, id)
-
 					if item.ExecutionState == 1 {
 						prescribingNumber := strconv.FormatFloat(math.Abs(item.PrescribingNumber), 'f', 0, 64)
 						count, _ := strconv.ParseInt(prescribingNumber, 10, 64)
@@ -1962,8 +2076,7 @@ func (c *PatientApiController) ExecDoctorAdvice() {
 		exceAdvice := models.HisDoctorAdviceInfo{
 			ExecutionStaff: executionStaff,
 			ExecutionTime:  theTime.Unix(),
-			// Checker:        checker,
-			UpdatedTime: time.Now().Unix(),
+			UpdatedTime:    time.Now().Unix(),
 		}
 		if advice.ParentId > 0 {
 			err = service.ExceHidDoctorAdviceById(&exceAdvice, advice.ParentId, patient)
@@ -2015,7 +2128,6 @@ func (c *PatientApiController) ExecDoctorAdvice() {
 
 		advice.ExecutionStaff = executionStaff
 		advice.ExecutionTime = theTime.Unix()
-		// advice.Checker = checker
 
 		//处理出库相关逻辑
 
@@ -2067,78 +2179,79 @@ func (c *PatientApiController) ExecDoctorAdvice() {
 
 				var total int64
 				var prescribing_number_total int64
+				config, _ := service.GetDrugOpenConfigOne(adminUserInfo.CurrentOrgId)
+				if config.IsOpen != 1 {
+					//查询默认出库仓库
+					houseConfig, _ := service.GetAllStoreHouseConfig(advice.UserOrgId)
+
+					//查询该药品在默认仓库是否有库存
+					list, _ := service.GetDrugTotalCountTwenty(advice.DrugId, advice.UserOrgId, houseConfig.DrugStorehouseOut)
+
+					//判断单位是否相等
+					if medical.MaxUnit == advice.PrescribingNumberUnit {
+						prescribingNumber_temp := strconv.FormatFloat(math.Abs(advice.PrescribingNumber), 'f', 0, 64)
+						count, _ := strconv.ParseInt(prescribingNumber_temp, 10, 64)
+						//转化为最小单位
+						total = list.Count*medical.MinNumber + list.StockMinNumber
+						prescribing_number_total = count * medical.MinNumber
+					}
 
-				//查询默认出库仓库
-				houseConfig, _ := service.GetAllStoreHouseConfig(advice.UserOrgId)
-
-				//查询该药品在默认仓库是否有库存
-				list, _ := service.GetDrugTotalCountTwenty(advice.DrugId, advice.UserOrgId, houseConfig.DrugStorehouseOut)
-
-				//判断单位是否相等
-				if medical.MaxUnit == advice.PrescribingNumberUnit {
-					prescribingNumber_temp := strconv.FormatFloat(math.Abs(advice.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 == advice.PrescribingNumberUnit {
+						prescribingNumber_temp := strconv.FormatFloat(math.Abs(advice.PrescribingNumber), 'f', 0, 64)
+						count, _ := strconv.ParseInt(prescribingNumber_temp, 10, 64)
+						total = list.Count*medical.MinNumber + list.StockMinNumber
 
-				if medical.MinUnit == advice.PrescribingNumberUnit {
-					prescribingNumber_temp := strconv.FormatFloat(math.Abs(advice.PrescribingNumber), 'f', 0, 64)
-					count, _ := strconv.ParseInt(prescribingNumber_temp, 10, 64)
-					total = list.Count*medical.MinNumber + list.StockMinNumber
+						prescribing_number_total = count
 
-					prescribing_number_total = count
+					}
 
-				}
+					if (list.Count*medical.MinNumber + list.StockMinNumber) == 0 {
+						c.ServeSuccessJSON(map[string]interface{}{
+							"msg":    "3",
+							"advice": advice,
+						})
+						return
+					}
+					if prescribing_number_total > total {
+						c.ServeSuccessJSON(map[string]interface{}{
+							"msg":    "2",
+							"advice": advice,
+						})
+						return
+					}
 
-				if (list.Count*medical.MinNumber + list.StockMinNumber) == 0 {
-					c.ServeSuccessJSON(map[string]interface{}{
-						"msg":    "3",
-						"advice": advice,
-					})
-					return
-				}
-				if prescribing_number_total > total {
-					c.ServeSuccessJSON(map[string]interface{}{
-						"msg":    "2",
-						"advice": advice,
-					})
-					return
-				}
-				if prescribing_number_total <= total {
-					if medical.IsUse == 2 {
-						config, _ := service.GetDrugOpenConfigOne(adminUserInfo.CurrentOrgId)
-						if config.IsOpen != 1 {
-							service.HisDrugsDelivery(adminUserInfo.CurrentOrgId, item.ExecutionStaff, item)
-							//查询默认仓库
-							storeHouseConfig, _ := service.GetAllStoreHouseConfig(item.UserOrgId)
-							//查询默认仓库剩余多少库存
-							var sum_count int64
-							stockInfo, _ := service.GetDrugAllStockInfo(storeHouseConfig.DrugStorehouseOut, item.UserOrgId, item.DrugId)
-							for _, its := range stockInfo {
-								sum_count += its.StockMaxNumber*medical.MinNumber + its.StockMinNumber
+					if prescribing_number_total <= total {
+						if medical.IsUse == 2 {
+							if config.IsOpen != 1 {
+								service.HisDrugsDelivery(adminUserInfo.CurrentOrgId, item.ExecutionStaff, item)
+								//查询默认仓库
+								storeHouseConfig, _ := service.GetAllStoreHouseConfig(item.UserOrgId)
+								//查询默认仓库剩余多少库存
+								var sum_count int64
+								stockInfo, _ := service.GetDrugAllStockInfo(storeHouseConfig.DrugStorehouseOut, item.UserOrgId, item.DrugId)
+								for _, its := range stockInfo {
+									sum_count += its.StockMaxNumber*medical.MinNumber + its.StockMinNumber
+								}
+								service.UpdateBaseDrugSumTwo(item.DrugId, sum_count, item.UserOrgId)
+								break
+								c.ServeSuccessJSON(map[string]interface{}{
+									"msg":    "1",
+									"advice": advice,
+								})
+								return
 							}
-							service.UpdateBaseDrugSumTwo(item.DrugId, sum_count, item.UserOrgId)
-							break
+						}
+
+						if medical.IsUse == 1 {
 							c.ServeSuccessJSON(map[string]interface{}{
 								"msg":    "1",
 								"advice": advice,
 							})
 							return
 						}
-					}
 
-					if medical.IsUse == 1 {
-						c.ServeSuccessJSON(map[string]interface{}{
-							"msg":    "1",
-							"advice": advice,
-						})
-						return
 					}
-
 				}
-
 			}
 
 		}

controllers/stock_in_api_controller.go

@@ -3764,38 +3764,6 @@ func (this *StockManagerApiController) AddDrugInformation() {
 
 		drug.DrugName = drug_name
 
-		doses := goodNameM["dose"].(string)
-		dose, _ := strconv.ParseFloat(doses, 64)
-		if dose < 0 { //名字为空则生成一条导入错误日志
-			err_log := models.ExportErrLog{
-				LogType:    4,
-				UserOrgId:  this.GetAdminUserInfo().CurrentOrgId,
-				ErrMsg:     "第" + strconv.Itoa(index+2) + "行" + "的剂量不能为空",
-				Status:     1,
-				CreateTime: time.Now().Unix(),
-				UpdateTime: time.Now().Unix(),
-				ExportTime: time.Now().Unix(),
-			}
-			service.CreateExportErrLog(&err_log)
-			continue
-		}
-
-		drug.Dose = dose
-
-		fmt.Println("drug_233323232323232wo", drug.Dose)
-		if dose < 0 { //名字为空则生成一条导入错误日志
-			err_log := models.ExportErrLog{
-				LogType:    4,
-				UserOrgId:  this.GetAdminUserInfo().CurrentOrgId,
-				ErrMsg:     "第" + strconv.Itoa(index+2) + "行" + "的剂量单位不能为空",
-				Status:     1,
-				CreateTime: time.Now().Unix(),
-				UpdateTime: time.Now().Unix(),
-				ExportTime: time.Now().Unix(),
-			}
-			service.CreateExportErrLog(&err_log)
-			continue
-		}
 		dose_unit := goodNameM["dose_unit"].(string)
 		drug.DoseUnit = dose_unit
 
@@ -3839,40 +3807,6 @@ func (this *StockManagerApiController) AddDrugInformation() {
 
 		drug.MinUnit = min_unit
 
-		max_unit_id := goodNameM["max_unit"].(string)
-		if len(max_unit_id) == 0 { //名字为空则生成一条导入错误日志
-			err_log := models.ExportErrLog{
-				LogType:    4,
-				UserOrgId:  this.GetAdminUserInfo().CurrentOrgId,
-				ErrMsg:     "第" + strconv.Itoa(index+2) + "行" + "的剂量单位不能为空",
-				Status:     1,
-				CreateTime: time.Now().Unix(),
-				UpdateTime: time.Now().Unix(),
-				ExportTime: time.Now().Unix(),
-			}
-			service.CreateExportErrLog(&err_log)
-			continue
-		}
-
-		drug.MaxUnit = max_unit_id
-
-		max_unit := goodNameM["max_unit"].(string)
-		if len(max_unit) == 0 { //名字为空则生成一条导入错误日志
-			err_log := models.ExportErrLog{
-				LogType:    4,
-				UserOrgId:  this.GetAdminUserInfo().CurrentOrgId,
-				ErrMsg:     "第" + strconv.Itoa(index+2) + "行" + "的包装单位不能为空",
-				Status:     1,
-				CreateTime: time.Now().Unix(),
-				UpdateTime: time.Now().Unix(),
-				ExportTime: time.Now().Unix(),
-			}
-			service.CreateExportErrLog(&err_log)
-			continue
-		}
-
-		drug.MaxUnit = max_unit
-
 		drug_type := goodNameM["drug_type"].(string)
 		if len(drug_type) == 0 { //名字为空则生成一条导入错误日志
 			err_log := models.ExportErrLog{
@@ -4641,42 +4575,6 @@ func (this *StockManagerApiController) AddDrugInformation() {
 				}
 			}
 
-			drug_dose := goodNameM["drug_dose"].(string)
-
-			if len(drug_dose) == 0 {
-				err_log := models.ExportErrLog{
-					LogType:    4,
-					UserOrgId:  this.GetAdminUserInfo().CurrentOrgId,
-					ErrMsg:     "第" + strconv.Itoa(index+2) + "行" + "的默认单次用量不能为空",
-					Status:     1,
-					CreateTime: time.Now().Unix(),
-					UpdateTime: time.Now().Unix(),
-					ExportTime: time.Now().Unix(),
-				}
-				service.CreateExportErrLog(&err_log)
-				continue
-			}
-			drugDoses, _ := strconv.ParseFloat(drug_dose, 64)
-			drug.DrugDose = drugDoses
-
-			var units = "单位"
-			var unit_id int64
-			drugDoseUnit := goodNameM["drug_dose_unit"].(string)
-
-			if len(drugDoseUnit) == 0 {
-				err_log := models.ExportErrLog{
-					LogType:    4,
-					UserOrgId:  this.GetAdminUserInfo().CurrentOrgId,
-					ErrMsg:     "第" + strconv.Itoa(index+2) + "行" + "的默认单次用量单位不能为空",
-					Status:     1,
-					CreateTime: time.Now().Unix(),
-					UpdateTime: time.Now().Unix(),
-					ExportTime: time.Now().Unix(),
-				}
-				service.CreateExportErrLog(&err_log)
-				continue
-			}
-
 			manufacturer := goodNameM["manufacturer"].(string)
 			if len(manufacturer) == 0 { //名字为空则生成一条导入错误日志
 				err_log := models.ExportErrLog{
@@ -4763,6 +4661,10 @@ func (this *StockManagerApiController) AddDrugInformation() {
 
 			drug_category := goodNameM["drug_category"].(string)
 
+			min_prices := goodNameM["min_price"].(string)
+			min_price, _ := strconv.ParseFloat(min_prices, 64)
+
+			drug.MinPrice = min_price
 			var drugCategory = "药品类别"
 			var drug_category_id int64
 
@@ -4990,7 +4892,38 @@ func (this *StockManagerApiController) AddDrugInformation() {
 			drug.DrugStatus = drug_status
 			limit_remark := goodNameM["limit_remark"].(string)
 			drug.LimitRemark = limit_remark
+			doses := goodNameM["dose"].(string)
+			dose, _ := strconv.ParseFloat(doses, 64)
+			if dose < 0 { //名字为空则生成一条导入错误日志
+				err_log := models.ExportErrLog{
+					LogType:    4,
+					UserOrgId:  this.GetAdminUserInfo().CurrentOrgId,
+					ErrMsg:     "第" + strconv.Itoa(index+2) + "行" + "的剂量不能为空",
+					Status:     1,
+					CreateTime: time.Now().Unix(),
+					UpdateTime: time.Now().Unix(),
+					ExportTime: time.Now().Unix(),
+				}
+				service.CreateExportErrLog(&err_log)
+				continue
+			}
+
+			drug.Dose = dose
 
+			fmt.Println("drug_233323232323232wo", drug.Dose)
+			if dose < 0 { //名字为空则生成一条导入错误日志
+				err_log := models.ExportErrLog{
+					LogType:    4,
+					UserOrgId:  this.GetAdminUserInfo().CurrentOrgId,
+					ErrMsg:     "第" + strconv.Itoa(index+2) + "行" + "的剂量单位不能为空",
+					Status:     1,
+					CreateTime: time.Now().Unix(),
+					UpdateTime: time.Now().Unix(),
+					ExportTime: time.Now().Unix(),
+				}
+				service.CreateExportErrLog(&err_log)
+				continue
+			}
 			drugList = append(drugList, &drug)
 		}
 
@@ -5050,7 +4983,7 @@ func (this *StockManagerApiController) AddDrugInformation() {
 					Dose:                        item.Dose,
 					MinNumber:                   item.MinNumber,
 					IsUse:                       2,
-					MinPrice:                    item.RetailPrice,
+					MinPrice:                    item.MinPrice,
 				}
 
 				//查询同种药品同种规格是否存在

models/drug_stock.go

@@ -333,6 +333,7 @@ type VmDrugWarehouseInfo struct {
 	SupplyWarehouseId         int64  `gorm:"column:supply_warehouse_id" json:"supply_warehouse_id" form:"supply_warehouse_id"`
 	SupplyWarehouseDetailInfo int64  `gorm:"column:supply_warehouse_detail_info" json:"supply_warehouse_detail_info" form:"supply_warehouse_detail_info"`
 	StorehouseId              int64  `gorm:"column:storehouse_id" json:"storehouse_id" form:"storehouse_id"`
+	IsCheck                   int64  `gorm:"column:is_check" json:"is_check" form:"is_check"`
 }
 
 type StDrugWarehouseOutInfo struct {

service/dialysis_service.go

@@ -928,6 +928,12 @@ func ExceDoctorAdviceByGroupNo(m *models.DoctorAdvice, groupNo int64, org_id int
 	return err
 }
 
+func GetExceDoctorAdviceGroupNo(groupNo int64, org_id int64) (advice []*models.DoctorAdvice, err error) {
+
+	err = XTReadDB().Where("groupno = ?  AND user_org_id = ? AND status = 1", groupNo, org_id).Find(&advice).Error
+	return advice, err
+}
+
 func ExceOldDoctorAdvice(m *models.DoctorAdvice, advice_id int64) (err error) {
 
 	ut := writeDb.Begin()

service/manage_center_service.go

@@ -439,6 +439,8 @@ func DrugAutoAddCancelInfo(advice *models.HisDoctorAdviceInfo, creater int64) er
 	storeHouseConfig, _ := GetAllStoreHouseConfig(advice.UserOrgId)
 	//退库
 	drug, _ := FindBaseDrugLibRecord(advice.UserOrgId, advice.DrugId)
+	fmt.Println("list223323232233223322323323223", len(list))
+
 	//如果剩余数量 + 退库数量 < 总入库数量
 	if len(list) > 0 {
 		for _, its := range list {
@@ -479,6 +481,7 @@ func DrugAutoAddCancelInfo(advice *models.HisDoctorAdviceInfo, creater int64) er
 			fmt.Println("该批次总入库数量", sum_count)
 			if (over_count + out_count) <= sum_count {
 				if its.CountUnit == drug.MinUnit && drug.MaxUnit != drug.MinUnit {
+					fmt.Println("进来1", its.Count)
 					//退库
 					warehouseInfo := models.DrugWarehouseInfo{
 						StockMinNumber: its.Count,
@@ -486,6 +489,7 @@ func DrugAutoAddCancelInfo(advice *models.HisDoctorAdviceInfo, creater int64) er
 					UpdateDrugWarehouse(its.WarehouseInfoId, warehouseInfo)
 				}
 				if its.CountUnit == drug.MaxUnit && drug.MaxUnit != drug.MinUnit {
+					fmt.Println("进来2", its.Count)
 					warehouseInfo := models.DrugWarehouseInfo{
 						StockMaxNumber: its.Count,
 					}
@@ -493,6 +497,7 @@ func DrugAutoAddCancelInfo(advice *models.HisDoctorAdviceInfo, creater int64) er
 				}
 
 				if its.CountUnit == drug.MaxUnit && drug.MaxUnit == drug.MinUnit {
+					fmt.Println("进来3", its.Count)
 					warehouseInfo := models.DrugWarehouseInfo{
 						StockMaxNumber: its.Count,
 					}
@@ -630,7 +635,6 @@ func DrugAutoAddCancelInfo(advice *models.HisDoctorAdviceInfo, creater int64) er
 				IsCheck:      1,
 			}
 			AddSigleDrugCancelStock(&cancelStock)
-			fmt.Println("到这里了吗32222222222222222222222222222222222222222222222")
 
 			manufactureName, _ := GetManufactureById(info.Manufacturer)
 			dealer, _ := GetDealerById(info.Dealer)
@@ -708,14 +712,6 @@ func DrugAutoAddCancelInfo(advice *models.HisDoctorAdviceInfo, creater int64) er
 
 			houseConfig, _ := GetAllStoreHouseConfig(advice.UserOrgId)
 
-			if advice.PrescribingNumberUnit == drug.MaxUnit {
-				warehouseInfo := models.DrugWarehouseInfo{
-					StockMaxNumber: prescribingNumber,
-				}
-				UpdateDrugWarehouseOne(info.WarehouseInfoId, warehouseInfo)
-
-			}
-
 			operation_time := time.Now().Unix()
 			ctime := time.Now().Unix()
 			timeStr := time.Now().Format("2006-01-02")

service/statistics_service/index_evaluation_service.go

@@ -1241,9 +1241,9 @@ func GetDoctorWorkloadTableData(user_org_id int64, start_time int64, end_time in
 	userDb := service.UserReadDB()
 	db := service.XTReadDB()
 	if admin_user_id == 0 {
-		userDb.Raw("select admin_user_id, user_name,org_id  from sgj_user_admin_role  Where status = 1 AND org_id = ?  AND user_type = 2 ", user_org_id).Scan(&datas)
+		userDb.Raw("select admin_user_id, user_name,org_id  from sgj_user_admin_role  Where  org_id = ?  AND user_type = 2 ", user_org_id).Scan(&datas)
 	} else {
-		userDb.Raw("select admin_user_id, user_name,org_id  from sgj_user_admin_role  Where status = 1 AND org_id = ?  AND user_type = 2  AND admin_user_id = ?", user_org_id, admin_user_id).Scan(&datas)
+		userDb.Raw("select admin_user_id, user_name,org_id  from sgj_user_admin_role  Where  org_id = ?  AND user_type = 2  AND admin_user_id = ?", user_org_id, admin_user_id).Scan(&datas)
 	}
 	var sys_datas VMUserAdminRole
 	sys_datas.AdminUserId = 0
@@ -1273,9 +1273,9 @@ func GetNurseWorkloadChartData(user_org_id int64, start_time int64, end_time int
 	db := service.XTReadDB()
 
 	if admin_user_id == 0 {
-		userDb.Raw("select admin_user_id, user_name,org_id  from sgj_user_admin_role  Where status = 1 AND org_id = ?  AND user_type = 3 ", user_org_id).Scan(&datas)
+		userDb.Raw("select admin_user_id, user_name,org_id  from sgj_user_admin_role  Where  org_id = ?  AND user_type = 3 ", user_org_id).Scan(&datas)
 	} else {
-		userDb.Raw("select admin_user_id, user_name,org_id  from sgj_user_admin_role  Where status = 1 AND org_id = ?  AND user_type = 3  AND admin_user_id = ?", user_org_id, admin_user_id).Scan(&datas)
+		userDb.Raw("select admin_user_id, user_name,org_id  from sgj_user_admin_role  Where   org_id = ?  AND user_type = 3  AND admin_user_id = ?", user_org_id, admin_user_id).Scan(&datas)
 	}
 
 	var NewTotalOne int64
@@ -1449,9 +1449,9 @@ func GetNurseWorkloadTableData(user_org_id int64, start_time int64, end_time int
 	//db.Model(&models.Dataconfig{}).Where("name = '血管通路' AND module = 'hemodialysis' AND field_name = 'vascular_access_desc' AND parent_id = 0").First(&tempConfig)
 
 	if admin_user_id == 0 {
-		userDb.Raw("select admin_user_id, user_name,org_id  from sgj_user_admin_role  Where status = 1 AND org_id = ?  AND user_type = 3 ", user_org_id).Offset(offset).Limit(limit).Scan(&datas)
+		userDb.Raw("select admin_user_id, user_name,org_id  from sgj_user_admin_role  Where org_id = ?  AND user_type = 3 ", user_org_id).Offset(offset).Limit(limit).Scan(&datas)
 	} else {
-		userDb.Raw("select admin_user_id, user_name,org_id  from sgj_user_admin_role  Where status = 1 AND org_id = ?  AND user_type = 3  AND admin_user_id = ?", user_org_id, admin_user_id).Scan(&datas)
+		userDb.Raw("select admin_user_id, user_name,org_id  from sgj_user_admin_role  Where org_id = ?  AND user_type = 3  AND admin_user_id = ?", user_org_id, admin_user_id).Scan(&datas)
 	}
 
 	for _, item := range datas {

service/stock_service.go

@@ -742,7 +742,7 @@ func CreateDrugFlowOne(flow models.DrugFlow) error {
 func UpdateDrugFlowSeven(patientid int64, recorddate int64, drugid int64, advice_id int64, id int64) (models.DrugAutomaticReduceDetail, error) {
 	detail := models.DrugAutomaticReduceDetail{}
 	err := XTWriteDB().Model(&detail).Where("patient_id = ? and record_time = ? and drug_id = ? and status= 1 and advice_id =? ", patientid, recorddate, drugid, advice_id).Updates(map[string]interface{}{"status": 0}).Error
-	err = XTWriteDB().Model(&models.DrugWarehouseOutInfo{}).Where("patient_id =? and sys_record_time =? and drug_id = ? and status = 1 and advice_id =? and id = ?", patientid, recorddate, drugid, advice_id, id).Updates(map[string]interface{}{"status": 0}).Error
+	err = XTWriteDB().Model(&models.DrugWarehouseOutInfo{}).Where("patient_id =? and sys_record_time =? and drug_id = ? and status = 1 and advice_id =?", patientid, recorddate, drugid, advice_id).Updates(map[string]interface{}{"status": 0}).Error
 	return detail, err
 }
 
@@ -4445,7 +4445,7 @@ func GetDrugWarehouseOrderDetailTwo(ids []int64, orgid int64, startime int64, en
 
 func GetDrugTotalCount(drugid int64, orgid int64, storehouse_id int64) (info models.VmDrugWarehouseInfo, err error) {
 
-	db := XTReadDB().Table("xt_drug_warehouse_info as x").Where("x.status = 1")
+	db := XTReadDB().Table("xt_drug_warehouse_info as x").Where("x.status = 1 and x.is_check = 1")
 	if drugid > 0 {
 		db = db.Where("x.drug_id = ?", drugid)
 	}
@@ -4461,7 +4461,7 @@ func GetDrugTotalCount(drugid int64, orgid int64, storehouse_id int64) (info mod
 
 func GetDrugTotalCountTwenty(drugid int64, orgid int64, storehouse_id int64) (info models.VmDrugWarehouseInfo, err error) {
 
-	db := XTReadDB().Table("xt_drug_warehouse_info as x").Where("x.status = 1 ")
+	db := XTReadDB().Table("xt_drug_warehouse_info as x").Where("x.status = 1 and x.is_check = 1 ")
 	if drugid > 0 {
 		db = db.Where("x.drug_id = ?", drugid)
 	}

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,6 +122,8 @@ 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)
 	}
@@ -140,6 +142,8 @@ 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{
@@ -202,7 +206,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,
@@ -241,6 +245,9 @@ 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 {
@@ -252,30 +259,30 @@ func DrugDeliverInfo(orgID int64, prescribingNumber float64, warehouseout *model
 
 		warehouse.Mtime = time.Now().Unix()
 
-		//if warehouse.StockMinNumber < minNumber {
-		//
-		//	warehouse.StockMaxNumber = warehouse.StockMaxNumber - 1
-		//	warehouse.StockMinNumber = warehouse.StockMinNumber + drup.MinNumber - minNumber
-		//} else {
-		//	if minNumber > 0 {
-		//		warehouse.StockMinNumber = warehouse.StockMinNumber - minNumber
-		//	}
-		//
-		//	if minNumber == 0 && maxNumber != 1 {
-		//		if warehouse.StockMinNumber > 0 {
-		//			warehouse.StockMinNumber = warehouse.StockMinNumber - deliver_number
-		//		}
-		//
-		//	}
-		//
-		//}
+		if warehouse.StockMinNumber < minNumber {
 
-		//if maxNumber == 1 && minNumber == 0 && drup.MaxUnit != drup.MinUnit {
-		//	if (warehouse.StockMinNumber - deliver_number) > 0 {
-		//		warehouse.StockMinNumber = warehouse.StockMinNumber - deliver_number
-		//	}
-		//
-		//}
+			warehouse.StockMaxNumber = warehouse.StockMaxNumber - 1
+			warehouse.StockMinNumber = warehouse.StockMinNumber + drup.MinNumber - minNumber
+		} else {
+			if minNumber > 0 {
+				warehouse.StockMinNumber = warehouse.StockMinNumber - minNumber
+			}
+
+			if minNumber == 0 && maxNumber != 1 {
+				if warehouse.StockMinNumber > 0 {
+					warehouse.StockMinNumber = warehouse.StockMinNumber - deliver_number
+				}
+
+			}
+
+		}
+
+		if maxNumber == 1 && minNumber == 0 && drup.MaxUnit != drup.MinUnit {
+			if (warehouse.StockMinNumber - deliver_number) > 0 {
+				warehouse.StockMinNumber = warehouse.StockMinNumber - deliver_number
+			}
+
+		}
 
 		if drup.MaxUnit != drup.MinUnit {
 			if warehouse.StockMaxNumber < 0 && warehouse.StockMinNumber < 0 {
@@ -294,6 +301,7 @@ func DrugDeliverInfo(orgID int64, prescribingNumber float64, warehouseout *model
 
 		return nil
 	} else {
+		fmt.Println("库存数量", stock_number)
 		// 当该批次的库存数量小于出库数量的话，则先把该批次出库完后，再进行递归出库
 		warehouseOutInfo := &models.DrugWarehouseOutInfo{
 			WarehouseOutOrderNumber: warehouseout.WarehouseOutOrderNumber,
@@ -315,7 +323,7 @@ func DrugDeliverInfo(orgID int64, prescribingNumber float64, warehouseout *model
 			ProductDate:             warehouse.ProductDate,
 			ExpiryDate:              warehouse.ExpiryDate,
 			PatientId:               advice.PatientId,
-			Count:                   deliver_number,
+			Count:                   stock_number,
 			WarehouseInfoId:         warehouse.ID,
 			SupplyWarehouseId:       warehouse.SupplyWarehouseId,
 			StorehouseId:            storeConfig.DrugStorehouseOut,
@@ -336,7 +344,7 @@ func DrugDeliverInfo(orgID int64, prescribingNumber float64, warehouseout *model
 			RecordTime:              advice.RecordDate,
 			OrgId:                   orgID,
 			DrugId:                  advice.DrugId,
-			Count:                   deliver_number,
+			Count:                   stock_number,
 			CountUnit:               drup.MinUnit,
 			WarehouseInfoId:         warehouse.ID,
 			StorehouseId:            storeConfig.DrugStorehouseOut,
@@ -414,11 +422,11 @@ 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)
-		advice.PrescribingNumberUnit = advice.PrescribingNumberUnit
+		advice.PrescribingNumberUnit = drup.MinUnit
 
 		DrugDeliverInfo(orgID, overPlusNumber, warehouseout, drup, advice)
 	}
@@ -647,9 +655,9 @@ func HisDrugDeliverInfo(orgID int64, prescribingNumber float64, warehouseout *mo
 		maxNumber = deliver_number / drup.MinNumber
 		minNumber = deliver_number % drup.MinNumber
 
-		//if warehouse.StockMaxNumber == 0 && drup.MaxUnit == drup.MinUnit {
-		//	minNumber = maxNumber
-		//}
+		if warehouse.StockMaxNumber == 0 && drup.MaxUnit == drup.MinUnit {
+			minNumber = maxNumber
+		}
 
 		if drup.MaxUnit != drup.MinUnit {
 			if warehouse.StockMaxNumber < maxNumber && warehouse.StockMinNumber < minNumber {
@@ -670,29 +678,29 @@ func HisDrugDeliverInfo(orgID int64, prescribingNumber float64, warehouseout *mo
 
 		warehouse.Mtime = time.Now().Unix()
 
-		//if warehouse.StockMinNumber < minNumber {
-		//
-		//	warehouse.StockMaxNumber = warehouse.StockMaxNumber - 1
-		//	warehouse.StockMinNumber = warehouse.StockMinNumber + drup.MinNumber - minNumber
-		//} else {
-		//
-		//	if minNumber > 0 {
-		//		warehouse.StockMinNumber = warehouse.StockMinNumber - minNumber
-		//	}
-		//
-		//	if minNumber == 0 && maxNumber != 1 {
-		//		if warehouse.StockMinNumber > 0 {
-		//			warehouse.StockMinNumber = warehouse.StockMinNumber - deliver_number
-		//		}
-		//
-		//	}
-		//}
+		if warehouse.StockMinNumber < minNumber {
 
-		//if maxNumber == 1 && minNumber == 0 && drup.MaxUnit != drup.MinUnit {
-		//	if (warehouse.StockMinNumber - deliver_number) > 0 {
-		//		warehouse.StockMinNumber = warehouse.StockMinNumber - deliver_number
-		//	}
-		//}
+			warehouse.StockMaxNumber = warehouse.StockMaxNumber - 1
+			warehouse.StockMinNumber = warehouse.StockMinNumber + drup.MinNumber - minNumber
+		} else {
+
+			if minNumber > 0 {
+				warehouse.StockMinNumber = warehouse.StockMinNumber - minNumber
+			}
+
+			if minNumber == 0 && maxNumber != 1 {
+				if warehouse.StockMinNumber > 0 {
+					warehouse.StockMinNumber = warehouse.StockMinNumber - deliver_number
+				}
+
+			}
+		}
+
+		if maxNumber == 1 && minNumber == 0 && drup.MaxUnit != drup.MinUnit {
+			if (warehouse.StockMinNumber - deliver_number) > 0 {
+				warehouse.StockMinNumber = warehouse.StockMinNumber - deliver_number
+			}
+		}
 
 		if drup.MaxUnit != drup.MinUnit {
 			if warehouse.StockMaxNumber < 0 && warehouse.StockMinNumber < 0 {
@@ -841,7 +849,7 @@ func HisDrugDeliverInfo(orgID int64, prescribingNumber float64, warehouseout *mo
 
 		advice.PrescribingNumber = float64(prescribingNumber_two_temp)
 
-		advice.PrescribingNumberUnit = advice.PrescribingNumberUnit
+		advice.PrescribingNumberUnit = drup.MinUnit
 
 		HisDrugDeliverInfo(orgID, overPlusNumber, warehouseout, drup, advice)
 	}