11月8日库存管理

controllers/dialysis_api_controller.go

@@ -3510,7 +3510,7 @@ func (c *DialysisApiController) UploadDryWeight() {
 		redis.Set(keyOne, "", time.Second)
 
 		key := strconv.FormatInt(adminUserInfo.CurrentOrgId, 10) + ":" + strconv.FormatInt(patient_id, 10) + ":" + strconv.FormatInt(dayTime.Unix(), 10) + ":assessment_before_dislysis"
-		fmt.Println("敢提哦那个key23232332323223232332232323", key)
+
 		redis.Set(key, "", time.Second)
 		keyTwo := strconv.FormatInt(adminUserInfo.CurrentOrgId, 10) + ":" + strconv.FormatInt(patient_id, 10) + ":last_dry_weight"
 		redis.Set(keyTwo, "", time.Second)
@@ -3559,7 +3559,6 @@ func (c *DialysisApiController) UploadDryWeight() {
 
 		key := strconv.FormatInt(adminUserInfo.CurrentOrgId, 10) + ":" + strconv.FormatInt(patient_id, 10) + ":" + strconv.FormatInt(dayTime.Unix(), 10) + ":assessment_before_dislysis"
 		redis.Set(key, "", time.Second)
-		fmt.Println("敢提哦那个key23232332323223232332232323", key)
 		keyTwo := strconv.FormatInt(adminUserInfo.CurrentOrgId, 10) + ":" + strconv.FormatInt(patient_id, 10) + ":last_dry_weight"
 		redis.Set(keyTwo, "", time.Second)
 		redis.Close()

controllers/drug_stock_api_contorller.go

@@ -732,7 +732,7 @@ func (c *StockDrugApiController) EditDrugWarehouse() {
 							BatchNumber:  it.BatchNumber,
 							Price:        it.Price,
 						}
-						parseDateErr := service.UpdateDrugFlowTen(flow, item.DrugId, warehouseInfo.WarehousingId)
+						parseDateErr := service.UpdateDrugFlow(flow, item.DrugId, warehouseInfo.WarehousingId)
 						fmt.Println(parseDateErr)
 
 					}

controllers/his_api_controller.go

@@ -105,6 +105,8 @@ func HisManagerApiRegistRouters() {
 
 	beego.Router("/api/orders", &HisApiController{}, "get:GetAllOrder")
 
+	beego.Router("/api/his/gethistdoctoradviceinfo", &HisApiController{}, "get:GetHisDoctorAdviceInfo")
+
 }
 
 func (c *HisApiController) GetHisUnChargePatientList() {
@@ -702,13 +704,15 @@ func (c *HisApiController) CreateHisPrescription() {
 								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 = advice.(map[string]interface{})["prescribing_number"].(string)
 									prescribing_number_str := advice.(map[string]interface{})["prescribing_number"].(string)
+									prescribingNumber = advice.(map[string]interface{})["prescribing_number"].(string)
 									prescribing_number, _ = strconv.ParseFloat(prescribing_number_str, 64)
 
 								}
@@ -717,38 +721,114 @@ func (c *HisApiController) CreateHisPrescription() {
 									prescribingNumberUnit, _ = advice.(map[string]interface{})["prescribing_number_unit"].(string)
 								}
 
+								if advice.(map[string]interface{})["advice_id"] != nil || reflect.TypeOf(advice.(map[string]interface{})["advice_id"]).String() == "float64" {
+									adviceId = int64(advice.(map[string]interface{})["advice_id"].(float64))
+								}
+
 								drug, _ := service.FindBaseDrugLibRecord(adminInfo.CurrentOrgId, drug_id)
 								if drug.ID == 0 {
 									c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
 									return
 								}
 
-								//查询药品的搜有库存
+								//查询药品的所有库存
 								list, _ := service.GetDrugWarehouseInfoPrescription(drug_id, adminInfo.CurrentOrgId)
 								var total_count int64
+
 								for _, it := range list {
 									total_count += it.StockMaxNumber*drug.MinNumber + it.StockMinNumber
 								}
 								totals := strconv.FormatInt(total_count, 10)
-								all_count, _ := strconv.ParseFloat(totals, 64)
-								fmt.Println("all_count2323323233232", all_count)
-								if prescribingNumberUnit == drug.MinUnit {
-									if prescribing_number > all_count {
-										c.ServeDynamicFailJsonSend(drug.DrugName + "库存不足")
-										//c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeOutOfStockParamWrong)
-										return
+								//查询该药品是否存在开药记录
+								advicelist, _ := service.GetHisAdviceListByDrugIdEight(drug_id, patient_id, recordDateTime, adviceId)
+								//修改处方
+								if advicelist.ID > 0 {
+									var device_number int64
+									if advicelist.PrescribingNumberUnit == drug.MaxUnit {
+										prescribingNumber := strconv.FormatFloat(advicelist.PrescribingNumber, 'f', -1, 64)
+										prescribingNumberInt, _ := strconv.ParseInt(prescribingNumber, 10, 64)
+										device_number = prescribingNumberInt * drug.MinNumber
+									}
+									if advicelist.PrescribingNumberUnit == drug.MinUnit {
+										prescribingNumber := strconv.FormatFloat(advicelist.PrescribingNumber, 'f', -1, 64)
+										prescribingNumberInt, _ := strconv.ParseInt(prescribingNumber, 10, 64)
+										device_number = prescribingNumberInt
 									}
-								} else {
+
+									var number_count int64
 									if prescribingNumberUnit == drug.MaxUnit {
-										num := prescribing_number * float64(drug.MinNumber)
-										if num > all_count {
+										prescribingNumber := strconv.FormatFloat(advicelist.PrescribingNumber, 'f', -1, 64)
+										prescribingNumberInt, _ := strconv.ParseInt(prescribingNumber, 10, 64)
+										number_count = prescribingNumberInt * drug.MinNumber
+									}
+									if prescribingNumberUnit == drug.MinUnit {
+										prescribingNumber := strconv.FormatFloat(advicelist.PrescribingNumber, 'f', -1, 64)
+										prescribingNumberInt, _ := strconv.ParseInt(prescribingNumber, 10, 64)
+										number_count = prescribingNumberInt
+									}
+									//如果修改的数量大于之前修改的数量
+									if (number_count - device_number) > 0 {
+										//如果修改的差数量 大于库存数量
+										if (number_count - device_number) > total_count {
 											c.ServeDynamicFailJsonSend(drug.DrugName + "库存不足")
-											//c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeOutOfStockParamWrong)
 											return
 										}
 									}
+
+									var sum_count int64
+									//判断是否做过修改
+									if prescribingNumberUnit == drug.MaxUnit {
+
+										prescribingNumberInt, _ := strconv.ParseInt(prescribingNumber, 10, 64)
+
+										sum_count = prescribingNumberInt * drug.MinNumber
+									}
+									if prescribingNumberUnit == drug.MinUnit {
+										prescribingNumberInt, _ := strconv.ParseInt(prescribingNumber, 10, 64)
+										sum_count = prescribingNumberInt
+									}
+									fmt.Println("原先药品记录", device_number)
+									fmt.Println("现在出库数量", sum_count)
+									if device_number != sum_count {
+
+										// 查询该药品最后一次出库记录
+										druginfo, _ := service.GetLastDrugWarehouseOutByDrugId(drug_id, patient_id, recordDateTime)
+										//回退库存
+										if druginfo.CountUnit == drug.MaxUnit && drug.MaxUnit != drug.MinUnit {
+											service.ModefyDrugByWarehouseInfo(druginfo.WarehouseInfoId, druginfo.Count)
+										}
+										if druginfo.CountUnit == drug.MinUnit && drug.MaxUnit != drug.MinUnit {
+											service.ModefyDrugByWarehouseInfoOne(druginfo.WarehouseInfoId, druginfo.Count)
+										}
+
+										if druginfo.CountUnit == drug.MaxUnit && druginfo.CountUnit == drug.MinUnit && drug.MaxUnit == drug.MinUnit {
+											service.ModefyDrugByWarehouseInfo(druginfo.WarehouseInfoId, druginfo.Count)
+										}
+
+										//删除记录
+										service.DeleteDrugAutoWarehouseSeven(drug_id, patient_id, recordDateTime, adviceId)
+									}
+
 								}
 
+								//新增处方
+								if advicelist.ID == 0 {
+									all_count, _ := strconv.ParseFloat(totals, 64)
+									if prescribingNumberUnit == drug.MinUnit {
+										if prescribing_number > all_count {
+											c.ServeDynamicFailJsonSend(drug.DrugName + "库存不足")
+											return
+										}
+									} else {
+										if prescribingNumberUnit == drug.MaxUnit {
+											num := prescribing_number * float64(drug.MinNumber)
+											if num > all_count {
+												c.ServeDynamicFailJsonSend(drug.DrugName + "库存不足")
+												return
+											}
+										}
+									}
+								}
 							}
 						}
 					}
@@ -770,6 +850,7 @@ func (c *HisApiController) CreateHisPrescription() {
 								var project_id int64
 								var project_type int64
 								var totals float64
+								var parsetotal int64
 								if project.(map[string]interface{})["project_id"] != nil || reflect.TypeOf(project.(map[string]interface{})["project_id"]).String() == "float64" {
 									project_id = int64(project.(map[string]interface{})["project_id"].(float64))
 								}
@@ -780,27 +861,53 @@ func (c *HisApiController) CreateHisPrescription() {
 									total, _ := project.(map[string]interface{})["total"].(string)
 
 									totals, _ = strconv.ParseFloat(total, 64)
+									parsetotal, _ = strconv.ParseInt(total, 10, 64)
 								}
 								if project_type == 3 {
-									good, _ := service.FindGoodInfoByIdTwo(project_id)
-									if good.ID == 0 {
-										c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
-										return
-									}
-									//查询耗材库存
-									list, _ := service.GetGoodWarehouseInfo(project_id)
-									var stock_count int64
-									for _, it := range list {
-										stock_count += it.StockCount
-									}
-									stock_counts := strconv.FormatInt(stock_count, 10)
-									stock_total_count, _ := strconv.ParseFloat(stock_counts, 64)
-									if totals > stock_total_count {
-										c.ServeDynamicFailJsonSend(good.GoodName + "库存不足")
 
-										return
-									}
+									//查找该耗材的出库记录
+									goodWarehouseInfo, _ := service.GetAutoRecordByGoodId(project_id, patient_id, recordDateTime)
+									fmt.Println("出库数量00000000000000000000000", parsetotal)
+									fmt.Println("已经出库数量0000000000000000000", goodWarehouseInfo.Count)
+
+									//查询该患者耗材的历史数据
+									ordProject, _ := service.GetHisProjectPrescriptionByPatientId(patient_id, recordDateTime)
+									fmt.Println("长度1", len(ordProject))
+									fmt.Println("新长度", len(projects))
+									if goodWarehouseInfo.ID > 0 {
+										//数量发生改变
+										if parsetotal != goodWarehouseInfo.Count || len(ordProject) != len(projects) {
+											//查找今日该患者已经出库的所有耗材
+											goodList, _ := service.GetAllAutoRecordByPatient(patient_id, recordDateTime)
+											for _, item := range goodList {
+												//回退库存
+												service.ModefyWarehouseInfo(item.Count, item.WarehouseInfotId)
+												//删除记录
+												service.DeleteAutoWarehouse(item.PatientId, item.SysRecordTime)
+											}
+
+										}
 
+									}
+									if goodWarehouseInfo.ID == 0 {
+										good, _ := service.FindGoodInfoByIdTwo(project_id)
+										if good.ID == 0 {
+											c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+											return
+										}
+										//查询耗材库存
+										list, _ := service.GetGoodWarehouseInfo(project_id)
+										var stock_count int64
+										for _, it := range list {
+											stock_count += it.StockCount
+										}
+										stock_counts := strconv.FormatInt(stock_count, 10)
+										stock_total_count, _ := strconv.ParseFloat(stock_counts, 64)
+										if totals > stock_total_count {
+											c.ServeDynamicFailJsonSend(good.GoodName + "库存不足")
+											return
+										}
+									}
 								}
 
 							}
@@ -1478,20 +1585,117 @@ func (c *HisApiController) DeletePrescription() {
 				if stockConfig.IsOpen == 1 {
 					if item.Type == 3 {
 						good, _ := service.FindGoodInfoByIdTwo(item.ProjectId)
-						//cnt, _ := strconv.ParseInt(item.Count, 10, 64)
 						f_count, _ := strconv.ParseFloat(item.Count, 64)
 						good.Total = good.Total + f_count
 						service.UpdateGoodInfo(&good)
-					}
-				}
+						operation_time := time.Now().Unix()
+						creater := c.GetAdminUserInfo().AdminUser.Id
+						//创建退库单
+						timeStr := time.Now().Format("2006-01-02")
+						timeArr := strings.Split(timeStr, "-")
+						total, _ := service.FindAllCancelStockTotal(c.GetAdminUserInfo().CurrentOrgId)
+						total = total + 1
+						orderNumber := "CKTKD" + strconv.FormatInt(c.GetAdminUserInfo().CurrentOrgId, 10) + timeArr[0] + timeArr[1] + timeArr[2] + "000" + strconv.FormatInt(total, 10)
+
+						cancelStock := models.CancelStock{
+							OrderNumber: orderNumber,
+							OperaTime:   operation_time,
+							OrgId:       c.GetAdminUserInfo().CurrentOrgId,
+							Creater:     creater,
+							Ctime:       time.Now().Unix(),
+							Status:      1,
+							ReturnTime:  item.RecordDate,
+							Type:        1,
+						}
+						_, msgerrkonde := service.GetCancelStockDetailByOrderNumberOne(item.RecordDate, c.GetAdminUserInfo().CurrentOrgId)
+						if msgerrkonde == gorm.ErrRecordNotFound {
+							service.AddSigleCancelStock(&cancelStock)
+						}
+						cancel, _ := service.GetLastCancelStockById(c.GetAdminUserInfo().CurrentOrgId)
+						floatPrescrip := strconv.FormatFloat(f_count, 'f', -1, 32)
+						prescribingNumber, _ := strconv.ParseInt(floatPrescrip, 10, 64)
+						//获取该耗材有库存的第一条数据
+						info, _ := service.GetLastWarehoseByGoodId(item.ProjectId, item.PatientId, item.RecordDate)
+
+						manufacturer, _ := service.GetManufactureById(info.Manufacturer)
+						deaerler, _ := service.GetDealerById(info.Dealer)
+						if info.ID > 0 {
+							cancelStockInfo := models.CancelStockInfo{
+								GoodId:          item.ProjectId,
+								CancelStockId:   cancel.ID,
+								GoodTypeId:      info.GoodTypeId,
+								Count:           prescribingNumber,
+								Price:           info.Price,
+								Total:           0,
+								ProductDate:     info.ProductDate,
+								ExpiryDate:      info.ExpiryDate,
+								Ctime:           time.Now().Unix(),
+								Status:          1,
+								OrgId:           c.GetAdminUserInfo().CurrentOrgId,
+								OrderNumber:     cancel.OrderNumber,
+								Type:            0,
+								Dealer:          deaerler.DealerName,
+								Manufacturer:    manufacturer.ManufacturerName,
+								Number:          info.Number,
+								RegisterAccount: "",
+								Remark:          "",
+								WarehouseInfoId: info.WarehouseInfotId,
+							}
+
+							service.CreateCancelStockInfoOne(&cancelStockInfo)
+
+							cancelInfo, _ := service.GetLastCancelStockInfoByGoodId(item.ProjectId)
+
+							flow := models.VmStockFlow{
+								WarehousingId:           0,
+								GoodId:                  item.ProjectId,
+								Number:                  info.Number,
+								LicenseNumber:           info.LicenseNumber,
+								Count:                   prescribingNumber,
+								UserOrgId:               c.GetAdminUserInfo().CurrentOrgId,
+								PatientId:               item.PatientId,
+								SystemTime:              time.Now().Unix(),
+								ConsumableType:          7,
+								IsSys:                   0,
+								WarehousingOrder:        "",
+								WarehouseOutId:          0,
+								WarehouseOutOrderNumber: "",
+								IsEdit:                  0,
+								CancelStockId:           cancel.ID,
+								CancelOrderNumber:       cancel.OrderNumber,
+								Manufacturer:            manufacturer.ID,
+								Dealer:                  0,
+								Creator:                 c.GetAdminUserInfo().CurrentOrgId,
+								UpdateCreator:           0,
+								Status:                  1,
+								Ctime:                   time.Now().Unix(),
+								Mtime:                   0,
+								Price:                   info.Price,
+								WarehousingDetailId:     info.WarehouseInfotId,
+								WarehouseOutDetailId:    0,
+								CancelOutDetailId:       cancelInfo.ID,
+								ProductDate:             info.ProductDate,
+								ExpireDate:              info.ExpiryDate,
+							}
+							service.CreateStockFlowOne(flow)
+
+							//删除出库表
+							service.DeleteAutoRedeceDetailTen(c.GetAdminUserInfo().CurrentOrgId, info.PatientId, info.SysRecordTime, item.ProjectId)
+
+							//回退库存
+							service.UpDateWarehouseInfoByStockDelete(info.WarehouseInfotId, prescribingNumber)
+						}
 
-				if item.Type == 3 { //处理透前准备耗材数量数据
-					consumables, _ := service.FindHisConsumablesByID(item.UserOrgId, item.PatientId, item.RecordDate, item.ProjectId)
-					if consumables.ID > 0 {
-						consumables.Count = 0
-						service.UpdateConsumables(&consumables)
 					}
 				}
+
+				//if item.Type == 3 { //处理透前准备耗材数量数据
+				//	consumables, _ := service.FindHisConsumablesByID(item.UserOrgId, item.PatientId, item.RecordDate, item.ProjectId)
+				//	if consumables.ID > 0 {
+				//		consumables.Count = 0
+				//		service.UpdateConsumables(&consumables)
+				//	}
+				//}
 			}
 		}
 
@@ -1503,6 +1707,224 @@ func (c *HisApiController) DeletePrescription() {
 					keyFive := strconv.FormatInt(item.UserOrgId, 10) + ":" + strconv.FormatInt(item.AdviceDate, 10) + ":his_advices_list_all"
 					redis.Set(keyFive, "", time.Second)
 					redis.Close()
+
+					//查询该药品是否存在出库记录
+					info, errcode := service.GetDrugAutoWarehouseOutSeven(item.PatientId, item.AdviceDate, item.DrugId, item.ID)
+
+					if errcode == gorm.ErrRecordNotFound {
+
+					} else if errcode == nil {
+						if item.PrescribingNumberUnit == drug.MinUnit {
+
+							floatPrescrip := strconv.FormatFloat(item.PrescribingNumber, 'f', -1, 32)
+							prescribingNumber, _ := strconv.ParseInt(floatPrescrip, 10, 64)
+
+							//退库
+							warehouseInfo := models.DrugWarehouseInfo{
+								StockMinNumber: prescribingNumber,
+							}
+
+							service.UpdateDrugWarehouse(info.WarehouseInfoId, warehouseInfo)
+
+							adminUserInfo := c.GetAdminUserInfo()
+							operation_time := time.Now().Unix()
+							creater := adminUserInfo.AdminUser.Id
+
+							ctime := time.Now().Unix()
+							timeStr := time.Now().Format("2006-01-02")
+							timeArr := strings.Split(timeStr, "-")
+							total, _ := service.FindAllDrugCancelStockTotal(adminUserInfo.CurrentOrgId)
+							total = total + 1
+							orderNumber := "CKTKD" + strconv.FormatInt(adminUserInfo.CurrentOrgId, 10) + timeArr[0] + timeArr[1] + timeArr[2] + "000" + strconv.FormatInt(total, 10)
+
+							cancelStock := models.DrugCancelStock{
+								OrderNumber:  orderNumber,
+								OperaTime:    operation_time,
+								OrgId:        adminUserInfo.CurrentOrgId,
+								Creater:      creater,
+								Ctime:        ctime,
+								Status:       1,
+								ReturnTime:   item.AdviceDate,
+								Dealer:       info.Dealer,
+								Manufacturer: info.Manufacturer,
+								Type:         1,
+							}
+							service.AddSigleDrugCancelStock(&cancelStock)
+
+							manufactureName, _ := service.GetManufactureById(info.Manufacturer)
+							dealer, _ := service.GetDealerById(info.Dealer)
+							cancelInfo, _ := service.GetLastDrugCancelStockById(adminUserInfo.CurrentOrgId)
+							cancelStockInfo := models.DrugCancelStockInfo{
+								OrderNumber:      cancelInfo.OrderNumber,
+								CancelStockId:    cancelInfo.ID,
+								DrugId:           info.DrugId,
+								Count:            info.Count,
+								Status:           1,
+								Ctime:            ctime,
+								OrgId:            adminUserInfo.CurrentOrgId,
+								Type:             1,
+								Manufacturer:     manufactureName.ManufacturerName,
+								Dealer:           dealer.DealerName,
+								Total:            0,
+								RetailPrice:      info.RetailPrice,
+								RetailTotalPrice: info.RetailTotalPrice,
+								Price:            info.Price,
+								RegisterAccount:  "",
+								Remark:           info.Remark,
+								BatchNumber:      info.BatchNumber,
+								MaxUnit:          info.CountUnit,
+								ProductDate:      info.ProductDate,
+								ExpiryDate:       info.ExpiryDate,
+								BatchNumberId:    info.WarehouseInfoId,
+							}
+
+							flow := models.DrugFlow{
+								WarehousingId:           0,
+								DrugId:                  info.DrugId,
+								Number:                  "",
+								BatchNumber:             info.BatchNumber,
+								Count:                   info.Count,
+								UserOrgId:               adminUserInfo.CurrentOrgId,
+								PatientId:               0,
+								SystemTime:              ctime,
+								ConsumableType:          7,
+								IsSys:                   0,
+								WarehousingOrder:        "",
+								WarehouseOutId:          0,
+								WarehouseOutOrderNumber: "",
+								IsEdit:                  0,
+								CancelStockId:           cancelStock.ID,
+								CancelOrderNumber:       cancelStock.OrderNumber,
+								Manufacturer:            info.Manufacturer,
+								Dealer:                  info.Dealer,
+								Creator:                 adminUserInfo.AdminUser.Id,
+								UpdateCreator:           0,
+								Status:                  1,
+								Ctime:                   time.Now().Unix(),
+								Mtime:                   0,
+								Price:                   info.Price,
+								WarehousingDetailId:     0,
+								WarehouseOutDetailId:    0,
+								CancelOutDetailId:       0,
+								ExpireDate:              info.ExpiryDate,
+								ProductDate:             info.ProductDate,
+								MaxUnit:                 info.CountUnit,
+								MinUnit:                 "",
+							}
+							service.CreatedCancelStock(cancelStockInfo)
+							service.CreateDrugFlowOne(flow)
+
+							//删除出库记录
+							service.UpdateDrugFlowSeven(info.PatientId, info.SysRecordTime, info.DrugId, item.ID)
+							//删除流水
+							service.UpdateDrugFlowTens(info.PatientId, info.WarehouseOutOrderNumber, info.DrugId, item.ID)
+						} else {
+							floatPrescrip := strconv.FormatFloat(item.PrescribingNumber, 'f', -1, 32)
+
+							prescribingNumber, _ := strconv.ParseInt(floatPrescrip, 10, 64)
+
+							if item.PrescribingNumberUnit == drug.MaxUnit {
+								warehouseInfo := models.DrugWarehouseInfo{
+									StockMaxNumber: prescribingNumber,
+								}
+								service.UpdateDrugWarehouseOne(info.WarehouseInfoId, warehouseInfo)
+
+							}
+
+							adminUserInfo := c.GetAdminUserInfo()
+							operation_time := time.Now().Unix()
+							creater := adminUserInfo.AdminUser.Id
+
+							ctime := time.Now().Unix()
+							timeStr := time.Now().Format("2006-01-02")
+							timeArr := strings.Split(timeStr, "-")
+							total, _ := service.FindAllDrugCancelStockTotal(adminUserInfo.CurrentOrgId)
+							total = total + 1
+							orderNumber := "CKTKD" + strconv.FormatInt(adminUserInfo.CurrentOrgId, 10) + timeArr[0] + timeArr[1] + timeArr[2] + "000" + strconv.FormatInt(total, 10)
+
+							cancelStock := models.DrugCancelStock{
+								OrderNumber:  orderNumber,
+								OperaTime:    operation_time,
+								OrgId:        adminUserInfo.CurrentOrgId,
+								Creater:      creater,
+								Ctime:        ctime,
+								Status:       1,
+								ReturnTime:   item.AdviceDate,
+								Dealer:       info.Dealer,
+								Manufacturer: info.Manufacturer,
+								Type:         1,
+							}
+							service.AddSigleDrugCancelStock(&cancelStock)
+
+							manufactureName, _ := service.GetManufactureById(info.Manufacturer)
+							dealer, _ := service.GetDealerById(info.Dealer)
+							cancelInfo, _ := service.GetLastDrugCancelStockById(adminUserInfo.CurrentOrgId)
+							cancelStockInfo := models.DrugCancelStockInfo{
+								OrderNumber:      cancelInfo.OrderNumber,
+								CancelStockId:    cancelInfo.ID,
+								DrugId:           info.DrugId,
+								Count:            info.Count,
+								Status:           1,
+								Ctime:            ctime,
+								OrgId:            adminUserInfo.CurrentOrgId,
+								Type:             1,
+								Manufacturer:     manufactureName.ManufacturerName,
+								Dealer:           dealer.DealerName,
+								Total:            0,
+								RetailPrice:      info.RetailPrice,
+								RetailTotalPrice: info.RetailTotalPrice,
+								Price:            info.Price,
+								RegisterAccount:  "",
+								Remark:           info.Remark,
+								BatchNumber:      info.BatchNumber,
+								MaxUnit:          info.CountUnit,
+								ProductDate:      info.ProductDate,
+								ExpiryDate:       info.ExpiryDate,
+								BatchNumberId:    info.WarehouseInfoId,
+							}
+
+							flow := models.DrugFlow{
+								WarehousingId:           0,
+								DrugId:                  info.DrugId,
+								Number:                  "",
+								BatchNumber:             info.BatchNumber,
+								Count:                   info.Count,
+								UserOrgId:               adminUserInfo.CurrentOrgId,
+								PatientId:               0,
+								SystemTime:              ctime,
+								ConsumableType:          7,
+								IsSys:                   0,
+								WarehousingOrder:        "",
+								WarehouseOutId:          0,
+								WarehouseOutOrderNumber: "",
+								IsEdit:                  0,
+								CancelStockId:           cancelStock.ID,
+								CancelOrderNumber:       cancelStock.OrderNumber,
+								Manufacturer:            info.Manufacturer,
+								Dealer:                  info.Dealer,
+								Creator:                 adminUserInfo.AdminUser.Id,
+								UpdateCreator:           0,
+								Status:                  1,
+								Ctime:                   time.Now().Unix(),
+								Mtime:                   0,
+								Price:                   info.Price,
+								WarehousingDetailId:     0,
+								WarehouseOutDetailId:    0,
+								CancelOutDetailId:       0,
+								ExpireDate:              info.ExpiryDate,
+								ProductDate:             info.ProductDate,
+								MaxUnit:                 info.CountUnit,
+								MinUnit:                 "",
+							}
+							service.CreatedCancelStock(cancelStockInfo)
+							service.CreateDrugFlowOne(flow)
+							//删除出库记录
+							service.UpdateDrugFlowSeven(info.PatientId, info.SysRecordTime, info.DrugId, item.ID)
+							//删除流水
+							service.UpdateDrugFlowTens(info.PatientId, info.WarehouseOutOrderNumber, info.DrugId, item.ID)
+						}
+					}
+
 					if item.PrescribingNumberUnit == drug.MinUnit {
 						drug.Total = drug.Total + item.PrescribingNumber
 						service.UpdateBaseDrugLib(&drug)
@@ -1513,6 +1935,7 @@ func (c *HisApiController) DeletePrescription() {
 							service.UpdateBaseDrugLib(&drug)
 						}
 					}
+
 				}
 			}
 		}
