11月9日库存管理

controllers/dialysis_api_controller.go

@@ -85,6 +85,10 @@ func DialysisApiRegistRouters() {
 	beego.Router("/api/patient/getdialysisparameter", &DialysisApiController{}, "Get:GetDialysisParameterList")
 
 	beego.Router("/api/patient/getdialysisgoodtotalcount", &DialysisApiController{}, "Get:GetDialysisGoodTotalCount")
+
+	beego.Router("/api/patient/getdialysisadvicescheduelist", &DialysisApiController{}, "Get:GetDialysisAdviceSchedulist")
+
+	beego.Router("/api/patient/getdialysisparametergoodlist", &DialysisApiController{}, "Get:GetDialysisParameterGoodList")
 }
 
 func (c *DialysisApiController) GetQueueCall() {
@@ -4422,7 +4426,7 @@ func (this *DialysisApiController) GetDialysisGoodTotalCount() {
 
 	partion_type, _ := this.GetInt64("partion_type")
 
-	start_time := this.GetString("schedule_date")
+	start_time := this.GetString("selected_date")
 	timeLayout := "2006-01-02"
 	loc, _ := time.LoadLocation("Local")
 	startTime, _ := time.ParseInLocation(timeLayout+" 15:04:05", start_time+" 00:00:00", loc)
@@ -4439,3 +4443,63 @@ func (this *DialysisApiController) GetDialysisGoodTotalCount() {
 		return
 	}
 }
+
+func (this *DialysisApiController) GetDialysisAdviceSchedulist() {
+
+	orgId := this.GetAdminUserInfo().CurrentOrgId
+
+	schedule_type, _ := this.GetInt64("schedule_type")
+
+	partion_type, _ := this.GetInt64("partion_type")
+
+	start_time := this.GetString("selected_date")
+	timeLayout := "2006-01-02"
+	loc, _ := time.LoadLocation("Local")
+	startTime, _ := time.ParseInLocation(timeLayout+" 15:04:05", start_time+" 00:00:00", loc)
+
+	list, err := service.GetDialysisAdviceSchedulist(orgId, schedule_type, partion_type, startTime.Unix())
+	drug, _ := service.GetAllDrugMap(orgId)
+	//获取长期医嘱
+	adviceList, _ := service.GetAllLongAdviceList(orgId)
+	//获取医嘱模版
+	templateList, _ := service.GetAllHisAdviceTemplateList(orgId)
+	if err == nil {
+		this.ServeSuccessJSON(map[string]interface{}{
+			"list":         list,
+			"drug":         drug,
+			"adviceList":   adviceList,
+			"templateList": templateList,
+		})
+		return
+
+	} else {
+		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeSystemError)
+		return
+	}
+}
+
+func (this *DialysisApiController) GetDialysisParameterGoodList() {
+
+	orgId := this.GetAdminUserInfo().CurrentOrgId
+
+	schedule_type, _ := this.GetInt64("schedule_type")
+
+	partion_type, _ := this.GetInt64("partion_type")
+
+	start_time := this.GetString("selected_date")
+	timeLayout := "2006-01-02"
+	loc, _ := time.LoadLocation("Local")
+	startTime, _ := time.ParseInLocation(timeLayout+" 15:04:05", start_time+" 00:00:00", loc)
+
+	list, err := service.GetDialysisParameterGoodList(orgId, schedule_type, partion_type, startTime.Unix())
+	if err == nil {
+		this.ServeSuccessJSON(map[string]interface{}{
+			"list": list,
+		})
+		return
+
+	} else {
+		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeSystemError)
+		return
+	}
+}

controllers/his_api_controller.go

