11月8日库存管理

controllers/his_api_controller.go

@@ -2123,6 +2123,16 @@ func (c *HisApiController) DeletePrescription() {
 								}
 								//出库
 								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{
@@ -2136,6 +2146,16 @@ func (c *HisApiController) DeletePrescription() {
 								}
 								//出库
 								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)
 							}
 
 						}
@@ -2182,7 +2202,7 @@ func (c *HisApiController) DeletePrescription() {
 						}
 
 						service.UpdateDrugWarehouse(info.WarehouseInfoId, warehouseInfo)
-						service.ModifyDrugAddInformation(info.DrugId, warehouseInfo.StockMinNumber, warehouseInfo.OrgId)
+
 						adminUserInfo := c.GetAdminUserInfo()
 						operation_time := time.Now().Unix()
 						creater := adminUserInfo.AdminUser.Id
@@ -2279,6 +2299,24 @@ 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)
 
@@ -2290,9 +2328,7 @@ func (c *HisApiController) DeletePrescription() {
 								StorehouseId:   houseConfig.DrugStorehouseOut,
 							}
 							service.UpdateDrugWarehouseOne(info.WarehouseInfoId, warehouseInfo)
-							var sum_count int64
-							sum_count = prescribingNumber * drug.MinNumber
-							service.ModifyDrugAddInformation(info.DrugId, sum_count, info.OrgId)
+
 						}
 
 						adminUserInfo := c.GetAdminUserInfo()
@@ -2393,6 +2429,23 @@ 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)
 					}
 				}
 
@@ -2454,7 +2507,7 @@ func (c *HisApiController) DeleteDoctorAdvice() {
 						}
 
 						service.UpdateDrugWarehouse(info.WarehouseInfoId, warehouseInfo)
-						service.ModifyDrugAddInformation(info.DrugId, warehouseInfo.StockMinNumber, info.OrgId)
+
 						adminUserInfo := c.GetAdminUserInfo()
 						operation_time := time.Now().Unix()
 						creater := adminUserInfo.AdminUser.Id
@@ -2551,6 +2604,24 @@ 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)
@@ -2662,7 +2733,23 @@ 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)
 					}
 				}
 			}
@@ -2813,7 +2900,16 @@ func (c *HisApiController) DeleteProject() {
 				}
 				//回退库存
 				service.UpDateWarehouseInfoByStockDelete(info.WarehouseInfotId, total_count)
-				service.ModifyGoodAddInformation(info.GoodId, total_count, info.OrgId)
+				//查询默认仓库
+				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

controllers/patient_api_controller.go

@@ -576,6 +576,8 @@ func (c *PatientApiController) EditPatient() {
 	key := "scheduals_" + today + "_" + strconv.FormatInt(adminUserInfo.CurrentOrgId, 10)
 	redis.Set(key, "", time.Second*60*60*18)
 
+	keyOne := strconv.FormatInt(adminUserInfo.CurrentOrgId, 10) + ":" + strconv.FormatInt(id, 10) + ":patient_info"
+	redis.Set(keyOne, "", time.Second*60*60*18)
 	if len(record_date) > 0 {
 		var recordTime int64
 		timeLayout := "2006-01-02"

controllers/secondary_order_api_contorller.go

@@ -1449,8 +1449,6 @@ func (this *SecondaryOrderApiController) ReturnCheckSecondOrder() {
 				total_count = item.Count
 			}
 
-			fmt.Println("total_count2332323223233232332", total_count)
-			fmt.Println("total2323322332322332233", total)
 			if total_count <= total {
 
 				//回退库存,查询该订单出库记录
@@ -1479,7 +1477,7 @@ func (this *SecondaryOrderApiController) ReturnCheckSecondOrder() {
 
 					//查询出单
 					storeWarehouseOut, _ := service.GetStoreDrugWarehouseOutById(it.WarehouseOutId, it.OrgId)
-					fmt.Println("ss喊出232323232332232323232332232333333333333333333333")
+
 					//删除出库单
 					service.DeleteStoreWarehouseOut(storeWarehouseOut.ID, storeWarehouseOut.OrgId, item.ProjectId)
 				}