11月8日库存管理

controllers/his_api_controller.go

@@ -930,10 +930,9 @@ func (c *HisApiController) CreateHisPrescription() {
 						if len(advices) > 0 {
 							for _, advice := range advices {
 								var drug_id int64
-								//var prescribing_number float64
+								var prescribing_number float64
 								var prescribingNumberUnit string
 								var prescribingNumber string
-								var prescribing_number_one int64
 
 								var adviceId int64
 								if advice.(map[string]interface{})["id"] != nil || reflect.TypeOf(advice.(map[string]interface{})["id"]).String() == "float64" {
@@ -941,9 +940,8 @@ func (c *HisApiController) CreateHisPrescription() {
 								}
 								if advice.(map[string]interface{})["prescribing_number"] != nil || reflect.TypeOf(advice.(map[string]interface{})["prescribing_number"]).String() == "string" {
 									prescribing_number_str := advice.(map[string]interface{})["prescribing_number"].(string)
-									//prescribing_number, _ = strconv.ParseFloat(prescribing_number_str, 64)
+									prescribing_number, _ = strconv.ParseFloat(prescribing_number_str, 64)
 									prescribingNumber = advice.(map[string]interface{})["prescribing_number"].(string)
-									prescribing_number_one, _ = strconv.ParseInt(prescribing_number_str, 10, 64)
 								}
 
 								if advice.(map[string]interface{})["prescribing_number_unit"] != nil && reflect.TypeOf(advice.(map[string]interface{})["prescribing_number_unit"]).String() == "string" {
@@ -960,27 +958,27 @@ func (c *HisApiController) CreateHisPrescription() {
 									return
 								}
 								//查询药品的所有库存
-								//list, _ := service.GetDrugWarehouseInfoPrescriptionSeven(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)
+								list, _ := service.GetDrugWarehouseInfoPrescriptionSeven(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)
 								//查询该药品是否存在开药记录
 								advicelist, _ := service.GetHisAdviceListByDrugIdEight(drug_id, patient_id, recordDateTime, adviceId)
 
 								//新增处方
 								if advicelist.ID == 0 {
-									//	all_count, _ := strconv.ParseFloat(totals, 64)
+									all_count, _ := strconv.ParseFloat(totals, 64)
 									if prescribingNumberUnit == drug.MinUnit {
-										if prescribing_number_one > drug.SumCount {
+										if prescribing_number > all_count {
 											c.ServeDynamicFailJsonSend(drug.DrugName + "库存不足")
 											return
 										}
 									} else {
 										if prescribingNumberUnit == drug.MaxUnit {
-											num := prescribing_number_one * drug.MinNumber
-											if num > drug.SumCount {
+											num := prescribing_number * float64(drug.MinNumber)
+											if num > all_count {
 												c.ServeDynamicFailJsonSend(drug.DrugName + "库存不足")
 												return
 											}
@@ -1015,7 +1013,7 @@ func (c *HisApiController) CreateHisPrescription() {
 									//如果修改的数量大于之前修改的数量
 									if (number_count - device_number) > 0 {
 										//如果修改的差数量 大于库存数量
-										if (number_count - device_number) > drug.SumCount {
+										if (number_count - device_number) > total_count {
 											c.ServeDynamicFailJsonSend(drug.DrugName + "库存不足")
 											return
 										}
@@ -1030,24 +1028,6 @@ func (c *HisApiController) CreateHisPrescription() {
 										if druginfo.CountUnit == drug.MaxUnit && drug.MaxUnit != drug.MinUnit {
 
 											service.ModefyDrugByWarehouseInfo(druginfo.WarehouseInfoId, number_count)
-
-											//查询默认仓库
-											houseConfig, _ := service.GetAllStoreHouseConfig(druginfo.OrgId)
-											//查询默认仓库剩余多少库存
-											list, _ := service.GetDrugSumCountByStorehouseId(houseConfig.DrugStorehouseOut, druginfo.OrgId, drug_id)
-											var sum_count int64
-											var sum_in_count int64
-											for _, it := range list {
-												baseDrug, _ := service.GetBaseDrugMedical(it.DrugId)
-												if it.MaxUnit == baseDrug.MaxUnit {
-													it.StockMaxNumber = it.StockMaxNumber * baseDrug.MinNumber
-													it.WarehousingCount = it.WarehousingCount * baseDrug.MinNumber
-
-												}
-												sum_count += it.StockMaxNumber + it.StockMinNumber
-												sum_in_count += it.WarehousingCount
-											}
-											service.UpdateMedicalSumCount(drug_id, sum_count, sum_in_count, druginfo.OrgId)
 										}
 										if druginfo.CountUnit == drug.MinUnit && drug.MaxUnit != drug.MinUnit {
 											var stock_max_number int64
@@ -1056,71 +1036,18 @@ func (c *HisApiController) CreateHisPrescription() {
 											if number_count >= drug.MinNumber {
 
 												stock_max_number = device_number / drug.MinNumber
-
 												service.ModefyDrugByWarehouseInfo(druginfo.WarehouseInfoId, stock_max_number)
-
 												stock_min_number = device_number % drug.MinNumber
 												service.ModefyDrugByWarehouseInfoOne(druginfo.WarehouseInfoId, stock_min_number)
-												//查询默认仓库
-												houseConfig, _ := service.GetAllStoreHouseConfig(druginfo.OrgId)
-												//查询默认仓库剩余多少库存
-												list, _ := service.GetDrugSumCountByStorehouseId(houseConfig.DrugStorehouseOut, druginfo.OrgId, drug_id)
-												var sum_count int64
-												var sum_in_count int64
-												for _, it := range list {
-													baseDrug, _ := service.GetBaseDrugMedical(it.DrugId)
-													if it.MaxUnit == baseDrug.MaxUnit {
-														it.StockMaxNumber = it.StockMaxNumber * baseDrug.MinNumber
-														it.WarehousingCount = it.WarehousingCount * baseDrug.MinNumber
-
-													}
-													sum_count += it.StockMaxNumber + it.StockMinNumber
-													sum_in_count += it.WarehousingCount
-												}
-												service.UpdateMedicalSumCount(drug_id, sum_count, sum_in_count, druginfo.OrgId)
 
 											} else {
 
 												service.ModefyDrugByWarehouseInfoOne(druginfo.WarehouseInfoId, device_number)
-												//查询默认仓库
-												houseConfig, _ := service.GetAllStoreHouseConfig(druginfo.OrgId)
-												//查询默认仓库剩余多少库存
-												list, _ := service.GetDrugSumCountByStorehouseId(houseConfig.DrugStorehouseOut, druginfo.OrgId, drug_id)
-												var sum_count int64
-												var sum_in_count int64
-												for _, it := range list {
-													baseDrug, _ := service.GetBaseDrugMedical(it.DrugId)
-													if it.MaxUnit == baseDrug.MaxUnit {
-														it.StockMaxNumber = it.StockMaxNumber * baseDrug.MinNumber
-														it.WarehousingCount = it.WarehousingCount * baseDrug.MinNumber
-
-													}
-													sum_count += it.StockMaxNumber + it.StockMinNumber
-													sum_in_count += it.WarehousingCount
-												}
-												service.UpdateMedicalSumCount(drug_id, sum_count, sum_in_count, druginfo.OrgId)
 											}
 										}
 
 										if druginfo.CountUnit == drug.MaxUnit && druginfo.CountUnit == drug.MinUnit && drug.MaxUnit == drug.MinUnit {
 											service.ModefyDrugByWarehouseInfo(druginfo.WarehouseInfoId, device_number)
-											//查询默认仓库
-											houseConfig, _ := service.GetAllStoreHouseConfig(druginfo.OrgId)
-											//查询默认仓库剩余多少库存
-											list, _ := service.GetDrugSumCountByStorehouseId(houseConfig.DrugStorehouseOut, druginfo.OrgId, drug_id)
-											var sum_count int64
-											var sum_in_count int64
-											for _, it := range list {
-												baseDrug, _ := service.GetBaseDrugMedical(it.DrugId)
-												if it.MaxUnit == baseDrug.MaxUnit {
-													it.StockMaxNumber = it.StockMaxNumber * baseDrug.MinNumber
-													it.WarehousingCount = it.WarehousingCount * baseDrug.MinNumber
-
-												}
-												sum_count += it.StockMaxNumber + it.StockMinNumber
-												sum_in_count += it.WarehousingCount
-											}
-											service.UpdateMedicalSumCount(drug_id, sum_count, sum_in_count, druginfo.OrgId)
 										}
 										//删除记录
 										service.DeleteDrugAutoWarehouseSeven(drug_id, patient_id, recordDateTime, adviceId)
@@ -1150,7 +1077,7 @@ func (c *HisApiController) CreateHisPrescription() {
 
 								var project_id int64
 								var project_type int64
-								//var totals float64
+								var totals float64
 								var project_name string
 								var parsetotal int64
 								var id int64
@@ -1166,7 +1093,7 @@ func (c *HisApiController) CreateHisPrescription() {
 								}
 								if project.(map[string]interface{})["total"] != nil || reflect.TypeOf(project.(map[string]interface{})["total"]).String() == "string" {
 									total, _ := project.(map[string]interface{})["total"].(string)
-									//	totals, _ = strconv.ParseFloat(total, 64)
+									totals, _ = strconv.ParseFloat(total, 64)
 									parsetotal, _ = strconv.ParseInt(total, 10, 64)
 								}
 
@@ -1185,21 +1112,14 @@ func (c *HisApiController) CreateHisPrescription() {
 
 									if len(goodWarehouseInfo) == 0 {
 										//查询耗材库存
-										//list, _ := service.GetGoodWarehouseInfoSeven(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(project_name + "库存不足")
-										//	return
-										//}
-
-										good, _ := service.GetGoodInformationByGoodId(project_id)
-										fmt.Println("parsetotal3232323223233232232323233", parsetotal, good.SumCount)
-										if parsetotal > good.SumCount {
+										list, _ := service.GetGoodWarehouseInfoSeven(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(project_name + "库存不足")
 											return
 										}
@@ -1209,16 +1129,6 @@ func (c *HisApiController) CreateHisPrescription() {
 										for _, item := range goodList {
 											//回退库存
 											service.ModefyWarehouseInfo(item.Count, item.WarehouseInfotId)
-											//查询默认仓库
-											houseConfig, _ := service.GetAllStoreHouseConfig(item.GoodId)
-											goodList, _ := service.GetGoodSumCountByStoreId(houseConfig.StorehouseOutInfo, item.ProjectId, item.OrgId)
-											var sum_count int64
-											var sum_in_count int64
-											for _, it := range goodList {
-												sum_count += it.StockCount
-												sum_in_count += it.WarehousingCount
-											}
-											service.UpdateGoodByGoodId(item.GoodId, sum_count, sum_in_count, item.OrgId)
 										}
 										//删除记录
 										service.DeleteAutoWarehouse(patient_id, recordDateTime)
@@ -1237,16 +1147,6 @@ func (c *HisApiController) CreateHisPrescription() {
 											for _, item := range goodList {
 												//回退库存
 												service.ModefyWarehouseInfo(item.Count, item.WarehouseInfotId)
-												//查询默认仓库
-												houseConfig, _ := service.GetAllStoreHouseConfig(item.GoodId)
-												goodList, _ := service.GetGoodSumCountByStoreId(houseConfig.StorehouseOutInfo, item.ProjectId, item.OrgId)
-												var sum_count int64
-												var sum_in_count int64
-												for _, it := range goodList {
-													sum_count += it.StockCount
-													sum_in_count += it.WarehousingCount
-												}
-												service.UpdateGoodByGoodId(item.GoodId, sum_count, sum_in_count, item.OrgId)
 											}
 											//删除记录
 											service.DeleteAutoWarehouse(patient_id, recordDateTime)
@@ -1951,7 +1851,7 @@ func (c *HisApiController) DeletePrescription() {
 	_, drugStockConfig := service.FindDrugStockAutomaticReduceRecordByOrgId(c.GetAdminUserInfo().CurrentOrgId)
 
 	_, stockConfig := service.FindAutomaticReduceRecordByOrgId(c.GetAdminUserInfo().CurrentOrgId)
-	houseConfig, _ := service.GetAllStoreHouseConfig(c.GetAdminUserInfo().CurrentOrgId)
+
 	if len(projects) > 0 {
 		for _, item := range projects {
 			service.DeletePrintInfo(item.ID) //删除打印信息
@@ -1971,15 +1871,14 @@ func (c *HisApiController) DeletePrescription() {
 					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,
-						StorehouseId: houseConfig.StorehouseOutInfo,
+						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 {
@@ -2015,7 +1914,6 @@ func (c *HisApiController) DeletePrescription() {
 							WarehouseInfoId: info.WarehouseInfotId,
 							PatientId:       info.PatientId,
 							RecordDate:      info.SysRecordTime,
-							StorehouseId:    houseConfig.StorehouseOutInfo,
 						}
 
 						service.CreateCancelStockInfoOne(&cancelStockInfo)
@@ -2052,7 +1950,6 @@ func (c *HisApiController) DeletePrescription() {
 							CancelOutDetailId:       cancelInfo.ID,
 							ProductDate:             info.ProductDate,
 							ExpireDate:              info.ExpiryDate,
-							StorehouseId:            houseConfig.StorehouseOutInfo,
 						}
 						service.CreateStockFlowOne(flow)
 
@@ -2070,7 +1967,7 @@ func (c *HisApiController) DeletePrescription() {
 						}
 						//回退库存
 						service.UpDateWarehouseInfoByStockDelete(info.WarehouseInfotId, total_count)
-						service.ModifyGoodAddInformation(info.GoodId, total_count, info.OrgId)
+
 						//查询今日该耗材退库数量
 						cancelInfoOne, _ := service.GetCancelStockInfoByPatientId(info.PatientId, item.ProjectId, info.SysRecordTime)
 						var cancel_Count int64
@@ -2105,7 +2002,6 @@ func (c *HisApiController) DeletePrescription() {
 									Manufacturer:            0,
 									Type:                    1,
 									IsSys:                   1,
-									StorehouseId:            houseConfig.StorehouseOutInfo,
 								}
 								err := service.AddSigleWarehouseOut(&warehouseOut)
 								if err != nil {
@@ -2113,49 +2009,27 @@ func (c *HisApiController) DeletePrescription() {
 									return
 								}
 								prepare := &models.DialysisBeforePrepare{
-									UserOrgId:    c.GetAdminUserInfo().CurrentOrgId,
-									PatientId:    info.PatientId,
-									RecordDate:   info.SysRecordTime,
-									GoodId:       item.ProjectId,
-									GoodTypeId:   info.GoodTypeId,
-									Count:        cha_count,
-									StorehouseId: houseConfig.StorehouseOutInfo,
+									UserOrgId:  c.GetAdminUserInfo().CurrentOrgId,
+									PatientId:  info.PatientId,
+									RecordDate: info.SysRecordTime,
+									GoodId:     item.ProjectId,
+									GoodTypeId: info.GoodTypeId,
+									Count:      cha_count,
 								}
 								//出库
 								service.ConsumablesDelivery(c.GetAdminUserInfo().CurrentOrgId, info.PatientId, info.SysRecordTime, prepare, &warehouseOut, cha_count)
-								//查询默认仓库
-								houseConfig, _ := service.GetAllStoreHouseConfig(c.GetAdminUserInfo().CurrentOrgId)
-								goodList, _ := service.GetGoodSumCountByStoreId(houseConfig.StorehouseOutInfo, item.ProjectId, item.UserOrgId)
-								var sum_count int64
-								var sum_in_count int64
-								for _, it := range goodList {
-									sum_count += it.StockCount
-									sum_in_count += it.WarehousingCount
-								}
-								service.UpdateGoodByGoodId(item.ProjectId, sum_count, sum_in_count, item.UserOrgId)
 							} else if err == nil {
 
 								prepare := &models.DialysisBeforePrepare{
-									UserOrgId:    c.GetAdminUserInfo().CurrentOrgId,
-									PatientId:    info.PatientId,
-									RecordDate:   info.SysRecordTime,
-									GoodId:       item.ProjectId,
-									GoodTypeId:   info.GoodTypeId,
-									Count:        cha_count,
-									StorehouseId: houseConfig.StorehouseOutInfo,
+									UserOrgId:  c.GetAdminUserInfo().CurrentOrgId,
+									PatientId:  info.PatientId,
+									RecordDate: info.SysRecordTime,
+									GoodId:     item.ProjectId,
+									GoodTypeId: info.GoodTypeId,
+									Count:      cha_count,
 								}
 								//出库
 								service.ConsumablesDelivery(c.GetAdminUserInfo().CurrentOrgId, info.PatientId, info.SysRecordTime, prepare, &out, cha_count)
-								//查询默认仓库
-								houseConfig, _ := service.GetAllStoreHouseConfig(c.GetAdminUserInfo().CurrentOrgId)
-								goodList, _ := service.GetGoodSumCountByStoreId(houseConfig.StorehouseOutInfo, item.ProjectId, item.UserOrgId)
-								var sum_count int64
-								var sum_in_count int64
-								for _, it := range goodList {
-									sum_count += it.StockCount
-									sum_in_count += it.WarehousingCount
-								}
-								service.UpdateGoodByGoodId(item.ProjectId, sum_count, sum_in_count, item.UserOrgId)
 							}
 
 						}
@@ -2225,7 +2099,6 @@ func (c *HisApiController) DeletePrescription() {
 							Dealer:       info.Dealer,
 							Manufacturer: info.Manufacturer,
 							Type:         1,
-							StorehouseId: houseConfig.DrugStorehouseOut,
 						}
 						service.AddSigleDrugCancelStock(&cancelStock)
 
@@ -2254,7 +2127,6 @@ func (c *HisApiController) DeletePrescription() {
 							ProductDate:      info.ProductDate,
 							ExpiryDate:       info.ExpiryDate,
 							BatchNumberId:    info.WarehouseInfoId,
-							StorehouseId:     houseConfig.DrugStorehouseOut,
 						}
 
 						flow := models.DrugFlow{
@@ -2290,7 +2162,6 @@ func (c *HisApiController) DeletePrescription() {
 							MaxUnit:                 info.CountUnit,
 							MinUnit:                 "",
 							AdviceId:                info.AdviceId,
-							StorehouseId:            houseConfig.DrugStorehouseOut,
 						}
 						service.CreatedCancelStock(cancelStockInfo)
 						service.CreateDrugFlowOne(flow)
@@ -2299,24 +2170,6 @@ func (c *HisApiController) DeletePrescription() {
 						service.UpdateDrugFlowSeven(info.PatientId, info.SysRecordTime, info.DrugId, item.ID)
 						//删除流水
 						service.UpdateDrugFlowTens(info.PatientId, info.WarehouseOutOrderNumber, info.DrugId, item.ID)
-
-						//查询默认仓库
-						houseConfig, _ := service.GetAllStoreHouseConfig(item.UserOrgId)
-						//查询默认仓库剩余多少库存
-						list, _ := service.GetDrugSumCountByStorehouseId(houseConfig.DrugStorehouseOut, item.UserOrgId, item.DrugId)
-						var sum_count int64
-						var sum_in_count int64
-						for _, it := range list {
-							baseDrug, _ := service.GetBaseDrugMedical(it.DrugId)
-							if it.MaxUnit == baseDrug.MaxUnit {
-								it.StockMaxNumber = it.StockMaxNumber * baseDrug.MinNumber
-								it.WarehousingCount = it.WarehousingCount * baseDrug.MinNumber
-
-							}
-							sum_count += it.StockMaxNumber + it.StockMinNumber
-							sum_in_count += it.WarehousingCount
-						}
-						service.UpdateMedicalSumCount(item.DrugId, sum_count, sum_in_count, item.UserOrgId)
 					} else {
 						floatPrescrip := strconv.FormatFloat(item.PrescribingNumber, 'f', -1, 32)
 
@@ -2325,7 +2178,6 @@ func (c *HisApiController) DeletePrescription() {
 						if item.PrescribingNumberUnit == drug.MaxUnit {
 							warehouseInfo := models.DrugWarehouseInfo{
 								StockMaxNumber: prescribingNumber,
-								StorehouseId:   houseConfig.DrugStorehouseOut,
 							}
 							service.UpdateDrugWarehouseOne(info.WarehouseInfoId, warehouseInfo)
 
@@ -2353,7 +2205,6 @@ func (c *HisApiController) DeletePrescription() {
 							Dealer:       info.Dealer,
 							Manufacturer: info.Manufacturer,
 							Type:         1,
-							StorehouseId: houseConfig.DrugStorehouseOut,
 						}
 						service.AddSigleDrugCancelStock(&cancelStock)
 
@@ -2383,7 +2234,6 @@ func (c *HisApiController) DeletePrescription() {
 							ProductDate:      info.ProductDate,
 							ExpiryDate:       info.ExpiryDate,
 							BatchNumberId:    info.WarehouseInfoId,
-							StorehouseId:     houseConfig.DrugStorehouseOut,
 						}
 
 						flow := models.DrugFlow{
@@ -2420,7 +2270,6 @@ func (c *HisApiController) DeletePrescription() {
 							MaxUnit:                 info.CountUnit,
 							MinUnit:                 "",
 							AdviceId:                info.AdviceId,
-							StorehouseId:            houseConfig.DrugStorehouseOut,
 						}
 						service.CreatedCancelStock(cancelStockInfo)
 						service.CreateDrugFlowOne(flow)
@@ -2429,23 +2278,6 @@ func (c *HisApiController) DeletePrescription() {
 						//删除流水
 						service.UpdateDrugFlowTens(info.PatientId, info.WarehouseOutOrderNumber, info.DrugId, item.ID)
 
-						//查询默认仓库
-						houseConfig, _ := service.GetAllStoreHouseConfig(item.UserOrgId)
-						//查询默认仓库剩余多少库存
-						list, _ := service.GetDrugSumCountByStorehouseId(houseConfig.DrugStorehouseOut, item.UserOrgId, item.DrugId)
-						var sum_count int64
-						var sum_in_count int64
-						for _, it := range list {
-							baseDrug, _ := service.GetBaseDrugMedical(it.DrugId)
-							if it.MaxUnit == baseDrug.MaxUnit {
-								it.StockMaxNumber = it.StockMaxNumber * baseDrug.MinNumber
-								it.WarehousingCount = it.WarehousingCount * baseDrug.MinNumber
-
-							}
-							sum_count += it.StockMaxNumber + it.StockMinNumber
-							sum_in_count += it.WarehousingCount
-						}
-						service.UpdateMedicalSumCount(item.DrugId, sum_count, sum_in_count, item.UserOrgId)
 					}
 				}
 
@@ -2488,7 +2320,7 @@ func (c *HisApiController) DeleteDoctorAdvice() {
 		if drugStockConfig.IsOpen == 1 {
 			//判断该医嘱是否执行了
 			if advice.ExecutionState == 1 {
-				houseConfig, _ := service.GetAllStoreHouseConfig(advice.UserOrgId)
+
 				//查询该病人该药品是否有库存记录
 				info, errcode := service.GetDrugAutoWarehouseOutSeven(advice.PatientId, advice.AdviceDate, advice.DrugId, advice.ID)
 				if errcode == gorm.ErrRecordNotFound {
@@ -2530,7 +2362,6 @@ func (c *HisApiController) DeleteDoctorAdvice() {
 							Dealer:       info.Dealer,
 							Manufacturer: info.Manufacturer,
 							Type:         1,
-							StorehouseId: houseConfig.DrugStorehouseOut,
 						}
 						service.AddSigleDrugCancelStock(&cancelStock)
 
@@ -2559,7 +2390,6 @@ func (c *HisApiController) DeleteDoctorAdvice() {
 							ProductDate:      info.ProductDate,
 							ExpiryDate:       info.ExpiryDate,
 							BatchNumberId:    info.WarehouseInfoId,
-							StorehouseId:     houseConfig.DrugStorehouseOut,
 						}
 
 						flow := models.DrugFlow{
@@ -2595,7 +2425,6 @@ func (c *HisApiController) DeleteDoctorAdvice() {
 							MaxUnit:                 info.CountUnit,
 							MinUnit:                 "",
 							AdviceId:                info.AdviceId,
-							StorehouseId:            houseConfig.DrugStorehouseOut,
 						}
 						service.CreatedCancelStock(cancelStockInfo)
 						service.CreateDrugFlowOne(flow)
@@ -2604,24 +2433,6 @@ func (c *HisApiController) DeleteDoctorAdvice() {
 						service.UpdateDrugFlowSeven(info.PatientId, info.SysRecordTime, info.DrugId, advice.ID)
 						//删除流水
 						service.UpdateDrugFlowTens(info.PatientId, info.WarehouseOutOrderNumber, info.DrugId, advice.ID)
-
-						//查询默认仓库
-						houseConfig, _ := service.GetAllStoreHouseConfig(info.OrgId)
-						//查询默认仓库剩余多少库存
-						list, _ := service.GetDrugSumCountByStorehouseId(houseConfig.DrugStorehouseOut, info.OrgId, info.DrugId)
-						var sum_count int64
-						var sum_in_count int64
-						for _, it := range list {
-							baseDrug, _ := service.GetBaseDrugMedical(it.DrugId)
-							if it.MaxUnit == baseDrug.MaxUnit {
-								it.StockMaxNumber = it.StockMaxNumber * baseDrug.MinNumber
-								it.WarehousingCount = it.WarehousingCount * baseDrug.MinNumber
-
-							}
-							sum_count += it.StockMaxNumber + it.StockMinNumber
-							sum_in_count += it.WarehousingCount
-						}
-						service.UpdateMedicalSumCount(info.DrugId, sum_count, sum_in_count, info.OrgId)
 					} else {
 
 						floatPrescrip := strconv.FormatFloat(advice.PrescribingNumber, 'f', -1, 32)
@@ -2632,10 +2443,8 @@ func (c *HisApiController) DeleteDoctorAdvice() {
 							warehouseInfo := models.DrugWarehouseInfo{
 								StockMaxNumber: prescribingNumber,
 							}
-							var sum_count int64
-							sum_count = prescribingNumber * drug.MinNumber
 							service.UpdateDrugWarehouseOne(info.WarehouseInfoId, warehouseInfo)
-							service.ModifyDrugAddInformation(info.DrugId, sum_count, info.OrgId)
+
 						}
 
 						adminUserInfo := c.GetAdminUserInfo()
@@ -2660,7 +2469,6 @@ func (c *HisApiController) DeleteDoctorAdvice() {
 							Dealer:       info.Dealer,
 							Manufacturer: info.Manufacturer,
 							Type:         1,
-							StorehouseId: houseConfig.DrugStorehouseOut,
 						}
 						service.AddSigleDrugCancelStock(&cancelStock)
 
@@ -2689,7 +2497,6 @@ func (c *HisApiController) DeleteDoctorAdvice() {
 							ProductDate:      info.ProductDate,
 							ExpiryDate:       info.ExpiryDate,
 							BatchNumberId:    info.WarehouseInfoId,
-							StorehouseId:     houseConfig.DrugStorehouseOut,
 						}
 
 						flow := models.DrugFlow{
@@ -2725,7 +2532,6 @@ func (c *HisApiController) DeleteDoctorAdvice() {
 							MaxUnit:                 info.CountUnit,
 							MinUnit:                 "",
 							AdviceId:                info.AdviceId,
-							StorehouseId:            houseConfig.DrugStorehouseOut,
 						}
 						service.CreatedCancelStock(cancelStockInfo)
 						service.CreateDrugFlowOne(flow)
@@ -2733,23 +2539,7 @@ func (c *HisApiController) DeleteDoctorAdvice() {
 						service.UpdateDrugFlowSeven(info.PatientId, info.SysRecordTime, info.DrugId, advice.ID)
 						//删除流水
 						service.UpdateDrugFlowTens(info.PatientId, info.WarehouseOutOrderNumber, info.DrugId, advice.ID)
-						//查询默认仓库
-						houseConfig, _ := service.GetAllStoreHouseConfig(info.OrgId)
-						//查询默认仓库剩余多少库存
-						list, _ := service.GetDrugSumCountByStorehouseId(houseConfig.DrugStorehouseOut, info.OrgId, info.DrugId)
-						var sum_count int64
-						var sum_in_count int64
-						for _, it := range list {
-							baseDrug, _ := service.GetBaseDrugMedical(it.DrugId)
-							if it.MaxUnit == baseDrug.MaxUnit {
-								it.StockMaxNumber = it.StockMaxNumber * baseDrug.MinNumber
-								it.WarehousingCount = it.WarehousingCount * baseDrug.MinNumber
 
-							}
-							sum_count += it.StockMaxNumber + it.StockMinNumber
-							sum_in_count += it.WarehousingCount
-						}
-						service.UpdateMedicalSumCount(info.DrugId, sum_count, sum_in_count, info.OrgId)
 					}
 				}
 			}
@@ -2786,7 +2576,6 @@ func (c *HisApiController) DeleteProject() {
 		if project.Type == 3 {
 			good, _ := service.FindGoodInfoByIdTwo(project.ProjectId)
 			f_count, _ := strconv.ParseFloat(project.Count, 64)
-			houseConfig, _ := service.GetAllStoreHouseConfig(c.GetAdminUserInfo().CurrentOrgId)
 			good.Total = good.Total + f_count
 			service.UpdateGoodInfo(&good)
 
@@ -2800,15 +2589,14 @@ func (c *HisApiController) DeleteProject() {
 			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,
-				StorehouseId: houseConfig.StorehouseOutInfo,
+				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 {
@@ -2845,7 +2633,6 @@ func (c *HisApiController) DeleteProject() {
 					WarehouseInfoId: info.WarehouseInfotId,
 					PatientId:       info.PatientId,
 					RecordDate:      info.SysRecordTime,
-					StorehouseId:    houseConfig.StorehouseOutInfo,
 				}
 
 				service.CreateCancelStockInfoOne(&cancelStockInfo)
@@ -2882,7 +2669,6 @@ func (c *HisApiController) DeleteProject() {
 					CancelOutDetailId:       cancelInfo.ID,
 					ProductDate:             info.ProductDate,
 					ExpireDate:              info.ExpiryDate,
-					StorehouseId:            houseConfig.StorehouseOutInfo,
 				}
 				service.CreateStockFlowOne(flow)
 
@@ -2900,16 +2686,7 @@ func (c *HisApiController) DeleteProject() {
 				}
 				//回退库存
 				service.UpDateWarehouseInfoByStockDelete(info.WarehouseInfotId, total_count)
-				//查询默认仓库
-				houseConfig, _ := service.GetAllStoreHouseConfig(project.UserOrgId)
-				goodList, _ := service.GetGoodSumCountByStoreId(houseConfig.StorehouseOutInfo, project.ProjectId, project.UserOrgId)
-				var sum_count int64
-				var sum_in_count int64
-				for _, it := range goodList {
-					sum_count += it.StockCount
-					sum_in_count += it.WarehousingCount
-				}
-				service.UpdateGoodByGoodId(project.ProjectId, sum_count, sum_in_count, project.UserOrgId)
+
 				//查询今日该耗材退库数量
 				cancelInfoOne, _ := service.GetCancelStockInfoByPatientId(info.PatientId, project.ProjectId, info.SysRecordTime)
 				var cancel_count int64
@@ -2944,7 +2721,6 @@ func (c *HisApiController) DeleteProject() {
 							Manufacturer:            0,
 							Type:                    1,
 							IsSys:                   1,
-							StorehouseId:            houseConfig.StorehouseOutInfo,
 						}
 						err := service.AddSigleWarehouseOut(&warehouseOut)
 						if err != nil {
@@ -2952,25 +2728,23 @@ func (c *HisApiController) DeleteProject() {
 							return
 						}
 						prepare := &models.DialysisBeforePrepare{
-							UserOrgId:    adminInfo.CurrentOrgId,
-							PatientId:    info.PatientId,
-							RecordDate:   info.SysRecordTime,
-							GoodId:       project.ProjectId,
-							GoodTypeId:   info.GoodTypeId,
-							Count:        cha_count,
-							StorehouseId: houseConfig.StorehouseOutInfo,
+							UserOrgId:  adminInfo.CurrentOrgId,
+							PatientId:  info.PatientId,
+							RecordDate: info.SysRecordTime,
+							GoodId:     project.ProjectId,
+							GoodTypeId: info.GoodTypeId,
+							Count:      cha_count,
 						}
 						//出库
 						service.ConsumablesDelivery(adminInfo.CurrentOrgId, info.PatientId, info.SysRecordTime, prepare, &warehouseOut, cha_count)
 					} else if err == nil {
 						prepare := &models.DialysisBeforePrepare{
-							UserOrgId:    adminInfo.CurrentOrgId,
-							PatientId:    info.PatientId,
-							RecordDate:   info.SysRecordTime,
-							GoodId:       project.ProjectId,
-							GoodTypeId:   info.GoodTypeId,
-							Count:        cha_count,
-							StorehouseId: houseConfig.StorehouseOutInfo,
+							UserOrgId:  adminInfo.CurrentOrgId,
+							PatientId:  info.PatientId,
+							RecordDate: info.SysRecordTime,
+							GoodId:     project.ProjectId,
+							GoodTypeId: info.GoodTypeId,
+							Count:      cha_count,
 						}
 						//出库
 						service.ConsumablesDelivery(adminInfo.CurrentOrgId, info.PatientId, info.SysRecordTime, prepare, &out, cha_count)
@@ -5784,7 +5558,6 @@ func (c *HisApiController) GetFaPiaoData() {
 	his, _ := service.GetHisPatientInfoThree(adminUser.CurrentOrgId, number)
 
 	his_hospital_record, _ := service.GetInHospitalRecordByNumber(order.MdtrtId)
-	miConfig, _ := service.FindMedicalInsuranceInfo(c.GetAdminUserInfo().CurrentOrgId)
 
 	//prescriptions, _ := service.GetHisPrescriptionThree(adminUser.CurrentOrgId, patient_id, order.Number)
 
@@ -6126,7 +5899,6 @@ func (c *HisApiController) GetFaPiaoData() {
 		"zhenChaCostSelfTotal":        zhenChaCostSelfTotal,
 		"zhenChaCostPartSelfTotal":    zhenChaCostPartSelfTotal,
 		"his_hospital_record":         his_hospital_record,
-		"org_name":                    miConfig.OrgName,
 	})
 
 }