@@ -1536,13 +1959,17 @@ func (c *HisApiController) DeleteDoctorAdvice() {
 	redis := service.RedisClient()
 	keyFive := strconv.FormatInt(advice.UserOrgId, 10) + ":" + strconv.FormatInt(advice.AdviceDate, 10) + ":his_advices_list_all"
 	redis.Set(keyFive, "", time.Second)
+	keyOne := strconv.FormatInt(advice.UserOrgId, 10) + ":" + strconv.FormatInt(advice.PatientId, 10) + ":" + strconv.FormatInt(advice.AdviceDate, 10) + ":his_doctor_advice"
+	redis.Set(keyOne, "", time.Second)
+
 	redis.Close()
 	if err == nil {
 		if drugStockConfig.IsOpen == 1 {
 			//判断该医嘱是否执行了
 			if advice.ExecutionState == 1 {
+				fmt.Println("advice_id23323232323233232323233223322323", advice.ID)
 				//查询该病人该药品是否有库存记录
-				info, errcode := service.GetDrugAutoWarehouseOut(advice.PatientId, advice.AdviceDate, advice.DrugId)
+				info, errcode := service.GetDrugAutoWarehouseOutSeven(advice.PatientId, advice.AdviceDate, advice.DrugId, advice.ID)
 				if errcode == gorm.ErrRecordNotFound {
 
 				} else {
@@ -1621,7 +2048,7 @@ func (c *HisApiController) DeleteDoctorAdvice() {
 							UserOrgId:               adminUserInfo.CurrentOrgId,
 							PatientId:               0,
 							SystemTime:              ctime,
-							ConsumableType:          4,
+							ConsumableType:          7,
 							IsSys:                   0,
 							WarehousingOrder:        "",
 							WarehouseOutId:          0,
@@ -1647,20 +2074,25 @@ func (c *HisApiController) DeleteDoctorAdvice() {
 						}
 						service.CreatedCancelStock(cancelStockInfo)
 						service.CreateDrugFlowOne(flow)
+
+						//删除出库记录
+						service.UpdateDrugFlowSeven(info.PatientId, info.SysRecordTime, info.DrugId, advice.ID)
+						//删除流水
+						service.UpdateDrugFlowTens(info.PatientId, info.WarehouseOutOrderNumber, info.DrugId, advice.ID)
 					} else {
 
 						floatPrescrip := strconv.FormatFloat(advice.PrescribingNumber, 'f', -1, 32)
 
 						prescribingNumber, _ := strconv.ParseInt(floatPrescrip, 10, 64)
 
-						fmt.Println("PrescribingNumber", prescribingNumber)
 						if advice.PrescribingNumberUnit == drug.MaxUnit {
 							warehouseInfo := models.DrugWarehouseInfo{
-								StockMinNumber: prescribingNumber,
+								StockMaxNumber: prescribingNumber,
 							}
 							service.UpdateDrugWarehouseOne(info.WarehouseInfoId, warehouseInfo)
 
 						}
+
 						adminUserInfo := c.GetAdminUserInfo()
 						operation_time := time.Now().Unix()
 						creater := adminUserInfo.AdminUser.Id
@@ -1722,7 +2154,7 @@ func (c *HisApiController) DeleteDoctorAdvice() {
 							UserOrgId:               adminUserInfo.CurrentOrgId,
 							PatientId:               0,
 							SystemTime:              ctime,
-							ConsumableType:          4,
+							ConsumableType:          7,
 							IsSys:                   0,
 							WarehousingOrder:        "",
 							WarehouseOutId:          0,
@@ -1748,6 +2180,11 @@ func (c *HisApiController) DeleteDoctorAdvice() {
 						}
 						service.CreatedCancelStock(cancelStockInfo)
 						service.CreateDrugFlowOne(flow)
+						//删除出库记录
+						service.UpdateDrugFlowSeven(info.PatientId, info.SysRecordTime, info.DrugId, advice.ID)
+						//删除流水
+						service.UpdateDrugFlowTens(info.PatientId, info.WarehouseOutOrderNumber, info.DrugId, advice.ID)
+
 					}
 				}
 			}
@@ -1768,12 +2205,12 @@ func (c *HisApiController) DeleteProject() {
 	id, _ := c.GetInt64("id")
 	adminInfo := c.GetAdminUserInfo()
 	project, _ := service.GetHisProjectByID(id)
-	var consumable models.DialysisBeforePrepare
+	//	var consumable models.DialysisBeforePrepare
 	_, stockConfig := service.FindAutomaticReduceRecordByOrgId(c.GetAdminUserInfo().CurrentOrgId)
 
-	if project.ID > 0 && project.Type == 3 {
-		consumable, _ = service.FindHisConsumablesByID(adminInfo.CurrentOrgId, project.PatientId, project.RecordDate, project.ProjectId)
-	}
+	//if project.ID > 0 && project.Type == 3 {
+	//	consumable, _ = service.FindHisConsumablesByID(adminInfo.CurrentOrgId, project.PatientId, project.RecordDate, project.ProjectId)
+	//}
 	err := service.DelelteProject(id, c.GetAdminUserInfo().CurrentOrgId)
 	if err == nil {
 		service.DeletePrintInfo(id)
@@ -1787,12 +2224,110 @@ func (c *HisApiController) DeleteProject() {
 				f_count, _ := strconv.ParseFloat(project.Count, 64)
 				good.Total = good.Total + f_count
 				service.UpdateGoodInfo(&good)
+
+				operation_time := time.Now().Unix()
+				creater := adminInfo.AdminUser.Id
+				//创建退库单
+				timeStr := time.Now().Format("2006-01-02")
+				timeArr := strings.Split(timeStr, "-")
+				total, _ := service.FindAllCancelStockTotal(adminInfo.CurrentOrgId)
+				total = total + 1
+				orderNumber := "CKTKD" + strconv.FormatInt(adminInfo.CurrentOrgId, 10) + timeArr[0] + timeArr[1] + timeArr[2] + "000" + strconv.FormatInt(total, 10)
+
+				cancelStock := models.CancelStock{
+					OrderNumber: orderNumber,
+					OperaTime:   operation_time,
+					OrgId:       adminInfo.CurrentOrgId,
+					Creater:     creater,
+					Ctime:       time.Now().Unix(),
+					Status:      1,
+					ReturnTime:  project.RecordDate,
+					Type:        1,
+				}
+				_, msgerrkonde := service.GetCancelStockDetailByOrderNumberOne(project.RecordDate, adminInfo.CurrentOrgId)
+				if msgerrkonde == gorm.ErrRecordNotFound {
+					service.AddSigleCancelStock(&cancelStock)
+				}
+				cancel, _ := service.GetLastCancelStockById(adminInfo.CurrentOrgId)
+				floatPrescrip := strconv.FormatFloat(f_count, 'f', -1, 32)
+				prescribingNumber, _ := strconv.ParseInt(floatPrescrip, 10, 64)
+				//获取该耗材有库存的第一条数据
+				info, _ := service.GetLastWarehoseByGoodId(project.ProjectId, project.PatientId, project.RecordDate)
+
+				manufacturer, _ := service.GetManufactureById(info.Manufacturer)
+				deaerler, _ := service.GetDealerById(info.Dealer)
+				if info.ID > 0 {
+					cancelStockInfo := models.CancelStockInfo{
+						GoodId:          project.ProjectId,
+						CancelStockId:   cancel.ID,
+						GoodTypeId:      info.GoodTypeId,
+						Count:           prescribingNumber,
+						Price:           info.Price,
+						Total:           0,
+						ProductDate:     info.ProductDate,
+						ExpiryDate:      info.ExpiryDate,
+						Ctime:           time.Now().Unix(),
+						Status:          1,
+						OrgId:           adminInfo.CurrentOrgId,
+						OrderNumber:     cancel.OrderNumber,
+						Type:            0,
+						Dealer:          deaerler.DealerName,
+						Manufacturer:    manufacturer.ManufacturerName,
+						Number:          info.Number,
+						RegisterAccount: "",
+						Remark:          "",
+						WarehouseInfoId: info.WarehouseInfotId,
+					}
+
+					service.CreateCancelStockInfoOne(&cancelStockInfo)
+
+					cancelInfo, _ := service.GetLastCancelStockInfoByGoodId(project.ProjectId)
+
+					flow := models.VmStockFlow{
+						WarehousingId:           0,
+						GoodId:                  project.ProjectId,
+						Number:                  info.Number,
+						LicenseNumber:           info.LicenseNumber,
+						Count:                   prescribingNumber,
+						UserOrgId:               adminInfo.CurrentOrgId,
+						PatientId:               project.PatientId,
+						SystemTime:              time.Now().Unix(),
+						ConsumableType:          7,
+						IsSys:                   0,
+						WarehousingOrder:        "",
+						WarehouseOutId:          0,
+						WarehouseOutOrderNumber: "",
+						IsEdit:                  0,
+						CancelStockId:           cancel.ID,
+						CancelOrderNumber:       cancel.OrderNumber,
+						Manufacturer:            manufacturer.ID,
+						Dealer:                  0,
+						Creator:                 adminInfo.AdminUser.Id,
+						UpdateCreator:           0,
+						Status:                  1,
+						Ctime:                   time.Now().Unix(),
+						Mtime:                   0,
+						Price:                   info.Price,
+						WarehousingDetailId:     info.WarehouseInfotId,
+						WarehouseOutDetailId:    0,
+						CancelOutDetailId:       cancelInfo.ID,
+						ProductDate:             info.ProductDate,
+						ExpireDate:              info.ExpiryDate,
+					}
+					service.CreateStockFlowOne(flow)
+
+					//删除出库表
+					service.DeleteAutoRedeceDetailTen(adminInfo.CurrentOrgId, info.PatientId, info.SysRecordTime, project.ProjectId)
+
+					//回退库存
+					service.UpDateWarehouseInfoByStockDelete(info.WarehouseInfotId, prescribingNumber)
+				}
 			}
 		}
-		if consumable.ID > 0 {
-			consumable.Count = 0
-			service.UpdateConsumables(&consumable)
-		}
+		//if consumable.ID > 0 {
+		//	consumable.Count = 0
+		//	service.UpdateConsumables(&consumable)
+		//}
 
 		c.ServeSuccessJSON(map[string]interface{}{
 			"msg": "删除成功",
@@ -6067,3 +6602,13 @@ func DeleteDrugWarehosueInfo(advice models.HisDoctorAdviceInfo) (err error) {
 	}
 	return err
 }
+
+func (c *HisApiController) GetHisDoctorAdviceInfo() {
+
+	id, _ := c.GetInt64("id")
+	advice, _ := service.GetHisDoctorAdviceInfo(id)
+	c.ServeSuccessJSON(map[string]interface{}{
+		"advice": advice,
+	})
+	return
+}

controllers/mobile_api_controllers/dialysis_api_controller.go

@@ -196,9 +196,10 @@ func (this *DialysisAPIController) Scheduals() {
 
 			list, err := service.MobileGetDialysisGoodsSix(orgID, date.Unix())
 
+			autoList, _ := service.GetMobileAutoReduce(orgID, date.Unix())
 			for _, item := range goodList {
 				for _, it := range list {
-					if item.RecordDate == it.RecordDate && it.PatientId == it.PatientId {
+					if item.RecordDate == it.RecordDate && item.PatientId == it.PatientId {
 						item.Children = append(item.Children, it)
 					}
 				}
@@ -209,6 +210,7 @@ func (this *DialysisAPIController) Scheduals() {
 				"scheduals": scheduals,
 				"project":   project,
 				"goodList":  goodList,
+				"autoList":  autoList,
 			})
 		}
 
@@ -231,17 +233,19 @@ func (this *DialysisAPIController) Scheduals() {
 
 		for _, item := range goodList {
 			for _, it := range list {
-				if item.RecordDate == it.RecordDate && it.PatientId == it.PatientId {
+				if item.RecordDate == it.RecordDate && item.PatientId == it.PatientId {
 					item.Children = append(item.Children, it)
 				}
 			}
 		}
+		autoList, _ := service.GetMobileAutoReduce(orgID, date.Unix())
 		this.ServeSuccessJSON(map[string]interface{}{
 			"scheduals": dat,
 			"redis":     "true",
 			"date":      schedualDate,
 			"project":   project,
 			"goodList":  goodList,
+			"autoList":  autoList,
 		})
 
 	}
@@ -567,6 +571,20 @@ func (this *DialysisAPIController) DialysisRecord() {
 		// 先走redis，没有走数据库
 		his_advices, _ = service.GetAllHisDoctorAdvice(adminInfo.Org.Id, patientID, date.Unix())
 	}
+
+	//获取今日透析准备的数据
+	goodList, _ := service.MobileGetDialysisGoodsSeven(adminInfo.Org.Id, date.Unix())
+	list, _ := service.MobileGetDialysisGoodsSix(adminInfo.Org.Id, date.Unix())
+
+	autoList, _ := service.GetMobileAutoReduce(adminInfo.Org.Id, date.Unix())
+	for _, item := range goodList {
+		for _, it := range list {
+			if item.RecordDate == it.RecordDate && item.PatientId == it.PatientId {
+				item.Children = append(item.Children, it)
+			}
+		}
+	}
+
 	returnData := map[string]interface{}{
 		"patient":                        patient,
 		"schedual":                       schedual,
@@ -597,6 +615,8 @@ func (this *DialysisAPIController) DialysisRecord() {
 		"is_project_open_config":         is_project_open_config,
 		"project":                        projects,
 		"team_projects":                  team_projects,
+		"goodList":                       goodList,
+		"autoList":                       autoList,
 	}
 	this.ServeSuccessJSON(returnData)
 }
@@ -693,16 +713,6 @@ func (c *DialysisAPIController) PostAtreatmentInfo() {
 			"summary": summary,
 		})
 	} else { //修改
-		//if treatmentSummary.Creater != adminUserInfo.AdminUser.Id {
-		//	headNursePermission, getPermissionErr := service.GetAdminUserSpecialPermission(adminUserInfo.Org.Id, adminUserInfo.App.Id, adminUserInfo.AdminUser.Id, models.SpecialPermissionTypeHeadNurse)
-		//	if getPermissionErr != nil {
-		//		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
-		//		return
-		//	} else if headNursePermission == nil {
-		//		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDialysisPermissionDeniedModify)
-		//		return
-		//	}
-		//}
 
 		summary.Creater = treatmentSummary.Creater
 		summary.CreatedTime = treatmentSummary.CreatedTime
@@ -4520,7 +4530,9 @@ func (c *DialysisAPIController) GetDialysisGoods() {
 		if patient_id != 0 {
 			for _, item := range dialysisGoods { //获取当天排班的每个患者的最后日期的库存使用情况
 				goodUser, _ := service.GetLastDialysisGoods(item.PatientId, adminUser.Org.Id, date.Unix())
+
 				lastGoodUserDetial, _ := service.GetLastDialysisBeforePrepare(item.PatientId, adminUser.Org.Id, date.Unix())
+				fmt.Println("GOOD333232323223322332232332232323322323", lastGoodUserDetial)
 				item.LastAutomaticReduceDetail = goodUser
 				item.LastDialysisBeforePrepare = lastGoodUserDetial
 				item.Project = project

controllers/mobile_api_controllers/patient_api_controller.go

@@ -655,7 +655,6 @@ func (c *PatientApiController) ExecDoctorAdvice() {
 			theTime := toTime.Format("2006-01-02")
 			fmt.Println("theTIME", theTime)
 			keyFour := "scheduals_" + theTime + "_" + strconv.FormatInt(adminUserInfo.Org.Id, 10)
-			fmt.Println("keyFour323223323232323232", keyFour)
 			redis.Set(keyFour, "", time.Second)
 			keySix := strconv.FormatInt(adminUserInfo.Org.Id, 10) + ":" + strconv.FormatInt(advice.AdviceDate, 10) + ":his_advices_list_all"
 			redis.Set(keySix, "", time.Second)
@@ -1031,6 +1030,41 @@ func (c *PatientApiController) ExecDoctorAdvice() {
 					fmt.Println("数量一", prescribing_number_total)
 					fmt.Println("数量二", total)
 
+					//查询该药品的医嘱记录
+					//advicelist, _ := service.GetHisAdviceListByDrugId(advice.DrugId, advice.PatientId, advice.AdviceDate)
+					//if(advicelist.ID > 0){
+					//  //获取上一次的出库记录
+					//  record, _ := service.GetDrugAutoReduceRecordOne(advice.DrugId, advice.PatientId, advice.AdviceDate)
+					//  var out_count int64
+					//  for _, res := range record {
+					//    if(res.CountUnit == medical.MaxUnit){
+					//      res.Count = res.Count * medical.MinNumber
+					//    }
+					//    if(res.CountUnit == medical.MinUnit){
+					//      res.Count = res.Count
+					//    }
+					//    out_count += res.Count
+					//  }
+					//  if((prescribing_number_total - out_count) > 0){
+					//
+					//    if((prescribing_number_total - out_count) > total){
+					//      c.ServeSuccessJSON(map[string]interface{}{
+					//        "msg":    "2",
+					//        "advice": advice,
+					//        "ids":    ids,
+					//      })
+					//      return
+					//
+					//    }else{
+					//      service.HisDrugsDelivery(adminInfo.Org.Id, creater, &advice)
+					//      break
+					//    }
+					//  }else{
+					//    service.HisDrugsDelivery(adminInfo.Org.Id, creater, &advice)
+					//    break
+					//  }
+					//}
+
 					if (list.Count*medical.MinNumber + list.StockMinNumber) == 0 {
 						c.ServeSuccessJSON(map[string]interface{}{
 							"msg":    "3",
@@ -1049,8 +1083,8 @@ func (c *PatientApiController) ExecDoctorAdvice() {
 					}
 					if prescribing_number_total <= total {
 						service.HisDrugsDelivery(adminInfo.Org.Id, creater, &advice)
-
 					}
+
 				}
 			}
 			for _, item := range advices {

controllers/schedule_api_controller.go

@@ -970,7 +970,7 @@ func (this *ScheduleApiController) ExportSchedule() {
 	end_time := dataBody["end_time"].(string)
 
 	delete_type := int64(dataBody["delete_type"].(float64))
-
+	fmt.Println("delete_type", delete_type)
 	timeLayout := "2006-01-02"
 	loc, _ := time.LoadLocation("Local")
 	theTimeStart, err := time.ParseInLocation(timeLayout+" 15:04:05", start_time+" 00:00:00", loc)
@@ -1413,43 +1413,46 @@ func (this *ScheduleApiController) ExportSchedule() {
 		errLogs, _ := service.FindSchedualExportLog(this.GetAdminUserInfo().CurrentOrgId, export_time)
 
 		if len(schedules) > 0 {
-			//schedule_date := time.Now().Format("2006-01-02")
-			//date, _ := utils.ParseTimeStringToTime("2006-01-02", schedule_date)
-			//clear_schedule_date := date.Unix() //根据日期去清除，该日期未来的排班数据
-			//err := service.UpdateScheduleStatus(clear_schedule_date, this.GetAdminUserInfo().CurrentOrgId)
+			schedule_date := time.Now().Format("2006-01-02")
+			date, _ := utils.ParseTimeStringToTime("2006-01-02", schedule_date)
+			clear_schedule_date := date.Unix() //根据日期去清除，该日期未来的排班数据
+			//	err := service.UpdateScheduleStatus(clear_schedule_date, this.GetAdminUserInfo().CurrentOrgId)
 			if err == nil {
 				//清除该机构的排班
-				if delete_type == 1 {
-					service.ModeScheduleByTimeOne(theTimeStart.Unix(), theTimeEnd.Unix(), this.GetAdminUserInfo().CurrentOrgId)
-				}
-				if delete_type == 0 {
-					service.ModeScheduleByTime(theTimeStart.Unix(), theTimeEnd.Unix(), this.GetAdminUserInfo().CurrentOrgId)
-				}
+				//if delete_type == 1 {
+				//  service.ModeScheduleByTimeOne(theTimeStart.Unix(), theTimeEnd.Unix(), this.GetAdminUserInfo().CurrentOrgId)
+				//}
+				//if delete_type == 0 {
+				//  service.ModeScheduleByTime(theTimeStart.Unix(), theTimeEnd.Unix(), this.GetAdminUserInfo().CurrentOrgId)
+				//}
 
 				for _, item := range schedules {
-					//删除当天的日期排班
-					/*service.DeleteScheduleExist(item.ScheduleDate, item.UserOrgId)*/
-					//查找当天日期是否存在
-					_, errcode := service.GetTodayScheduleIsExistOne(item.PatientId, item.ScheduleDate, item.UserOrgId)
-					if errcode == gorm.ErrRecordNotFound {
-						//清除当天该床位已有的患者
-						// service.ModeFyScheduleById(item.ScheduleDate,item.BedId,item.ScheduleType)
-						service.CreateSchedule(item)
-					} else if errcode == nil {
-						schedule := models.XtSchedule{
-							PartitionId:  item.PartitionId,
-							BedId:        item.BedId,
-							PatientId:    item.PatientId,
-							ScheduleDate: item.ScheduleDate,
-							ScheduleType: item.ScheduleType,
-							ScheduleWeek: item.ScheduleWeek,
-							ModeId:       item.ModeId,
-							Status:       1,
+					// fmt.Println("clear_schedule_date3232232332232332232323",clear_schedule_date)
+					if item.ScheduleDate > clear_schedule_date {
+						//删除当天的以后日期排班
+						// service.DeleteScheduleExist(item.ScheduleDate, item.UserOrgId)
+						//查找当天日期是否存在
+						_, errcode := service.GetTodayScheduleIsExistOne(item.PatientId, item.ScheduleDate, item.UserOrgId)
+						if errcode == gorm.ErrRecordNotFound {
+
+							//清除当天该床位已有的患者
+							service.ModeFyScheduleById(item.ScheduleDate, item.BedId, item.ScheduleType)
+							service.CreateSchedule(item)
+						} else if errcode == nil {
+							schedule := models.XtSchedule{
+								PartitionId:  item.PartitionId,
+								BedId:        item.BedId,
+								PatientId:    item.PatientId,
+								ScheduleDate: item.ScheduleDate,
+								ScheduleType: item.ScheduleType,
+								ScheduleWeek: item.ScheduleWeek,
+								ModeId:       item.ModeId,
+								Status:       1,
+							}
+
+							service.UpdateScheduleByOrgIdOne(item.PatientId, item.ScheduleDate, item.UserOrgId, &schedule)
 						}
-
-						service.UpdateScheduleByOrgIdOne(item.PatientId, item.ScheduleDate, item.UserOrgId, &schedule)
 					}
-
 				}
 
 				log := models.ExportLog{

models/dialysis.go

@@ -1013,20 +1013,21 @@ type UserAdminRoles struct {
 }
 
 type DialysisBeforePrepare struct {
-	ID           int64  `gorm:"column:id" json:"id" form:"id"`
-	UserOrgId    int64  `gorm:"column:user_org_id" json:"user_org_id" form:"user_org_id"`
-	PatientId    int64  `gorm:"column:patient_id" json:"patient_id" form:"patient_id"`
-	RecordDate   int64  `gorm:"column:record_date" json:"record_date" form:"record_date"`
-	GoodId       int64  `gorm:"column:good_id" json:"good_id" form:"good_id"`
-	GoodTypeId   int64  `gorm:"column:good_type_id" json:"good_type_id" form:"good_type_id"`
-	Count        int64  `gorm:"column:count" json:"count" form:"count"`
-	Ctime        int64  `gorm:"column:ctime" json:"ctime" form:"ctime"`
-	Mtime        int64  `gorm:"column:mtime" json:"mtime" form:"mtime"`
-	Creater      int64  `gorm:"column:creater" json:"creater" form:"creater"`
-	Modifier     int64  `gorm:"column:modifier" json:"modifier" form:"modifier"`
-	Status       int64  `gorm:"column:status" json:"status" form:"status"`
-	CommdityCode string `gorm:"column:commdity_code" json:"commdity_code" form:"commdity_code"`
-	NewCount     int64  `gorm:"column:new_count" json:"new_count" form:"new_count"`
+	ID           int64                    `gorm:"column:id" json:"id" form:"id"`
+	UserOrgId    int64                    `gorm:"column:user_org_id" json:"user_org_id" form:"user_org_id"`
+	PatientId    int64                    `gorm:"column:patient_id" json:"patient_id" form:"patient_id"`
+	RecordDate   int64                    `gorm:"column:record_date" json:"record_date" form:"record_date"`
+	GoodId       int64                    `gorm:"column:good_id" json:"good_id" form:"good_id"`
+	GoodTypeId   int64                    `gorm:"column:good_type_id" json:"good_type_id" form:"good_type_id"`
+	Count        int64                    `gorm:"column:count" json:"count" form:"count"`
+	Ctime        int64                    `gorm:"column:ctime" json:"ctime" form:"ctime"`
+	Mtime        int64                    `gorm:"column:mtime" json:"mtime" form:"mtime"`
+	Creater      int64                    `gorm:"column:creater" json:"creater" form:"creater"`
+	Modifier     int64                    `gorm:"column:modifier" json:"modifier" form:"modifier"`
+	Status       int64                    `gorm:"column:status" json:"status" form:"status"`
+	CommdityCode string                   `gorm:"column:commdity_code" json:"commdity_code" form:"commdity_code"`
+	NewCount     int64                    `gorm:"column:new_count" json:"new_count" form:"new_count"`
+	Children     []*DialysisBeforePrepare `gorm:"column:children" json:"children" form:"children"`
 }
 
 func (DialysisBeforePrepare) TableName() string {

models/drug_stock.go

@@ -137,6 +137,7 @@ type DrugWarehouseOutInfo struct {
 	BatchNumber             string  `gorm:"column:batch_number" json:"batch_number" form:"batch_number"`
 	PatientId               int64   `gorm:"column:patient_id" json:"patient_id" form:"patient_id"`
 	WarehouseInfoId         int64   `gorm:"column:warehouse_info_id" json:"warehouse_info_id" form:"warehouse_info_id"`
+	AdviceId                int64   `gorm:"column:advice_id" json:"advice_id" form:"advice_id"`
 }
 
 func (DrugWarehouseOutInfo) TableName() string {
@@ -259,6 +260,8 @@ type DrugAutomaticReduceDetail struct {
 	DrugId                  int64  `gorm:"column:drug_id" json:"drug_id" form:"drug_id"`
 	Count                   int64  `gorm:"column:count" json:"count" form:"count"`
 	CountUnit               string `gorm:"column:count_unit" json:"count_unit" form:"count_unit"`
+	WarehouseInfoId         int64  `gorm:"column:warehouse_info_id" json:"warehouse_info_id" form:"warehouse_info_id"`
+	AdviceId                int64  `gorm:"column:advice_id" json:"advice_id" form:"advice_id"`
 }
 
 func (DrugAutomaticReduceDetail) TableName() string {
@@ -367,6 +370,7 @@ type DrugFlow struct {
 	LastStockMinNumber      int64                `gorm:"column:last_stock_min_number" json:"last_stock_min_number" form:"last_stock_min_number"`
 	DrugWarehouseInfo       []*DrugWarehouseInfo `gorm:"ForeignKey:DrugId;AssociationForeignKey:DrugId" `
 	BaseDrugLib             BaseDrugLib          `gorm:"ForeignKey:ID;AssociationForeignKey:DrugId" `
+	AdviceId                int64                `gorm:"column:advice_id" json:"advice_id" form:"advice_id"`
 }
 
 func (DrugFlow) TableName() string {

service/gobal_config_service.go

@@ -794,7 +794,7 @@ func GetAllCountList(startime int64, endtime int64, orgid int64) (info []*models
 
 func GetSingleOrderDetail(id int64, orgid int64) (info []*models.VmDrugWarehouseOutInfo, err error) {
 
-	db := XTReadDB().Table("xt_drug_warehouse_out_info as x").Where("x.status = 1")
+	db := XTReadDB().Table("xt_drug_warehouse_out_info as x").Where("x.status = 1 and x.count>0")
 	table := XTReadDB().Table("xt_base_drug as t").Where("t.status = 1")
 	fmt.Println(table)
 	if orgid > 0 {

service/his_service.go

@@ -2224,3 +2224,11 @@ func CreateHisLabelRecord(label *models.HisLabelPrintInfo) error {
 	err := writeDb.Save(&label).Error
 	return err
 }
+
+func GetHisDoctorAdviceInfo(id int64) (models.HisDoctorAdviceInfo, error) {
+
+	info := models.HisDoctorAdviceInfo{}
+
+	err := readDb.Model(&info).Where("id = ? and status = 1", id).Preload("Drug", "status = 1").Find(&info).Error
+	return info, err
+}

service/manage_center_service.go

@@ -185,6 +185,18 @@ func GetDrugAutoWarehouseOut(patient_id int64, advicedate int64, drugid int64) (
 	return &detail, nil
 }
 
+func GetDrugAutoWarehouseOutSeven(patient_id int64, advicedate int64, drugid int64, adviceid int64) (*models.DrugWarehouseOutInfo, error) {
+	detail := models.DrugWarehouseOutInfo{}
+	err := XTReadDB().Model(&detail).Where("patient_id = ? and sys_record_time =? and drug_id = ? and status = 1 and advice_id = ?", patient_id, advicedate, drugid, adviceid).Find(&detail).Error
+	if err == gorm.ErrRecordNotFound {
+		return nil, err
+	}
+	if err != nil {
+		return nil, err
+	}
+	return &detail, nil
+}
+
 func UpdateDrugWarehouse(id int64, info models.DrugWarehouseInfo) error {
 	err := writeDb.Model(&models.DrugWarehouseInfo{}).Where("id = ?", id).UpdateColumn("stock_min_number", gorm.Expr("stock_min_number + ?", info.StockMinNumber)).Error
 	return err

service/mobile_dialysis_service.go

@@ -2758,7 +2758,7 @@ func GetLastDialysisGoods(patient_id int64, orgID int64, record_time int64) (goo
 
 	err = readDb.Model(&AutomaticReduceDetail{}).Where("patient_id = ? AND org_id = ? AND status=1 AND record_time < ? AND count > 0", patient_id, orgID, record_time).Select("record_time").Group("record_time").Order("record_time asc").Scan(&Id).Error
 	if len(Id) > 0 {
-
+		fmt.Println("ids232323223322233233233322332", Id)
 		err = readDb.Model(&AutomaticReduceDetail{}).Where("patient_id = ? AND org_id = ? AND status=1 AND record_time = ? AND count > 0", patient_id, orgID, Id[len(Id)-1].RecordTime).Preload("VMGoodInfo", "status = 1 AND org_id = ? ", orgID).Preload("GoodsType", "status = 1 AND (org_id = ? OR org_id = 0)  ", orgID).Find(&goodUser).Error
 	}
 	return
@@ -3610,3 +3610,9 @@ func MobileGetDialysisGoodsSix(orgID int64, scheduleDate int64) (prepare []*mode
 	err = readDb.Where("user_org_id = ? AND status=1 AND record_date < ? AND count > 0", orgID, scheduleDate).Select("patient_id,good_id,record_date").Find(&prepare).Error
 	return prepare, err
 }
+
+func GetMobileAutoReduce(orgID int64, scheduleDate int64) (auto []*models.AutomaticReduceDetail, err error) {
+
+	err = readDb.Where("org_id = ? and status = 1 and record_time = ?", orgID, scheduleDate).Find(&auto).Error
+	return auto, err
+}

service/stock_service.go

@@ -638,6 +638,26 @@ func CreateDrugFlowOne(flow models.DrugFlow) error {
 	return err
 }
 
+func UpdateDrugFlowSeven(patientid int64, recorddate int64, drugid int64, advice_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 =?", patientid, recorddate, drugid, advice_id).Updates(map[string]interface{}{"status": 0}).Error
+	return detail, err
+}
+
+func UpdateDrugFlowTens(patientid int64, warehouse_out_number string, drug_id int64, advice_id int64) (models.DrugFlow, error) {
+	flow := models.DrugFlow{}
+	err := XTWriteDB().Model(&flow).Where("patient_id =? and warehouse_out_order_number = ? and drug_id = ? and status = 1 and advice_id =?", patientid, warehouse_out_number, drug_id, advice_id).Updates(map[string]interface{}{"status": 0}).Error
+	return flow, err
+}
+
+func UpdateDrugFlowTen(patientid int64, warehouse_out_number string, drug_id int64) (models.DrugFlow, error) {
+	flow := models.DrugFlow{}
+	err := XTWriteDB().Model(&flow).Where("patient_id =? and warehouse_out_order_number = ? and drug_id = ? and status = 1", patientid, warehouse_out_number, drug_id).Updates(map[string]interface{}{"status": 0}).Error
+	return flow, err
+}
+
 func CreateDrugFlowTwo(flow *models.DrugFlow) error {
 
 	err := XTWriteDB().Create(&flow).Error
@@ -2524,7 +2544,7 @@ func FindStockInDetailList(orgId int64, page int64, limit int64, startTime int64
 		//db = db.Joins("join xt_manufacturer on xt_manufacturer.id = xt_warehouse.manufacturer")
 		//db = db.Where(" sgj_user_admin_role.user_name LIKE ?", likeKey).Group("xt_warehouse_info.id")
 
-		db = db.Where(" sgj_user_admin_role.user_name LIKE ? OR xt_warehouse_info.warehousing_order LIKE ? OR xt_good_information.specification_name LIKE ?", likeKey, likeKey, likeKey).Group("xt_warehouse_info.id")
+		db = db.Where(" sgj_user_admin_role.user_name LIKE ? OR xt_warehouse_info.warehousing_order LIKE ? OR xt_good_information.specification_name LIKE ?  OR xt_good_information.good_name LIKE ?", likeKey, likeKey, likeKey, likeKey).Group("xt_warehouse_info.id")
 	} else {
 		db = db.Joins("join xt_warehouse on xt_warehouse.id = xt_warehouse_info.warehousing_id AND xt_warehouse.warehousing_time >=? AND xt_warehouse.warehousing_time<= ? AND xt_warehouse.status = 1 AND xt_warehouse.org_id = ?", startTime, endTime, orgId)
 	}
@@ -2593,7 +2613,7 @@ func FindStockOutDetailList(orgId int64, page int64, limit int64, startTime int6
 		db = db.Joins("join sgj_users.sgj_user_admin_role on sgj_user_admin_role.admin_user_id = xt_warehouse_out.creater")
 		db = db.Joins("join xt_good_information on xt_good_information.id = xt_warehouse_out_info.good_id")
 
-		db = db.Where("sgj_user_admin_role.user_name LIKE ? OR xt_warehouse_out_info.warehouse_out_order_number LIKE ?  OR xt_good_information.specification_name LIKE ?", likeKey, likeKey, likeKey).Group("xt_warehouse_out_info.id")
+		db = db.Where("sgj_user_admin_role.user_name LIKE ? OR xt_warehouse_out_info.warehouse_out_order_number LIKE ?  OR xt_good_information.specification_name LIKE ?  OR xt_good_information.good_name LIKE ?", likeKey, likeKey, likeKey, likeKey).Group("xt_warehouse_out_info.id")
 	} else {
 		db = db.Joins("join xt_warehouse_out on xt_warehouse_out.id = xt_warehouse_out_info.warehouse_out_id AND xt_warehouse_out.warehouse_out_time >=? AND xt_warehouse_out.warehouse_out_time<= ? AND xt_warehouse_out.status = 1 AND xt_warehouse_out.org_id = ?", startTime, endTime, orgId)
 	}
@@ -2660,7 +2680,7 @@ func FindSalesReturnDetailList(orgId int64, page int64, limit int64, startTime i
 		db = db.Joins("join sgj_users.sgj_user_admin_role on sgj_user_admin_role.admin_user_id = xt_sales_return.creater")
 		db = db.Joins("join xt_good_information on xt_good_information.id = xt_sales_return_info.good_id")
 
-		db = db.Where("sgj_user_admin_role.user_name LIKE ? OR xt_sales_return_info.order_number LIKE ? OR xt_good_information.specification_name LIKE ?", likeKey, likeKey, likeKey).Group("xt_sales_return_info.id")
+		db = db.Where("sgj_user_admin_role.user_name LIKE ? OR xt_sales_return_info.order_number LIKE ? OR xt_good_information.specification_name LIKE ? OR xt_good_information.good_name LIKE ?", likeKey, likeKey, likeKey, likeKey).Group("xt_sales_return_info.id")
 	} else {
 		db = db.Joins("join xt_sales_return on xt_sales_return.id = xt_sales_return_info.sales_return_id AND xt_sales_return.return_time >=? AND xt_sales_return.return_time<= ? AND xt_sales_return.status = 1 AND xt_sales_return.org_id = ?", startTime, endTime, orgId)
 	}
@@ -2721,7 +2741,7 @@ func FindCancelDetailList(orgId int64, page int64, limit int64, startTime int64,
 		db = db.Joins("join sgj_users.sgj_user_admin_role on sgj_user_admin_role.admin_user_id = xt_cancel_stock.creater")
 		db = db.Joins("join xt_good_information on xt_good_information.id = xt_cancel_stock_info.good_id")
 
-		db = db.Where("sgj_user_admin_role.user_name LIKE ? OR xt_cancel_stock_info.order_number LIKE ? OR xt_good_information.specification_name LIKE ?", likeKey, likeKey, likeKey).Group("xt_cancel_stock_info.id")
+		db = db.Where("sgj_user_admin_role.user_name LIKE ? OR xt_cancel_stock_info.order_number LIKE ? OR xt_good_information.specification_name LIKE ? OR xt_good_information.good_name LIKE ?", likeKey, likeKey, likeKey, likeKey).Group("xt_cancel_stock_info.id")
 	} else {
 		db = db.Joins("join xt_cancel_stock on xt_cancel_stock.id = xt_cancel_stock_info.cancel_stock_id AND xt_cancel_stock.return_time >=? AND xt_cancel_stock.return_time<= ? ", startTime, endTime)
 	}
@@ -3505,6 +3525,39 @@ func GetAutoDialysisBefor(goodid int64, goodtypeid int64, patientid int64, orgid
 	return &autoreduece, nil
 }
 
+func GetAutoRecordByGoodId(goodid int64, patientid int64, recorddate int64) (models.WarehouseOutInfo, error) {
+	detail := models.WarehouseOutInfo{}
+	err := XTReadDB().Model(&detail).Where("good_id = ? and patient_id = ? and sys_record_time = ? and status = 1", goodid, patientid, recorddate).Find(&detail).Error
+	return detail, err
+}
+
+func GetHisProjectPrescriptionByPatientId(patientid int64, recorddate int64) (project []*models.HisPrescriptionProject, err error) {
+
+	err = XTReadDB().Model(&project).Where("patient_id = ? and record_date = ? and status =1", patientid, recorddate).Find(&project).Error
+	return project, err
+}
+
+func GetAllAutoRecordByPatient(patientid int64, recorddate int64) (auto []*models.WarehouseOutInfo, err error) {
+
+	err = XTReadDB().Model(&auto).Where("patient_id = ? and sys_record_time = ? and status = 1", patientid, recorddate).Find(&auto).Error
+	return auto, err
+}
+
+func ModefyWarehouseInfo(count int64, id int64) error {
+
+	err := XTWriteDB().Model(models.WarehousingInfo{}).Where(" id =? and status = 1", id).UpdateColumn("stock_count", gorm.Expr("stock_count + ?", count)).Error
+	return err
+}
+
+func DeleteAutoWarehouse(patient_id int64, record_time int64) error {
+
+	err := XTWriteDB().Model(models.AutomaticReduceDetail{}).Where("patient_id = ? and record_time = ? and status = 1", patient_id, record_time).Updates(map[string]interface{}{"status": 0}).Error
+	err = XTWriteDB().Model(models.DialysisBeforePrepare{}).Where("patient_id = ? and record_date = ? and status = 1", patient_id, record_time).Updates(map[string]interface{}{"status": 0}).Error
+	err = XTWriteDB().Model(models.WarehouseOutInfo{}).Where("patient_id = ? and sys_record_time =? and status = 1", patient_id, record_time).Updates(map[string]interface{}{"status": 0}).Error
+	err = XTWriteDB().Model(models.VmStockFlow{}).Where("patient_id = ? and system_time = ? and status = 1", patient_id, record_time).Updates(map[string]interface{}{"status": 0}).Error
+	return err
+}
+
 func FindGoodInfoByIdTwo(id int64) (goodInfo models.GoodInfo, err error) {
 	err = readDb.Model(&models.GoodInfo{}).Where("id = ? AND status = 1", id).First(&goodInfo).Error
 	return
@@ -4492,7 +4545,7 @@ func GetStockGoodCount(good_id int64) (models.WarehousingInfo, error) {
 func GetDrugFlow(drugid int64, orgid int64, limit int64, page int64, startTime int64, endTime int64, stock_type int64) (drug_flow []*models.DrugFlow, total int64, err error) {
 
 	offset := (page - 1) * limit
-	db := XTReadDB().Model(drug_flow)
+	db := XTReadDB().Model(drug_flow).Where("status = 1")
 	if drugid > 0 {
 		db = db.Where("drug_id = ?", drugid)
 	}
@@ -4550,6 +4603,13 @@ func GetDrugWarehouseOutInfoIsExit(drug_id int64, patient_id int64, recordtime i
 	return &outInfo, nil
 }
 
+func GetDrugWarehouseOutInfoIsExitOne(drug_id int64, patient_id int64, recordtime int64) (outInfo []*models.DrugWarehouseOutInfo, err error) {
+
+	err = XTReadDB().Model(&outInfo).Where("drug_id = ? and patient_id = ? and status = 1 and sys_record_time = ?", drug_id, patient_id, recordtime).Find(&outInfo).Error
+
+	return outInfo, err
+}
+
 func UpdatedDrugWarehouseOutInfo(info *models.DrugWarehouseOutInfo, drug_id int64, patient_id int64, record_date int64, orgid int64) error {
 
 	outInfo := models.DrugWarehouseOutInfo{}
@@ -4609,6 +4669,54 @@ func GetDrugWarehouseInfoPrescription(drugid int64, orgid int64) (info []*models
 	return info, err
 }
 
+func GetHisAdviceListByDrugId(drugid int64, patient_id int64, advice_date int64) (models.HisDoctorAdviceInfo, error) {
+
+	info := models.HisDoctorAdviceInfo{}
+	err := XTReadDB().Model(&info).Where("drug_id = ? and patient_id = ? and advice_date = ? and status = 1", drugid, patient_id, advice_date).Find(&info).Error
+	return info, err
+}
+
+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
+	return info, err
+}
+
+func GetLastDrugWarehouseOutByDrugId(drugid int64, patient_id int64, advice_date int64) (models.DrugAutomaticReduceDetail, error) {
+	detail := models.DrugAutomaticReduceDetail{}
+	err := XTReadDB().Model(&detail).Where("drug_id = ? and patient_id = ? and record_time = ? and status = 1", drugid, patient_id, advice_date).Last(&detail).Error
+	return detail, err
+}
+
+func ModefyDrugByWarehouseInfo(id int64, stock_max_number int64) error {
+
+	err := XTWriteDB().Model(models.DrugWarehouseInfo{}).Where("id = ? and status = 1", id).UpdateColumn("stock_max_number", gorm.Expr("stock_max_number + ?", stock_max_number)).Error
+	return err
+}
+
+func ModefyDrugByWarehouseInfoOne(id int64, stock_min_number int64) error {
+
+	err := XTWriteDB().Model(models.DrugWarehouseInfo{}).Where("id = ? and status = 1", id).UpdateColumn("stock_min_number", gorm.Expr("stock_min_number + ?", stock_min_number)).Error
+	return err
+}
+
+func DeleteDrugAutoWarehouse(drugid int64, patient_id int64, record_time int64) error {
+
+	err := XTWriteDB().Model(models.DrugAutomaticReduceDetail{}).Where("drug_id = ? and patient_id = ? and record_time = ? and status = 1", drugid, patient_id, record_time).Updates(map[string]interface{}{"status": 0}).Error
+	err = XTWriteDB().Model(models.DrugWarehouseOutInfo{}).Where("drug_id = ? and patient_id = ? and sys_record_time = ? and status = 1", drugid, patient_id, record_time).Updates(map[string]interface{}{"status": 0}).Error
+	err = XTWriteDB().Model(models.DrugFlow{}).Where("drug_id = ? and patient_id = ? and system_time = ? and status = 1", drugid, patient_id, record_time).Updates(map[string]interface{}{"status": 0}).Error
+	return err
+}
+
+func DeleteDrugAutoWarehouseSeven(drugid int64, patient_id int64, record_time int64, advice_id int64) error {
+
+	err := XTWriteDB().Model(models.DrugAutomaticReduceDetail{}).Where("drug_id = ? and patient_id = ? and record_time = ? and status = 1 and advice_id = ?", drugid, patient_id, record_time, advice_id).Updates(map[string]interface{}{"status": 0}).Error
+	err = XTWriteDB().Model(models.DrugWarehouseOutInfo{}).Where("drug_id = ? and patient_id = ? and sys_record_time = ? and status = 1 and advice_id = ?", drugid, patient_id, record_time, advice_id).Updates(map[string]interface{}{"status": 0}).Error
+	err = XTWriteDB().Model(models.DrugFlow{}).Where("drug_id = ? and patient_id = ? and system_time = ? and status = 1 and advice_id = ?", drugid, patient_id, record_time, advice_id).Updates(map[string]interface{}{"status": 0}).Error
+	return err
+}
+
 func GetDrugWarehouseInfoById(id int64) (models.XtDrugWarehouseInfo, error) {
 
 	info := models.XtDrugWarehouseInfo{}
@@ -4772,7 +4880,7 @@ func UpdateDrugFlow(flow models.DrugFlow, drugid int64, warehousing_id int64) er
 	return err
 }
 
-func UpdateDrugFlowTen(flow models.DrugFlow, drugid int64, warehousing_id int64) error {
+func UpdateDrugFlowNight(flow models.DrugFlow, drugid int64, warehousing_id int64) error {
 
 	drugFlow := models.DrugFlow{}
 	err := XTWriteDB().Model(&drugFlow).Where("drug_id = ? and warehousing_id= ? and status = 1", drugid, warehousing_id).Updates(map[string]interface{}{"count": flow.Count, "manufacturer": flow.Manufacturer, "dealer": flow.Dealer, "number": flow.Number, "batch_number": flow.BatchNumber, "price": flow.Price}).Error
@@ -5389,3 +5497,97 @@ func GetLastWarehoseByGoodId(goodid int64, patient_id int64, record_date int64)
 
 	return info, err
 }
+
+func ModifyDrugWarehouseOutInfo(info models.DrugWarehouseOutInfo, drugid int64, patientid int64, sys_record_time int64) error {
+
+	err := XTWriteDB().Model(&info).Where("drug_id = ? and patient_id = ? and sys_record_time = ? and status = 1", drugid, patientid, sys_record_time).Updates(map[string]interface{}{"count": info.Count, "count_unit": info.CountUnit}).Error
+	return err
+}
+
+func ModifyDrugWarehouseOutInfoOne(info models.DrugWarehouseOutInfo, drugid int64, patientid int64, sys_record_time int64, warehouse_info_id int64) error {
+
+	err := XTWriteDB().Model(&info).Where("drug_id = ? and patient_id = ? and sys_record_time = ? and status = 1 and warehouse_info_id = ?", drugid, patientid, sys_record_time, warehouse_info_id).Updates(map[string]interface{}{"count": info.Count, "count_unit": info.CountUnit}).Error
+	return err
+}
+
+func GetDrugWarehouseOutInfoByWarehosueId(drugid int64, patientid int64, recorddate int64, warehosueinfoid int64) (*models.DrugWarehouseOutInfo, error) {
+	info := models.DrugWarehouseOutInfo{}
+	err := XTReadDB().Model(&info).Where("drug_id = ? and patient_id = ? and sys_record_time = ? and warehouse_info_id  = ? and status = 1", drugid, patientid, recorddate, warehosueinfoid).Find(&info).Error
+	if err == gorm.ErrRecordNotFound {
+		return nil, err
+	}
+	if err != nil {
+		return nil, err
+	}
+	return &info, nil
+}
+
+func GetDrugFlowRecord(warehouse_out_order_number string, drugid int64, patientid int64) (*models.DrugFlow, error) {
+
+	drugFlow := models.DrugFlow{}
+
+	err := XTReadDB().Where("warehouse_out_order_number = ? and drug_id =? and patient_id = ? and status = 1", warehouse_out_order_number, drugid, patientid).Find(&drugFlow).Error
+
+	if err == gorm.ErrRecordNotFound {
+		return nil, err
+	}
+	if err != nil {
+		return nil, err
+	}
+	return &drugFlow, nil
+}
+
+func ModifyDrugFlow(flow models.DrugFlow, warehouse_out_order_number string, drugid int64, patient_id int64) error {
+
+	err := XTWriteDB().Model(&flow).Where("warehouse_out_order_number = ? and drug_id = ? and patient_id = ? and status = 1", warehouse_out_order_number, drugid, patient_id).Updates(map[string]interface{}{"count": flow.Count, "max_unit": flow.MaxUnit}).Error
+	return err
+}
+
+func ModifyDrugFlowOne(flow models.DrugFlow, warehouse_out_order_number string, drugid int64, patient_id int64, warehousing_detail_id int64) error {
+
+	err := XTWriteDB().Model(&flow).Where("warehouse_out_order_number = ? and drug_id = ? and patient_id = ? and status = 1 and warehousing_detail_id = ?", warehouse_out_order_number, drugid, patient_id, warehousing_detail_id).Updates(map[string]interface{}{"count": flow.Count, "max_unit": flow.MaxUnit}).Error
+	return err
+}
+
+func GetDrugAutoReduceRecordOne(drugid int64, patientid int64, recorddate int64) (detail []*models.DrugAutomaticReduceDetail, err error) {
+
+	err = XTReadDB().Model(&detail).Where("drug_id = ? and patient_id = ? and record_time  = ? and status = 1", drugid, patientid, recorddate).Find(&detail).Error
+
+	return detail, err
+}
+
+func GetDrugAutoReduceRecord(drugid int64, patientid int64, recorddate int64) (*models.DrugAutomaticReduceDetail, error) {
+
+	detail := models.DrugAutomaticReduceDetail{}
+
+	err := XTReadDB().Model(&detail).Where("drug_id = ? and patient_id = ? and record_time  = ? and status = 1", drugid, patientid, recorddate).Find(&detail).Error
+
+	if err == gorm.ErrRecordNotFound {
+		return nil, err
+	}
+	if err != nil {
+		return nil, err
+	}
+	return &detail, nil
+}
+
+func ModifyAutoMaticReduce(auto models.DrugAutomaticReduceDetail, patientid int64, recordate int64, drugid int64) error {
+
+	err := XTWriteDB().Model(&auto).Where("patient_id = ? and record_time = ? and drug_id = ? and status = 1", patientid, recordate, drugid).Updates(map[string]interface{}{"count": auto.Count, "count_unit": auto.CountUnit}).Error
+	return err
+}
+
+func ModifyAutoMaticReduceOne(auto models.DrugAutomaticReduceDetail, patientid int64, recordate int64, drugid int64, warehouse_info_id int64) error {
+
+	err := XTWriteDB().Model(&auto).Where("patient_id = ? and record_time = ? and drug_id = ? and status = 1 and warehouse_info_id = ?", patientid, recordate, drugid, warehouse_info_id).Updates(map[string]interface{}{"count": auto.Count, "count_unit": auto.CountUnit}).Error
+	return err
+}
+
+func ModifyDrugWarehouse(id int64, stock_max_number int64, stock_min_number int64) (models.DrugWarehouseInfo, error) {
+
+	info := models.DrugWarehouseInfo{}
+
+	err = XTWriteDB().Model(&info).Where("id = ?", id).UpdateColumn("stock_max_number", gorm.Expr("stock_max_number + ?", stock_max_number)).Error
+	err = XTWriteDB().Model(&info).Where("id = ?", id).UpdateColumn("stock_min_number", gorm.Expr("stock_min_number + ?", stock_min_number)).Error
+	return info, err
+}

service/warhouse_service.go

@@ -176,6 +176,8 @@ func DrugDeliverInfo(orgID int64, prescribingNumber float64, warehouseout *model
 			Creator:                 advice.ExecutionStaff,
 			IsSys:                   1,
 			PatientId:               advice.PatientId,
+			SystemTime:              advice.AdviceDate,
+			WarehousingDetailId:     warehouse.ID,
 		}
 
 		CreateDrugFlowOne(drugflow)
@@ -207,6 +209,7 @@ func DrugDeliverInfo(orgID int64, prescribingNumber float64, warehouseout *model
 			DrugId:                  advice.DrugId,
 			Count:                   count,
 			CountUnit:               advice.PrescribingNumberUnit,
+			WarehouseInfoId:         warehouse.ID,
 		}
 		errTwo := AddSigleDrugAutoReduceRecordInfo(details)
 		if errTwo != nil {
@@ -287,16 +290,6 @@ func DrugDeliverInfo(orgID int64, prescribingNumber float64, warehouseout *model
 		if errOne != nil {
 			return errOne
 		}
-		//查询是否存在数据
-		//_, errcodes := GetDrugWarehouseOutInfoIsExit(advice.DrugId, advice.PatientId, advice.RecordDate)
-		//if errcodes == gorm.ErrRecordNotFound {
-		//	errOne := AddSigleDrugWarehouseOutInfo(warehouseOutInfo)
-		//	if errOne != nil {
-		//		return errOne
-		//	}
-		//} else if errcodes == nil {
-		//	UpdatedDrugWarehouseOutInfo(warehouseOutInfo, advice.DrugId, advice.PatientId, advice.RecordDate, advice.UserOrgId)
-		//}
 
 		details := &models.DrugAutomaticReduceDetail{
 			WarehouseOutId:          warehouseout.ID,
@@ -310,6 +303,7 @@ func DrugDeliverInfo(orgID int64, prescribingNumber float64, warehouseout *model
 			DrugId:                  advice.DrugId,
 			Count:                   deliver_number,
 			CountUnit:               drup.MinUnit,
+			WarehouseInfoId:         warehouse.ID,
 		}
 		errTwo := AddSigleDrugAutoReduceRecordInfo(details)
 		if errTwo != nil {
@@ -373,6 +367,7 @@ func DrugDeliverInfo(orgID int64, prescribingNumber float64, warehouseout *model
 			Creator:                 advice.ExecutionStaff,
 			IsSys:                   1,
 			PatientId:               advice.PatientId,
+			WarehousingDetailId:     warehouse.ID,
 		}
 
 		CreateDrugFlowOne(drugflow)
@@ -442,7 +437,6 @@ func HisDrugsDelivery(orgID int64, creater int64, advice *models.HisDoctorAdvice
 		drup, _ := FindBaseDrugLibRecord(orgID, advice.DrugId)
 		if drup.ID > 0 {
 			prescribingNumber := advice.PrescribingNumber
-
 			HisDrugDeliverInfo(orgID, prescribingNumber, &out, &drup, advice)
 
 		} else {
@@ -524,6 +518,7 @@ func HisDrugDeliverInfo(orgID int64, prescribingNumber float64, warehouseout *mo
 			PatientId:               advice.PatientId,
 			WarehouseInfoId:         warehouse.ID,
 			Count:                   deliver_number,
+			AdviceId:                advice.ID,
 		}
 
 		drugflow := models.DrugFlow{
@@ -547,6 +542,9 @@ func HisDrugDeliverInfo(orgID int64, prescribingNumber float64, warehouseout *mo
 			Creator:                 advice.ExecutionStaff,
 			IsSys:                   1,
 			PatientId:               advice.PatientId,
+			SystemTime:              advice.AdviceDate,
+			WarehousingDetailId:     warehouse.ID,
+			AdviceId:                advice.ID,
 		}
 
 		CreateDrugFlowOne(drugflow)
@@ -555,16 +553,6 @@ func HisDrugDeliverInfo(orgID int64, prescribingNumber float64, warehouseout *mo
 		if errOne != nil {
 			return errOne
 		}
-		//查询是否存在数据
-		//_, errcodes := GetDrugWarehouseOutInfoIsExit(advice.DrugId, advice.PatientId, advice.RecordDate)
-		//if errcodes == gorm.ErrRecordNotFound {
-		//	errOne := AddSigleDrugWarehouseOutInfo(warehouseOutInfo)
-		//	if errOne != nil {
-		//		return errOne
-		//	}
-		//} else if errcodes == nil {
-		//	UpdatedDrugWarehouseOutInfo(warehouseOutInfo, advice.DrugId, advice.PatientId, advice.RecordDate, advice.UserOrgId)
-		//}
 
 		details := &models.DrugAutomaticReduceDetail{
 			WarehouseOutId:          warehouseout.ID,
@@ -578,6 +566,8 @@ func HisDrugDeliverInfo(orgID int64, prescribingNumber float64, warehouseout *mo
 			DrugId:                  advice.DrugId,
 			Count:                   deliver_number,
 			CountUnit:               drup.MinUnit,
+			WarehouseInfoId:         warehouse.ID,
+			AdviceId:                advice.ID,
 		}
 		errTwo := AddSigleDrugAutoReduceRecordInfo(details)
 		if errTwo != nil {
@@ -656,6 +646,7 @@ func HisDrugDeliverInfo(orgID int64, prescribingNumber float64, warehouseout *mo
 			WarehouseInfoId:         warehouse.ID,
 			Count:                   stock_number,
 			CountUnit:               drup.MinUnit,
+			AdviceId:                advice.ID,
 		}
 
 		drugflow := models.DrugFlow{
@@ -679,6 +670,9 @@ func HisDrugDeliverInfo(orgID int64, prescribingNumber float64, warehouseout *mo
 			Creator:                 advice.ExecutionStaff,
 			IsSys:                   1,
 			PatientId:               advice.PatientId,
+			SystemTime:              advice.AdviceDate,
+			WarehousingDetailId:     warehouse.ID,
+			AdviceId:                advice.ID,
 		}
 
 		CreateDrugFlowOne(drugflow)
@@ -700,6 +694,8 @@ func HisDrugDeliverInfo(orgID int64, prescribingNumber float64, warehouseout *mo
 			DrugId:                  advice.DrugId,
 			Count:                   stock_number,
 			CountUnit:               drup.MinUnit,
+			WarehouseInfoId:         warehouse.ID,
+			AdviceId:                advice.ID,
 		}
 		errTwo := AddSigleDrugAutoReduceRecordInfo(details)
 		if errTwo != nil {
@@ -806,6 +802,7 @@ func AutoDrugDeliverInfo(orgID int64, prescribingNumber int64, warehouseout *mod
 			Price:                   advice.Price,
 			WarehouseInfoId:         warehouse.ID,
 			CountUnit:               drup.MinUnit,
+			AdviceId:                advice.ID,
 		}
 
 		warehouseOutInfo.Count = prescribingNumber
@@ -838,6 +835,7 @@ func AutoDrugDeliverInfo(orgID int64, prescribingNumber int64, warehouseout *mod
 			Creator:                 0,
 			IsSys:                   0,
 			WarehouseOutDetailId:    drugWareInfo.ID,
+			AdviceId:                advice.ID,
 		}
 
 		CreateDrugFlowOne(drugflow)
@@ -901,6 +899,7 @@ func AutoDrugDeliverInfo(orgID int64, prescribingNumber int64, warehouseout *mod
 			Price:                   advice.Price,
 			WarehouseInfoId:         warehouse.ID,
 			CountUnit:               drup.MinUnit,
+			AdviceId:                advice.ID,
 		}
 		warehouseOutInfo.Count = prescribingNumber
 
@@ -932,6 +931,7 @@ func AutoDrugDeliverInfo(orgID int64, prescribingNumber int64, warehouseout *mod
 			Creator:                 0,
 			IsSys:                   0,
 			WarehouseOutDetailId:    drugWareInfo.ID,
+			AdviceId:                advice.ID,
 		}
 		CreateDrugFlowOne(drugflow)
 		// 出库完成后，要将该批次库存清零
@@ -1985,6 +1985,7 @@ func NewDrugDeliverInfo(orgID int64, prescribingNumber float64, warehouseout *mo
 			Creator:                 advice.ExecutionStaff,
 			IsSys:                   1,
 			PatientId:               advice.PatientId,
+			WarehousingDetailId:     warehouse.ID,
 		}
 
 		CreateDrugFlowOne(drugflow)
@@ -2014,6 +2015,7 @@ func NewDrugDeliverInfo(orgID int64, prescribingNumber float64, warehouseout *mo
 			DrugId:                  advice.DrugId,
 			Count:                   count,
 			CountUnit:               advice.PrescribingNumberUnit,
+			WarehouseInfoId:         warehouse.ID,
 		}
 		errTwo := AddSigleDrugAutoReduceRecordInfo(details)
 		if errTwo != nil {
@@ -2111,6 +2113,7 @@ func NewDrugDeliverInfo(orgID int64, prescribingNumber float64, warehouseout *mo
 			DrugId:                  advice.DrugId,
 			Count:                   deliver_number,
 			CountUnit:               drup.MinUnit,
+			WarehouseInfoId:         warehouse.ID,
 		}
 		errTwo := AddSigleDrugAutoReduceRecordInfo(details)
 		if errTwo != nil {
@@ -2178,6 +2181,7 @@ func NewDrugDeliverInfo(orgID int64, prescribingNumber float64, warehouseout *mo
 			Creator:                 advice.ExecutionStaff,
 			IsSys:                   1,
 			PatientId:               advice.PatientId,
+			WarehousingDetailId:     warehouse.ID,
 		}
 
 		CreateDrugFlowOne(drugflow)
@@ -2285,6 +2289,8 @@ func NewHisDrugDeliverInfo(orgID int64, prescribingNumber float64, warehouseout
 			Creator:                 advice.ExecutionStaff,
 			IsSys:                   1,
 			PatientId:               advice.PatientId,
+			SystemTime:              advice.RecordDate,
+			WarehousingDetailId:     warehouse.ID,
 		}
 
 		CreateDrugFlowOne(drugflow)
@@ -2292,16 +2298,6 @@ func NewHisDrugDeliverInfo(orgID int64, prescribingNumber float64, warehouseout
 		if errOne != nil {
 			return errOne
 		}
-		//查询是否存在数据
-		//_, errcodes := GetDrugWarehouseOutInfoIsExit(advice.DrugId, advice.PatientId, advice.RecordDate)
-		//if errcodes == gorm.ErrRecordNotFound {
-		//  errOne := AddSigleDrugWarehouseOutInfo(warehouseOutInfo)
-		//  if errOne != nil {
-		//    return errOne
-		//  }
-		//} else if errcodes == nil {
-		//  UpdatedDrugWarehouseOutInfo(warehouseOutInfo, advice.DrugId, advice.PatientId, advice.RecordDate, advice.UserOrgId)
-		//}
 
 		details := &models.DrugAutomaticReduceDetail{
 			WarehouseOutId:          warehouseout.ID,
@@ -2315,6 +2311,7 @@ func NewHisDrugDeliverInfo(orgID int64, prescribingNumber float64, warehouseout
 			DrugId:                  advice.DrugId,
 			Count:                   deliver_number,
 			CountUnit:               drup.MinUnit,
+			WarehouseInfoId:         warehouse.ID,
 		}
 		errTwo := AddSigleDrugAutoReduceRecordInfo(details)
 		if errTwo != nil {
@@ -2406,6 +2403,8 @@ func NewHisDrugDeliverInfo(orgID int64, prescribingNumber float64, warehouseout
 			Creator:                 advice.ExecutionStaff,
 			IsSys:                   1,
 			PatientId:               advice.PatientId,
+			SystemTime:              advice.RecordDate,
+			WarehousingDetailId:     warehouse.ID,
 		}
 
 		CreateDrugFlowOne(drugflow)
@@ -2413,16 +2412,7 @@ func NewHisDrugDeliverInfo(orgID int64, prescribingNumber float64, warehouseout
 		if errOne != nil {
 			return errOne
 		}
-		//查询是否存在数据
-		//_, errcodes := GetDrugWarehouseOutInfoIsExit(advice.DrugId, advice.PatientId, advice.RecordDate)
-		//if errcodes == gorm.ErrRecordNotFound {
-		//  errOne := AddSigleDrugWarehouseOutInfo(warehouseOutInfo)
-		//  if errOne != nil {
-		//    return errOne
-		//  }
-		//} else if errcodes == nil {
-		//  UpdatedDrugWarehouseOutInfo(warehouseOutInfo, advice.DrugId, advice.PatientId, advice.RecordDate, advice.UserOrgId)
-		//}
+
 		details := &models.DrugAutomaticReduceDetail{
 			WarehouseOutId:          warehouseout.ID,
 			WarehouseOutOrderNumber: warehouseout.WarehouseOutOrderNumber,
@@ -2435,6 +2425,7 @@ func NewHisDrugDeliverInfo(orgID int64, prescribingNumber float64, warehouseout
 			DrugId:                  advice.DrugId,
 			Count:                   deliver_number,
 			CountUnit:               drup.MinUnit,
+			WarehouseInfoId:         warehouse.ID,
 		}
 		errTwo := AddSigleDrugAutoReduceRecordInfo(details)
 		if errTwo != nil {
@@ -2484,3 +2475,220 @@ func NewHisDrugDeliverInfo(orgID int64, prescribingNumber float64, warehouseout
 
 	return
 }
+
+// 药品出库 递归方式
+func HisAuToReduce(orgID int64, prescribingNumber float64, warehouseout *models.DrugWarehouseOut, drup *models.BaseDrugLib, advice *models.HisDoctorAdviceInfo) (err error) {
+
+	//查询最后一次出库数据
+	drugInfo, _ := GetDrugWarehouseOutInfoIsExit(advice.DrugId, advice.PatientId, advice.RecordDate)
+
+	prescribingNumber_temp := strconv.FormatFloat(math.Abs(prescribingNumber), 'f', 0, 64)
+	count, _ := strconv.ParseInt(prescribingNumber_temp, 10, 64)
+	var count_number int64
+	var device_number int64
+	if advice.PrescribingNumberUnit == drup.MaxUnit {
+		device_number = count * drup.MinNumber
+	}
+	if advice.PrescribingNumberUnit == drup.MinUnit {
+		device_number = count
+	}
+
+	if drugInfo.CountUnit == drup.MaxUnit {
+		count_number = drugInfo.Count * drup.MinNumber
+	}
+	if drugInfo.CountUnit == drup.MinUnit {
+		count_number = drugInfo.Count
+	}
+
+	//  比较数据大小
+	//如果当期医嘱数量小于最后一次出库则退库
+	if device_number < count_number {
+		fmt.Println("进来了吗")
+		var cha_number int64
+		var maxNumber int64
+		var minNumber int64
+		cha_number = count_number - device_number
+		maxNumber = cha_number / drup.MinNumber
+		minNumber = cha_number % drup.MinNumber
+		//更改库存
+		ModifyDrugWarehouse(drugInfo.WarehouseInfoId, maxNumber, minNumber)
+
+		//修改出库表
+		info := models.DrugWarehouseOutInfo{
+			Count:     device_number,
+			CountUnit: advice.PrescribingNumberUnit,
+		}
+
+		ModifyDrugWarehouseOutInfo(info, advice.DrugId, advice.PatientId, advice.RecordDate)
+
+		//修改自动出库表
+		detail := models.DrugAutomaticReduceDetail{
+			Count:     device_number,
+			CountUnit: advice.PrescribingNumberUnit,
+		}
+		ModifyAutoMaticReduce(detail, advice.PatientId, advice.RecordDate, advice.DrugId)
+		//修改流水
+		flow := models.DrugFlow{
+			Count:   device_number,
+			MaxUnit: drup.MinUnit,
+		}
+		ModifyDrugFlow(flow, drugInfo.WarehouseOutOrderNumber, advice.DrugId, advice.PatientId)
+
+	}
+	fmt.Println("医嘱数量44444444444444", device_number)
+	fmt.Println("最后一次出库数量", count_number)
+	//如果当期医嘱数量大于最后一次出库则需要出库
+	if device_number > count_number {
+		var cha_number int64
+		cha_number = device_number - count_number
+
+		// 根据先进先出原则，查询最先入库的批次，进行出库
+
+		warehouse, err := FindLastDrugWarehousingInfoByID(advice.DrugId)
+		//查找药品信息
+		//baseInfo, _ := FindBaseDrugLibRecord(advice.UserOrgId, advice.DrugId)
+		if err != nil {
+			return err
+		}
+
+		// 将该批次的剩余库存数量转换为拆零数量
+		var stock_number int64
+		var maxNumber int64
+		var minNumber int64
+		stock_number = warehouse.StockMaxNumber*drup.MinNumber + warehouse.StockMinNumber
+
+		//如果库存数量大于出库数据,正常出库
+		if stock_number >= cha_number {
+			//扣减库存
+			maxNumber = cha_number / drup.MinNumber
+			minNumber = cha_number % drup.MinNumber
+
+			if warehouse.StockMaxNumber == 0 && drup.MaxUnit == drup.MinUnit {
+				minNumber = maxNumber
+			}
+
+			if drup.MaxUnit != drup.MinUnit {
+				if warehouse.StockMaxNumber < maxNumber {
+					return errors.New("库存数量不足")
+				}
+			}
+
+			warehouse.StockMaxNumber = warehouse.StockMaxNumber - maxNumber
+			if warehouse.StockMaxNumber < 0 {
+				warehouse.StockMaxNumber = 0
+			}
+
+			warehouse.Mtime = time.Now().Unix()
+
+			if warehouse.StockMinNumber < minNumber {
+				warehouse.StockMaxNumber = warehouse.StockMaxNumber - 1
+				warehouse.StockMinNumber = warehouse.StockMinNumber + drup.MinNumber - minNumber
+			} else {
+
+				warehouse.StockMinNumber = warehouse.StockMinNumber - minNumber
+
+			}
+
+			if drup.MaxUnit != drup.MinUnit {
+				if warehouse.StockMaxNumber < 0 {
+					return errors.New("库存数量不足")
+				}
+			}
+
+			//扣减库存232332332332
+			errThree := UpDateDrugWarehouseInfoByStock(&warehouse)
+
+			if errThree != nil {
+				return errThree
+			}
+
+			//修改出库表
+			info := models.DrugWarehouseOutInfo{
+				Count:     device_number,
+				CountUnit: advice.PrescribingNumberUnit,
+			}
+			ModifyDrugWarehouseOutInfoOne(info, advice.DrugId, advice.PatientId, advice.RecordDate, warehouse.ID)
+			//修改自动出库表
+			detail := models.DrugAutomaticReduceDetail{
+				Count:     device_number,
+				CountUnit: advice.PrescribingNumberUnit,
+			}
+			ModifyAutoMaticReduceOne(detail, advice.PatientId, advice.RecordDate, advice.DrugId, warehouse.ID)
+			//修改流水
+			flow := models.DrugFlow{
+				Count:   device_number,
+				MaxUnit: advice.PrescribingNumberUnit,
+			}
+			ModifyDrugFlowOne(flow, drugInfo.WarehouseOutOrderNumber, advice.DrugId, advice.PatientId, warehouse.ID)
+		}
+		//如果库存数量小于出库数据,则需要出库到下一个批次
+		if stock_number < cha_number {
+
+			//修改出库表
+			info := models.DrugWarehouseOutInfo{
+				Count:     cha_number,
+				CountUnit: advice.PrescribingNumberUnit,
+			}
+			ModifyDrugWarehouseOutInfoOne(info, advice.DrugId, advice.PatientId, advice.RecordDate, warehouse.ID)
+			//修改自动出库表
+			detail := models.DrugAutomaticReduceDetail{
+				Count:     cha_number,
+				CountUnit: advice.PrescribingNumberUnit,
+			}
+			ModifyAutoMaticReduceOne(detail, advice.PatientId, advice.RecordDate, advice.DrugId, warehouse.ID)
+			//修改流水
+			flow := models.DrugFlow{
+				Count:   cha_number,
+				MaxUnit: advice.PrescribingNumberUnit,
+			}
+			ModifyDrugFlowOne(flow, drugInfo.WarehouseOutOrderNumber, advice.DrugId, advice.PatientId, warehouse.ID)
+
+			druginfo := &models.XtDrugWarehouseInfo{
+				ID:                warehouse.ID,
+				WarehousingId:     warehouse.WarehousingId,
+				DrugId:            warehouse.DrugId,
+				Number:            warehouse.Number,
+				ProductDate:       warehouse.ProductDate,
+				ExpiryDate:        warehouse.ExpiryDate,
+				WarehousingCount:  warehouse.WarehousingCount,
+				Price:             warehouse.Price,
+				TotalPrice:        warehouse.TotalPrice,
+				Dealer:            warehouse.Dealer,
+				Manufacturer:      warehouse.Manufacturer,
+				Remark:            warehouse.Remark,
+				Ctime:             warehouse.Ctime,
+				Mtime:             warehouse.Mtime,
+				Status:            1,
+				OrgId:             warehouse.OrgId,
+				IsReturn:          warehouse.IsReturn,
+				WarehousingOrder:  warehouse.WarehousingOrder,
+				Type:              warehouse.Type,
+				RetailPrice:       warehouse.RetailPrice,
+				RetailTotalPrice:  warehouse.RetailPrice,
+				StockMaxNumber:    0,
+				StockMinNumber:    0,
+				BatchNumber:       warehouse.BatchNumber,
+				MaxUnit:           warehouse.MaxUnit,
+				WarehousingInfoId: warehouse.WarehousingInfoId,
+			}
+			errThree := UpDateDrugWarehouseInfoByStock(druginfo)
+			if errThree != nil {
+				return errThree
+			}
+
+			// 清零完该库存后，还有剩余出库未出完，进行对应的递归操作
+			prescribingNumber_two_temp := cha_number - stock_number
+
+			overPlusNumber := float64(prescribingNumber_two_temp)
+
+			advice.PrescribingNumber = float64(prescribingNumber_two_temp)
+
+			advice.PrescribingNumberUnit = advice.PrescribingNumberUnit
+
+			NewHisDrugDeliverInfo(orgID, overPlusNumber, warehouseout, drup, advice)
+
+		}
+	}
+
+	return
+}