@@ -2009,7 +2009,7 @@ func (c *HisApiController) CreateHisPrescription() {
 							p.HisPatientId = his_patient_id
 							p.Status = 1
 							p.StartTime = pTime
-
+							p.IsOut = 2
 							errcode := c.setProjectWithJSON(&p, project.(map[string]interface{}))
 							if errcode > 0 {
 								c.ServeFailJSONWithSGJErrorCode(errcode)
@@ -2524,7 +2524,7 @@ func (c *HisApiController) DeletePrescription() {
 		for _, item := range projects {
 			service.DeletePrintInfo(item.ID) //删除打印信息
 			if stockConfig.IsOpen == 1 {
-				if item.Type == 3 {
+				if item.Type == 3 && item.IsOut == 1 {
 					good, _ := service.FindGoodInfoByIdTwo(item.ProjectId)
 					f_count, _ := strconv.ParseFloat(item.Count, 64)
 					good.Total = good.Total + f_count
@@ -2659,9 +2659,6 @@ func (c *HisApiController) DeletePrescription() {
 							service.DeleteAutoRedeceDetailTen(c.GetAdminUserInfo().CurrentOrgId, info.PatientId, info.SysRecordTime, item.ProjectId)
 						}
 
-						////删除出库表
-						//service.DeleteAutoRedeceDetailTen(c.GetAdminUserInfo().CurrentOrgId, info.PatientId, info.SysRecordTime, item.ProjectId)
-
 						//退库数量增加
 						service.UpdateSumAddCancelCount(c.GetAdminUserInfo().CurrentOrgId, item.ProjectId, houseConfig.StorehouseOutInfo, total_count)
 						//出库数量减少
@@ -2932,7 +2929,7 @@ func (c *HisApiController) DeleteProject() {
 			fmt.Println(err)
 		}
 
-		if project.Type == 3 {
+		if project.Type == 3 && project.IsOut == 1 {
 			houseConfig, _ := service.GetAllStoreHouseConfig(c.GetAdminUserInfo().CurrentOrgId)
 			good, _ := service.FindGoodInfoByIdTwo(project.ProjectId)
 			f_count, _ := strconv.ParseFloat(project.Count, 64)
@@ -3016,7 +3013,7 @@ func (c *HisApiController) DeleteProject() {
 					Count:                   prescribingNumber,
 					UserOrgId:               adminInfo.CurrentOrgId,
 					PatientId:               project.PatientId,
-					SystemTime:              time.Now().Unix(),
+					SystemTime:              info.SysRecordTime,
 					ConsumableType:          7,
 					IsSys:                   0,
 					WarehousingOrder:        "",
@@ -3175,6 +3172,9 @@ func (c *HisApiController) DeleteProject() {
 			}
 			err := service.DelelteProject(id, c.GetAdminUserInfo().CurrentOrgId)
 			fmt.Println(err)
+		} else {
+			err := service.DelelteProject(id, c.GetAdminUserInfo().CurrentOrgId)
+			fmt.Println(err)
 		}
 
 	}

controllers/mobile_api_controllers/patient_api_controller.go

@@ -777,6 +777,8 @@ func (c *PatientApiController) ExecDoctorAdvice() {
 												sum_count += its.StockMaxNumber + its.StockMinNumber
 											}
 											service.UpdateBaseDrugSumTwo(item.DrugId, sum_count, item.UserOrgId)
+											//剩余库存
+											service.UpdateDrugStockCount(item.DrugId, item.UserOrgId, storeHouseConfig.DrugStorehouseOut, sum_count)
 										}
 									}
 								} else {
@@ -798,6 +800,8 @@ func (c *PatientApiController) ExecDoctorAdvice() {
 											sum_count += its.StockMaxNumber + its.StockMinNumber
 										}
 										service.UpdateBaseDrugSumTwo(item.DrugId, sum_count, item.UserOrgId)
+										//剩余库存
+										service.UpdateDrugStockCount(item.DrugId, item.UserOrgId, storeHouseConfig.DrugStorehouseOut, sum_count)
 									}
 								}
 							}
@@ -899,6 +903,8 @@ func (c *PatientApiController) ExecDoctorAdvice() {
 										sum_count += its.StockMaxNumber + its.StockMinNumber
 									}
 									service.UpdateBaseDrugSumTwo(item.DrugId, sum_count, item.UserOrgId)
+									//剩余库存
+									service.UpdateDrugStockCount(item.DrugId, item.UserOrgId, storeHouseConfig.DrugStorehouseOut, sum_count)
 									c.ServeSuccessJSON(map[string]interface{}{
 										"msg":    "1",
 										"advice": advice,
@@ -1214,6 +1220,8 @@ func (c *PatientApiController) ExecDoctorAdvice() {
 										sum_count += its.StockMaxNumber + its.StockMinNumber
 									}
 									service.UpdateBaseDrugSumTwo(item.DrugId, sum_count, item.UserOrgId)
+									//剩余库存
+									service.UpdateDrugStockCount(item.DrugId, item.UserOrgId, storeHouseConfig.DrugStorehouseOut, sum_count)
 								}
 
 							}

models/his_models.go

@@ -859,6 +859,7 @@ type HisPrescriptionProject struct {
 	IsCheckTeam          int64        `gorm:"-" json:"is_check_team" form:"is_check_team"`
 	HisOrderInfo         HisOrderInfo `gorm:"ForeignKey:ProjectId;AssociationForeignKey:ID" json:"order_info"`
 	ExecutionFrequencyId int64        `gorm:"column:execution_frequency_id" json:"execution_frequency_id" form:"execution_frequency_id"`
+	IsOut                int64        `gorm:"column:is_out" json:"is_out" form:"is_out"` //新增字段
 }
 
 func (HisPrescriptionProject) TableName() string {

models/schedule_models.go

@@ -308,6 +308,8 @@ type VmBloodSchedule struct {
 	DialysisSolution           DialysisSolution           `gorm:"ForeignKey:PatientId,ModeId;AssociationForeignKey:PatientId,ModeId" json:"dialysis_solution"`
 	DialysisPrescription       DialysisPrescription       `gorm:"ForeignKey:PatientId,RecordDate;AssociationForeignKey:PatientId,RecordDate" json:"dialysis_prescription"`
 	XtAssessmentBeforeDislysis XtAssessmentBeforeDislysis `gorm:"ForeignKey:PatientId,AssessmentDate;AssociationForeignKey:PatientId,AssessmentDate" json:"assessment_befor_dislysis"`
+	XtDoctorAdvice             XtDoctorAdvice             `gorm:"ForeignKey:PatientId,AdviceDate;AssociationForeignKey:PatientId,AdviceDate" json:"xt_doctor_advice"`
+	HisDoctorAdvice            HisDoctorAdvice            `gorm:"ForeignKey:PatientId,AdviceDate;AssociationForeignKey:PatientId,AdviceDate" json:"his_doctor_advice"`
 }
 
 func (VmBloodSchedule) TableName() string {

service/dialysis_solution_service.go

@@ -188,3 +188,61 @@ func GetDialysisGoodTotalCount(orgID int64, schedule_type int64, partition_id in
 	return schedule, err
 
 }
+
+func GetDialysisAdviceSchedulist(orgID int64, schedule_type int64, partition_id int64, scheduleDate int64) (schedule []*models.VmBloodSchedule, err error) {
+
+	db := XTReadDB().Model(&models.VmBloodSchedule{}).Where("status = 1")
+
+	if scheduleDate > 0 {
+		db = db.Where("schedule_date = ?", scheduleDate)
+	}
+	if schedule_type > 0 {
+		db = db.Where("schedule_type = ?", schedule_type)
+	}
+	if partition_id > 0 {
+		db = db.Where("partition_id = ?", partition_id)
+	}
+	if orgID > 0 {
+		db = db.Where("user_org_id  = ?", orgID)
+	}
+	err = db.Preload("SchedualPatient", "status = 1 AND user_org_id = ?", orgID).
+		Preload("DeviceNumber", "status = 1 AND org_id = ?", orgID).
+		Preload("XtDoctorAdvice", "status = 1 AND user_org_id = ? and advice_date = ?", orgID, scheduleDate).
+		Preload("HisDoctorAdvice", "status = 1 AND user_org_id = ? and advice_date = ?", orgID, scheduleDate).
+		Preload("DeviceNumber.Zone", "status = 1 AND org_id = ?", orgID).Find(&schedule).Error
+
+	return schedule, err
+
+}
+
+func GetAllDrugMap(org_id int64) (list []*BaseDrugLib, err error) {
+
+	err = readDb.Model(&BaseDrugLib{}).Where("org_id = ?  AND status = 1", org_id).Find(&list).Error
+	return list, err
+}
+
+func GetDialysisParameterGoodList(orgID int64, schedule_type int64, partition_id int64, scheduleDate int64) (schedule []*models.VmBloodSchedule, err error) {
+
+	db := XTReadDB().Model(&models.VmBloodSchedule{}).Where("status = 1")
+
+	if scheduleDate > 0 {
+		db = db.Where("schedule_date = ?", scheduleDate)
+	}
+	if schedule_type > 0 {
+		db = db.Where("schedule_type = ?", schedule_type)
+	}
+	if partition_id > 0 {
+		db = db.Where("partition_id = ?", partition_id)
+	}
+	if orgID > 0 {
+		db = db.Where("user_org_id  = ?", orgID)
+	}
+	err = db.Preload("SchedualPatient", "status = 1 AND user_org_id = ?", orgID).
+		Preload("DialysisPrescription", "status = 1 and user_org_id = ?", orgID).
+		Preload("DeviceNumber", "status = 1 AND org_id = ?", orgID).
+		Preload("XtDoctorAdvice", "status = 1 AND user_org_id = ? and advice_date = ?", orgID, scheduleDate).
+		Preload("HisDoctorAdvice", "status = 1 AND user_org_id = ? and advice_date = ?", orgID, scheduleDate).
+		Preload("DeviceNumber.Zone", "status = 1 AND org_id = ?", orgID).Find(&schedule).Error
+
+	return schedule, err
+}

service/new_warehouse_service.go

@@ -14,7 +14,7 @@ import (
 //耗材出库
 func ConsumablesGoodDelivery(orgID int64, patient_id int64, record_time int64, goods *models.DialysisBeforePrepare, warehouseOut *models.WarehouseOut, count int64) (err error) {
 
-	fmt.Println("出库数量2333333333333333333333333333333333hhha", goods.Count)
+	//fmt.Println("出库数量2333333333333333333333333333333333hhha", goods.Count)
 	//开事务
 	var deliver_number int64 = 0
 	var stock_number int64 = 0
@@ -47,6 +47,8 @@ func ConsumablesGoodDelivery(orgID int64, patient_id int64, record_time int64, g
 		if errThree != nil {
 			return errThree
 		}
+		//更新his_prescripton_project出库状态值
+		UpdateHisPrescriptionProjectStatus(goods.GoodId, record_time, orgID, patient_id)
 
 		//查询剩余库存
 		goodList, _ := GetAllGoodSumCount(goods.GoodId, orgID)
@@ -83,9 +85,12 @@ func ConsumablesGoodDelivery(orgID int64, patient_id int64, record_time int64, g
 			OverCount:               sum_count,
 		}
 		warehouseOutInfo.Count = count
-
+		if orgID == 9671 || orgID == 10265 {
+			goodsInfo, _ := FindeGoodInfo(orgID, goods.ProjectId)
+			warehouseOutInfo.Price = goodsInfo.PackingPrice
+		}
 		_, errcodes := GetWarehouseOutInfoIsExistOne(goods.GoodId, patient_id, record_time, goods.ProjectId)
-		fmt.Println("errcodes2333232233232wode3223", errcodes, goods.ProjectId)
+		//fmt.Println("errcodes2333232233232wode3223", errcodes, goods.ProjectId)
 		if errcodes == gorm.ErrRecordNotFound {
 			errOne := AddSigleWarehouseOutInfo(warehouseOutInfo)
 			if errOne != nil {
@@ -94,8 +99,8 @@ func ConsumablesGoodDelivery(orgID int64, patient_id int64, record_time int64, g
 		} else if errcodes == nil {
 
 			outInfoOne, _ := GetWarehouseOutInfoIsExistTwo(goods.GoodId, patient_id, record_time, goods.ProjectId)
-			fmt.Println("goods.cout23323233223232323w", count)
-			fmt.Println("outInfoOnewowowwowowowowowo", outInfoOne.Count)
+			//fmt.Println("goods.cout23323233223232323w", count)
+			//fmt.Println("outInfoOnewowowwowowowowowo", outInfoOne.Count)
 			if count != outInfoOne.Count {
 				UpdatedWarehouseOutInfo(warehouseOutInfo, goods.GoodId, patient_id, record_time, goods.ProjectId)
 			}
@@ -116,12 +121,13 @@ func ConsumablesGoodDelivery(orgID int64, patient_id int64, record_time int64, g
 		for _, item := range flowGoodTwo {
 			out_count_one += item.Count
 		}
-		fmt.Println("deliver_number", deliver_number)
-		fmt.Println("out_count", out_count)
-		fmt.Println("count", count)
-		fmt.Println("cancel_out_count2333233", out_count_one)
+		//fmt.Println("deliver_number", deliver_number)
+		//fmt.Println("out_count", out_count)
+		//fmt.Println("count", count)
+		//fmt.Println("cancel_out_count2333233", out_count_one)
 		//如果本次出库数据大于历史出库数据 新增1条流水
 		if count > (out_count - out_count_one) {
+
 			flow := models.VmStockFlow{
 				WarehouseOutId:          warehouseOut.ID,
 				WarehousingId:           warehouse.ID,
@@ -151,6 +157,11 @@ func ConsumablesGoodDelivery(orgID int64, patient_id int64, record_time int64, g
 				OverCount:               sum_count,
 				BuyPrice:                warehouse.Price,
 			}
+			if orgID == 9671 || orgID == 10265 {
+				goodsInfo, _ := FindeGoodInfo(orgID, goods.ProjectId)
+				flow.Price = goodsInfo.PackingPrice
+				flow.BuyPrice = goodsInfo.BuyPrice
+			}
 			errThre := CreateStockFlowOne(flow)
 			if errThre != nil {
 				return errThre
@@ -217,7 +228,10 @@ func ConsumablesGoodDelivery(orgID int64, patient_id int64, record_time int64, g
 				StorehouseId:    goods.StorehouseId,
 				IsCheck:         1,
 			}
-
+			if orgID == 9671 || orgID == 10265 {
+				goodsInfo, _ := FindeGoodInfo(orgID, goods.ProjectId)
+				cancelStockInfo.Price = goodsInfo.PackingPrice
+			}
 			CreateCancelStockInfoOne(&cancelStockInfo)
 
 			cancelInfo, _ := GetLastCancelStockInfoByGoodId(goods.GoodId)
@@ -256,6 +270,11 @@ func ConsumablesGoodDelivery(orgID int64, patient_id int64, record_time int64, g
 				BuyPrice:                warehouse.Price,
 				ProjectId:               goods.ProjectId,
 			}
+			if orgID == 9671 || orgID == 10265 {
+				goodsInfo, _ := FindeGoodInfo(orgID, goods.ProjectId)
+				flow.Price = goodsInfo.PackingPrice
+				flow.BuyPrice = goodsInfo.BuyPrice
+			}
 			CreateStockFlowOne(flow)
 		}
 
@@ -330,9 +349,12 @@ func ConsumablesGoodDelivery(orgID int64, patient_id int64, record_time int64, g
 			OverCount:               sum_count,
 		}
 		warehouseOutInfo.Count = stock_number
-
+		if orgID == 9671 || orgID == 10265 {
+			goodsInfo, _ := FindeGoodInfo(orgID, goods.ProjectId)
+			warehouseOutInfo.Price = goodsInfo.PackingPrice
+		}
 		_, errcodes := GetWarehouseOutInfoIsExistOne(goods.GoodId, patient_id, record_time, goods.ProjectId)
-		fmt.Println("errcodes23332322332323223", errcodes, goods.ProjectId)
+		//fmt.Println("errcodes23332322332323223", errcodes, goods.ProjectId)
 		if errcodes == gorm.ErrRecordNotFound {
 			errOne := AddSigleWarehouseOutInfo(warehouseOutInfo)
 			if errOne != nil {
@@ -391,6 +413,11 @@ func ConsumablesGoodDelivery(orgID int64, patient_id int64, record_time int64, g
 				OverCount:               sum_count,
 				BuyPrice:                warehouse.Price,
 			}
+			if orgID == 9671 || orgID == 10265 {
+				goodsInfo, _ := FindeGoodInfo(orgID, goods.ProjectId)
+				flow.Price = goodsInfo.PackingPrice
+				flow.BuyPrice = goodsInfo.BuyPrice
+			}
 			errThre := CreateStockFlowOne(flow)
 			if errThre != nil {
 				return errThre
@@ -453,7 +480,10 @@ func ConsumablesGoodDelivery(orgID int64, patient_id int64, record_time int64, g
 				StorehouseId:    goods.StorehouseId,
 				IsCheck:         1,
 			}
-
+			if orgID == 9671 || orgID == 10265 {
+				goodsInfo, _ := FindeGoodInfo(orgID, goods.ProjectId)
+				cancelStockInfo.Price = goodsInfo.PackingPrice
+			}
 			CreateCancelStockInfoOne(&cancelStockInfo)
 
 			cancelInfo, _ := GetLastCancelStockInfoByGoodId(goods.GoodId)
@@ -492,6 +522,11 @@ func ConsumablesGoodDelivery(orgID int64, patient_id int64, record_time int64, g
 				BuyPrice:                warehouse.Price,
 				ProjectId:               goods.ProjectId,
 			}
+			if orgID == 9671 || orgID == 10265 {
+				goodsInfo, _ := FindeGoodInfo(orgID, goods.ProjectId)
+				flow.Price = goodsInfo.PackingPrice
+				flow.BuyPrice = goodsInfo.BuyPrice
+			}
 			CreateStockFlowOne(flow)
 		}
 
@@ -2024,3 +2059,17 @@ func UpdateDrugWarehouseOutByPatientId(patient_id int64, advice_date int64, orgi
 	err := XTWriteDB().Model(&models.DrugWarehouseOutInfo{}).Where("patient_id = ? and sys_record_time = ? and org_id = ? and status = 1", patient_id, advice_date, orgid).Update(map[string]interface{}{"count": info.Count, "count_unit": info.CountUnit}).Error
 	return err
 }
+
+func FindeGoodInfo(orgid int64, id int64) (models.GoodInformation, error) {
+
+	information := models.GoodInformation{}
+	err := XTReadDB().Where("org_id = ? and id = ? and status = 1", orgid, id).Find(&information).Error
+	return information, err
+}
+
+func UpdateHisPrescriptionProjectStatus(project_id int64, record_time int64, user_org_id int64, patient_id int64) (models.HisPrescriptionProject, error) {
+
+	project := models.HisPrescriptionProject{}
+	err := XTWriteDB().Model(&project).Where("project_id  = ? and record_date = ? and user_org_id = ? and patient_id = ? and status = 1", project_id, record_time, user_org_id, patient_id).Update(map[string]interface{}{"is_out": 2}).Error
+	return project, err
+}