11月8日库存管理

conf/app.conf

@@ -1,5 +1,5 @@
 appname = 血透
-httpport = 9531
+httpport = 9529
 runmode = dev
 
 #

controllers/his_api_controller.go

@@ -757,6 +757,7 @@ func (c *HisApiController) CreateHisPrescription() {
 								totals := strconv.FormatInt(total_count, 10)
 								//查询该药品是否存在开药记录
 								advicelist, _ := service.GetHisAdviceListByDrugIdEight(drug_id, patient_id, recordDateTime, adviceId)
+
 								//修改处方
 								if advicelist.ID > 0 {
 									var device_number int64
@@ -810,6 +811,7 @@ func (c *HisApiController) CreateHisPrescription() {
 										}
 									}
 								}
+
 							}
 						}
 					}
@@ -845,7 +847,7 @@ func (c *HisApiController) CreateHisPrescription() {
 								if project_type == 3 {
 
 									//查找该耗材的出库记录
-									goodWarehouseInfo, _ := service.GetAutoRecordByGoodId(project_id, patient_id, recordDateTime)
+									goodWarehouseInfo, _ := service.GetAutoRecordByGoodIdSeven(project_id, patient_id, recordDateTime)
 
 									if goodWarehouseInfo.ID == 0 {
 										good, _ := service.FindGoodInfoByIdSeven(project_id)
@@ -927,6 +929,7 @@ func (c *HisApiController) CreateHisPrescription() {
 
 									//查询该药品是否存在开药记录
 									advicelist, _ := service.GetHisAdviceListByDrugIdEight(drug_id, patient_id, recordDateTime, adviceId)
+
 									//修改处方
 									if advicelist.ID > 0 {
 										var device_number int64
@@ -953,18 +956,31 @@ func (c *HisApiController) CreateHisPrescription() {
 											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)
+												var stock_max_number int64
+												var stock_min_number int64
+												if druginfo.Count >= drug.MinNumber {
+													stock_max_number = druginfo.Count / drug.MinNumber
+													fmt.Println("大的值2323233232232323", stock_max_number)
+													service.ModefyDrugByWarehouseInfo(druginfo.WarehouseInfoId, stock_max_number)
+													stock_min_number = druginfo.Count % drug.MinNumber
+													fmt.Println("小的值322332332323233223", stock_min_number)
+													service.ModefyDrugByWarehouseInfoOne(druginfo.WarehouseInfoId, stock_min_number)
+
+												} else {
+													service.ModefyDrugByWarehouseInfoOne(druginfo.WarehouseInfoId, druginfo.Count)
+												}
+
 											}
 
 											if druginfo.CountUnit == drug.MaxUnit && druginfo.CountUnit == drug.MinUnit && drug.MaxUnit == drug.MinUnit {
@@ -1009,9 +1025,10 @@ func (c *HisApiController) CreateHisPrescription() {
 										total, _ := project.(map[string]interface{})["total"].(string)
 										parsetotal, _ = strconv.ParseInt(total, 10, 64)
 									}
+
 									if project_type == 3 {
 										//查找该耗材的出库记录
-										goodWarehouseInfo, _ := service.GetAutoRecordByGoodId(project_id, patient_id, recordDateTime)
+										goodWarehouseInfo, _ := service.GetAutoRecordByGoodIdSeven(project_id, patient_id, recordDateTime)
 										//查询该患者耗材的历史数据
 										ordProject, _ := service.GetHisProjectPrescriptionByPatientId(patient_id, recordDateTime)
 										if goodWarehouseInfo.ID > 0 {
@@ -1269,9 +1286,7 @@ func (c *HisApiController) CreateHisPrescription() {
 							redis := service.RedisClient()
 							key := strconv.FormatInt(adminInfo.CurrentOrgId, 10) + ":" + strconv.FormatInt(theTime.Unix(), 10) + ":his_advices_list_all"
 							redis.Set(key, "", time.Second)
-							fmt.Println("key55555555555555", key)
 							keyOne := strconv.FormatInt(adminInfo.CurrentOrgId, 10) + ":" + strconv.FormatInt(patient_id, 10) + ":" + strconv.FormatInt(recordDateTime, 10) + ":his_doctor_advice"
-							fmt.Println("keyOne", keyOne)
 							redis.Set(keyOne, "", time.Second)
 							keySeven := "scheduals_" + record_date + "_" + strconv.FormatInt(adminInfo.CurrentOrgId, 10)
 							redis.Set(keySeven, "", time.Second)
@@ -1284,7 +1299,6 @@ func (c *HisApiController) CreateHisPrescription() {
 							service.CreateHisDoctorAdvice(&s)
 							keySix := strconv.FormatInt(adminInfo.CurrentOrgId, 10) + ":" + strconv.FormatInt(theTime.Unix(), 10) + ":his_advices_list_all"
 							redis.Set(keySix, "", time.Second)
-							fmt.Println("key55555555555555", keySix)
 							keyFive := strconv.FormatInt(adminInfo.CurrentOrgId, 10) + ":" + strconv.FormatInt(patient_id, 10) + ":" + strconv.FormatInt(recordDateTime, 10) + ":his_doctor_advice"
 							redis.Set(keyFive, "", time.Second)
 							keyEight := "scheduals_" + record_date + "_" + strconv.FormatInt(adminInfo.CurrentOrgId, 10)
@@ -3143,7 +3157,7 @@ func (c *HisApiController) setAdviceWithJSON(advice *models.HisDoctorAdviceInfo,
 					advice.StartTime = hisAdvice.StartTime
 					advice.HospApprFlag = hisAdvice.HospApprFlag
 
-					if hisAdvice.SingleDose != advice.SingleDose || hisAdvice.DeliveryWay != advice.DeliveryWay || hisAdvice.ExecutionFrequency != advice.ExecutionFrequency || hisAdvice.Day != advice.Day || hisAdvice.PrescribingNumber != advice.PrescribingNumber || hisAdvice.Price != advice.Price || hisAdvice.Remark != advice.Remark {
+					if hisAdvice.SingleDose != advice.SingleDose || hisAdvice.DeliveryWay != advice.DeliveryWay || hisAdvice.ExecutionFrequency != advice.ExecutionFrequency || hisAdvice.Day != advice.Day || hisAdvice.PrescribingNumber != advice.PrescribingNumber || hisAdvice.Price != advice.Price || hisAdvice.Remark != advice.Remark || hisAdvice.PrescribingNumberUnit != advice.PrescribingNumberUnit {
 						advice.ExecutionTime = 0
 						advice.ExecutionStaff = 0
 						advice.ExecutionState = 2

controllers/mobile_api_controllers/dialysis_api_controller.go

@@ -4706,10 +4706,17 @@ func (c *DialysisAPIController) CreateOtherStockOutInfo() {
 
 				count, _ := strconv.ParseInt(items["count"].(string), 10, 64)
 
+				if items["project_id"] == nil || reflect.TypeOf(items["project_id"]).String() != "float64" {
+					utils.ErrorLog("project_id")
+					c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+					return
+				}
+				project_id := int64(items["project_id"].(float64))
 				prepare := &models.DialysisBeforePrepareGoods{
 					GoodId:     good_id,
 					GoodTypeId: good_type_id,
 					Count:      count,
+					ProjectId:  project_id,
 				}
 				beforePrepares = append(beforePrepares, prepare)
 
@@ -4717,6 +4724,7 @@ func (c *DialysisAPIController) CreateOtherStockOutInfo() {
 					GoodId:     good_id,
 					GoodTypeId: good_type_id,
 					Count:      count,
+					ProjectId:  project_id,
 				}
 				newBeforePrepares = append(newBeforePrepares, newPrepare)
 			}
@@ -4760,6 +4768,7 @@ func (c *DialysisAPIController) CreateOtherStockOutInfo() {
 			Creater:    adminInfo.AdminUser.Id,
 			Status:     1,
 			Ctime:      time.Now().Unix(),
+			ProjectId:  item.ProjectId,
 		}
 		//清空准备表的数据
 		err = service.DeleteDialysisBefor(adminInfo.Org.Id, patient_id, record_time, item.GoodId, item.GoodTypeId)

controllers/mobile_api_controllers/patient_api_controller.go

@@ -636,7 +636,7 @@ func (c *PatientApiController) ExecDoctorAdvice() {
 
 			fmt.Println("theTIME", theTime)
 			keyFour := "scheduals_" + theTime + "_" + strconv.FormatInt(adminUserInfo.Org.Id, 10)
-			fmt.Println("keyFour323223323232323232", keyFour)
+
 			redis.Set(keyFour, "", time.Second)
 			keyFive := strconv.FormatInt(adminUserInfo.Org.Id, 10) + ":" + strconv.FormatInt(advice.AdviceDate, 10) + ":his_advices_list_all"
 			redis.Set(keyFive, "", time.Second)

models/dialysis.go

@@ -1028,6 +1028,7 @@ type DialysisBeforePrepare struct {
 	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"`
+	ProjectId    int64                    `gorm:"column:project_id" json:"project_id" form:"project_id"`
 }
 
 func (DialysisBeforePrepare) TableName() string {
@@ -1040,6 +1041,7 @@ type DialysisBeforePrepareGoods struct {
 	GoodTypeId        int64  `gorm:"column:good_type_id" json:"good_type_id" form:"good_type_id"`
 	TypeName          string `gorm:"column:type_name" json:"type_name" form:"type_name"`
 	SpecificationName string `gorm:"column:specification_name" json:"specification_name" form:"specification_name"`
+	ProjectId         int64  `gorm:"column:project_id" json:"project_id" form:"project_id"`
 }
 
 type NewDialysisBeforePrepareGoods struct {
@@ -1049,6 +1051,7 @@ type NewDialysisBeforePrepareGoods struct {
 	TypeName          string `gorm:"column:type_name" json:"type_name" form:"type_name"`
 	SpecificationName string `gorm:"column:specification_name" json:"specification_name" form:"specification_name"`
 	NewCount          int64  `gorm:"column:new_count" json:"new_count" form:"new_count"`
+	ProjectId         int64  `gorm:"column:project_id" json:"project_id" form:"project_id"`
 }
 
 type QueueCallConfig struct {

models/dialysis_parameter_models.go

@@ -95,6 +95,7 @@ type BloodAutomaticReduceDetail struct {
 	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"`
+	ProjectId               int64  `gorm:"column:project_id" json:"project_id" form:"project_id"`
 }
 
 func (BloodAutomaticReduceDetail) TableName() string {

models/stock_models.go

@@ -232,12 +232,22 @@ type WarehouseOutInfo struct {
 	Number                  string       `gorm:"column:number" json:"number" form:"number"`
 	LicenseNumber           string       `gorm:"column:license_number" json:"license_number" form:"license_number"`
 	ConsumableType          int64        `gorm:"column:consumable_type" json:"consumable_type" form:"consumable_type"`
+	ProjectId               int64        `gorm:"column:project_id" json:"project_id" form:"project_id"`
 }
 
 func (WarehouseOutInfo) TableName() string {
 	return "xt_warehouse_out_info"
 }
 
+type WarehouseOutInfoSeven struct {
+	ID    int64 `gorm:"column:id" json:"id"`
+	Count int64 `gorm:"column:count" json:"count"`
+}
+
+func (WarehouseOutInfoSeven) TableName() string {
+	return "xt_warehouse_out_info"
+}
+
 type SalesReturn struct {
 	ID           int64  `gorm:"column:id" json:"id"`
 	OrderNumber  string `gorm:"column:order_number" json:"order_number"`
@@ -372,6 +382,7 @@ type AutomaticReduceDetail struct {
 	Count                   int64               `gorm:"column:count" json:"count"`
 	Type                    int64               `gorm:"column:type" json:"type"`
 	WarehouseOutInfo        []*WarehouseOutInfo `gorm:"ForeignKey:PatientId;AssociationForeignKey:PatientId" json:"warehouseOutInfo"`
+	ProjectId               int64               `gorm:"column:project_id" json:"project_id" form:"project_id"`
 }
 
 func (AutomaticReduceDetail) TableName() string {
@@ -552,6 +563,7 @@ type VmStockFlow struct {
 	ProductDate             int64   `gorm:"column:product_date" json:"product_date" form:"product_date"`
 	ExpireDate              int64   `gorm:"column:expire_date" json:"expire_date" form:"expire_date"`
 	ReturnCount             int64   `gorm:"column:return_count" json:"return_count" form:"return_count"`
+	ProjectId               int64   `gorm:"column:project_id" json:"project_id" form:"project_id"`
 }
 
 func (VmStockFlow) TableName() string {

service/stock_service.go

@@ -3531,6 +3531,12 @@ func GetAutoRecordByGoodId(goodid int64, patientid int64, recorddate int64) (mod
 	return detail, err
 }
 
+func GetAutoRecordByGoodIdSeven(goodid int64, patientid int64, recorddate int64) (models.WarehouseOutInfoSeven, error) {
+	detail := models.WarehouseOutInfoSeven{}
+	err := XTReadDB().Model(&detail).Where("sys_record_time = ? and good_id = ? and patient_id = ?  and status = 1", recorddate, goodid, patientid).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

service/warhouse_service.go

@@ -580,19 +580,8 @@ func HisDrugDeliverInfo(orgID int64, prescribingNumber float64, warehouseout *mo
 		var maxNumber int64 = 0
 		var minNumber int64 = 0
 
-		//fmt.Println("deliver_number23332323232333232323233232323232",deliver_number)
 		maxNumber = deliver_number / drup.MinNumber
-
-		if deliver_number <= drup.MinNumber {
-			minNumber = deliver_number % drup.MinNumber
-		} else {
-			minNumber = deliver_number
-		}
-
-		if deliver_number <= drup.MinNumber && warehouse.StockMaxNumber == 0 {
-			minNumber = deliver_number
-		}
-
+		minNumber = deliver_number % drup.MinNumber
 		if warehouse.StockMaxNumber == 0 && drup.MaxUnit == drup.MinUnit {
 			minNumber = maxNumber
 		}
@@ -604,21 +593,21 @@ func HisDrugDeliverInfo(orgID int64, prescribingNumber float64, warehouseout *mo
 		}
 
 		warehouse.StockMaxNumber = warehouse.StockMaxNumber - maxNumber
-		//fmt.Println("最大单位23323232323232332323233232323",warehouse.StockMaxNumber)
+
 		if warehouse.StockMaxNumber < 0 {
 			warehouse.StockMaxNumber = 0
 		}
+		if warehouse.StockMinNumber < 0 {
+			warehouse.StockMinNumber = 0
+		}
 
 		warehouse.Mtime = time.Now().Unix()
-		//fmt.Println("最小单位2323223233232233233232323232323323232",warehouse.StockMinNumber)
-		//fmt.Println("最小换算量233232332322323322332323232332323223",minNumber)
+
 		if warehouse.StockMinNumber < minNumber {
 			warehouse.StockMaxNumber = warehouse.StockMaxNumber - 1
 			warehouse.StockMinNumber = warehouse.StockMinNumber + drup.MinNumber - minNumber
 		} else {
-			//fmt.Println("hhhhhhhhhhhhhhhhhhhhhhhhh",warehouse.StockMinNumber,minNumber)
 			warehouse.StockMinNumber = warehouse.StockMinNumber - minNumber
-			//fmt.Println("我的魏2232332322323323",warehouse.StockMinNumber)
 		}
 
 		if drup.MaxUnit != drup.MinUnit {
@@ -1054,6 +1043,7 @@ func ConsumablesDeliveryTotal(orgID int64, patient_id int64, record_time int64,
 				GoodTypeId: item.GoodTypeId,
 				GoodId:     item.GoodId,
 				Count:      item.Count,
+				ProjectId:  item.ProjectId,
 			}
 
 			ConsumablesDelivery(orgID, patient_id, record_time, &prepare, &out, newCount)
@@ -1116,6 +1106,7 @@ func ConsumablesDelivery(orgID int64, patient_id int64, record_time int64, goods
 			Price:                   info.PackingPrice,
 			ExpiryDate:              warehouse.ExpiryDate,
 			ProductDate:             warehouse.ProductDate,
+			ProjectId:               goods.ProjectId,
 		}
 		warehouseOutInfo.Count = count
 
@@ -1141,6 +1132,7 @@ func ConsumablesDelivery(orgID int64, patient_id int64, record_time int64, goods
 			GoodId:                  goods.GoodId,
 			GoodTypeId:              goods.GoodTypeId,
 			Count:                   count,
+			ProjectId:               goods.ProjectId,
 		}
 		//查询当天耗材是否已经存在数据
 		_, errcode := GetAutoMaticReduceDetail(orgID, patient_id, record_time, goods.GoodId, goods.GoodTypeId)
@@ -1174,6 +1166,7 @@ func ConsumablesDelivery(orgID int64, patient_id int64, record_time int64, goods
 				WarehouseOutOrderNumber: warehouseOut.WarehouseOutOrderNumber,
 				IsSys:                   1,
 				PatientId:               patient_id,
+				ProjectId:               goods.ProjectId,
 			}
 			//查询流水是否存在
 			exsit, errflow := GetStockFlowIsExsit(warehouse.ID, patient_id, record_time, goods.GoodId)
@@ -1209,6 +1202,7 @@ func ConsumablesDelivery(orgID int64, patient_id int64, record_time int64, goods
 					IsSys:                   1,
 					PatientId:               patient_id,
 					ReturnCount:             exsit.Count + (exsit.Count + deliver_number),
+					ProjectId:               goods.ProjectId,
 				}
 
 				errFour := UpdatedStockFlowOne(flow, warehouse.ID, patient_id, record_time, goods.GoodId)
@@ -1241,6 +1235,7 @@ func ConsumablesDelivery(orgID int64, patient_id int64, record_time int64, goods
 				WarehouseOutOrderNumber: warehouseOut.WarehouseOutOrderNumber,
 				IsSys:                   1,
 				PatientId:               patient_id,
+				ProjectId:               goods.ProjectId,
 			}
 			//查询流水是否存在
 			exsit, errflow := GetStockFlowIsExsit(warehouse.ID, patient_id, record_time, goods.GoodId)
@@ -1275,6 +1270,7 @@ func ConsumablesDelivery(orgID int64, patient_id int64, record_time int64, goods
 					IsSys:                   1,
 					PatientId:               patient_id,
 					ReturnCount:             exsit.Count + (exsit.Count + deliver_number),
+					ProjectId:               goods.ProjectId,
 				}
 				//UpdatedStockFlow(flow)
 				UpdatedStockFlowOne(flow, warehouse.ID, patient_id, record_time, goods.GoodId)
@@ -1327,6 +1323,7 @@ func ConsumablesDelivery(orgID int64, patient_id int64, record_time int64, goods
 			Price:                   info.PackingPrice,
 			ExpiryDate:              warehouse.ExpiryDate,
 			ProductDate:             warehouse.ProductDate,
+			ProjectId:               goods.ProjectId,
 		}
 		warehouseOutInfo.Count = stock_number
 
@@ -1362,6 +1359,7 @@ func ConsumablesDelivery(orgID int64, patient_id int64, record_time int64, goods
 				WarehouseOutOrderNumber: warehouseOut.WarehouseOutOrderNumber,
 				IsSys:                   1,
 				PatientId:               patient_id,
+				ProjectId:               goods.ProjectId,
 			}
 			//查询流水是否存在
 			exsit, errflows := GetStockFlowIsExsit(warehouse.ID, patient_id, record_time, goods.GoodId)
@@ -1394,6 +1392,7 @@ func ConsumablesDelivery(orgID int64, patient_id int64, record_time int64, goods
 					IsSys:                   1,
 					PatientId:               patient_id,
 					ReturnCount:             exsit.Count + (exsit.Count + deliver_number),
+					ProjectId:               goods.ProjectId,
 				}
 				//UpdatedStockFlow(flow)
 				UpdatedStockFlowOne(flow, warehouse.ID, patient_id, record_time, goods.GoodId)
@@ -1429,6 +1428,7 @@ func ConsumablesDelivery(orgID int64, patient_id int64, record_time int64, goods
 				WarehouseOutOrderNumber: warehouseOut.WarehouseOutOrderNumber,
 				IsSys:                   1,
 				PatientId:               patient_id,
+				ProjectId:               goods.ProjectId,
 			}
 			//查询流水是否存在
 			exsit, errflows := GetStockFlowIsExsit(warehouse.ID, patient_id, record_time, goods.GoodId)
@@ -1460,6 +1460,7 @@ func ConsumablesDelivery(orgID int64, patient_id int64, record_time int64, goods
 					WarehouseOutOrderNumber: warehouseOut.WarehouseOutOrderNumber,
 					IsSys:                   1,
 					PatientId:               patient_id,
+					ProjectId:               goods.ProjectId,
 				}
 				//UpdatedStockFlow(flow)
 				UpdatedStockFlowOne(flow, warehouse.ID, patient_id, record_time, goods.GoodId)