2024/6/17

controllers/drug_stock_api_contorller.go

@@ -3297,8 +3297,24 @@ func (c *StockDrugApiController) CheckWarehousingInfo() {
 	service.CheckNewWarehousingInfo(warehousing_id, orgId, checker, tx)
 
 	list, _ := service.GetNewWarehousingInfoByList(warehousing_id, orgId, tx)
+
+	var is_success = 2
 	for _, item := range list {
+		var his_warehousing_count = item.WarehousingCount
+		var his_max_unit = item.MaxUnit
+		var in_cout int64
 		medical, _ := service.GetNewBaseDrugMedical(item.DrugId, tx)
+
+		if his_max_unit == medical.MaxUnit && medical.MaxUnit != medical.MinUnit {
+			in_cout = his_warehousing_count * medical.MinNumber
+		}
+		if his_max_unit == medical.MinUnit && medical.MaxUnit != medical.MinUnit {
+			in_cout = his_warehousing_count
+		}
+		if his_max_unit == medical.MinUnit && medical.MaxUnit == medical.MinUnit {
+			in_cout = his_warehousing_count
+		}
+
 		if item.MaxUnit == medical.MaxUnit && medical.MaxUnit != medical.MinUnit {
 			//新增库存
 			service.AddNewDrugWarehouseStockMaxNumber(item.WarehousingCount, item.ID, tx)
@@ -3412,10 +3428,35 @@ func (c *StockDrugApiController) CheckWarehousingInfo() {
 		if drugStockCount.ID > 0 {
 			service.UpdateNewDrugStockSum(item.StorehouseId, item.DrugId, item.OrgId, total_count, over_count, tx)
 		}
-	}
 
-	tx.Commit()
+		flowList, _ := service.GetNewDrugFlowList(item.DrugId, item.OrgId, item.ID, tx)
+		var his_count int64
+		if len(flowList) > 0 {
+			for _, item := range flowList {
+				baseDrug, _ := service.GetNewBaseDrugMedical(item.DrugId, tx)
+				if item.MaxUnit == baseDrug.MaxUnit && baseDrug.MaxUnit != baseDrug.MinUnit {
+					his_count = item.Count * baseDrug.MinNumber
+				}
+				if item.MaxUnit == baseDrug.MinUnit && baseDrug.MaxUnit != baseDrug.MinUnit {
+					his_count = item.Count
+				}
+				if item.MaxUnit == baseDrug.MaxUnit && baseDrug.MaxUnit == baseDrug.MinUnit {
+					his_count = item.Count
+				}
+			}
+		}
 
+		if in_cout != his_count {
+			is_success = 1
+			tx.Rollback()
+			c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeFlow)
+			return
+		}
+	}
+
+	if is_success != 1 {
+		tx.Commit()
+	}
 	c.ServeSuccessJSON(map[string]interface{}{
 		"list": list,
 	})
@@ -3743,11 +3784,16 @@ func (c *StockDrugApiController) ToReturnCheck() {
 	//调用出库逻辑
 	for _, item := range list {
 		medical, _ := service.GetBaseDrugMedical(item.DrugId)
+
 		if item.CountUnit == medical.MaxUnit && medical.MaxUnit != medical.MinUnit {
-			service.UpdateNewDrugMaxNumber(item.Count, item.WarehouseInfoId, tx)
+
 			var sum_out_count int64
 			sum_out_count = item.Count * medical.MinNumber
+
+			service.UpdateNewDrugMaxNumberOne(sum_out_count, item.WarehouseInfoId, tx)
+
 			service.ModifyNewReduceDrugInformation(item.DrugId, sum_out_count, item.OrgId, tx)
+
 			drugInfoList, _ := service.FindNewDrugWarehouseInfoList(item.DrugId, item.OrgId, tx)
 			var drug_max_number int64
 			var drug_min_number int64
@@ -3776,6 +3822,7 @@ func (c *StockDrugApiController) ToReturnCheck() {
 			service.CreatedNewDrugFlushInfo(drugFlushInfo, tx)
 			service.DeleteNewDrugOutFlow(item.ID, item.OrgId, tx)
 		}
+
 		if item.CountUnit == medical.MaxUnit && medical.MaxUnit == medical.MinUnit {
 			service.UpdateDrugMaxNumber(item.Count, item.WarehouseInfoId)
 			var sum_out_count int64

controllers/self_drug_api_congtroller.go

@@ -191,6 +191,10 @@ func SelfDrugRouters() {
 
 	beego.Router("/api/drug/modifydrugcodewarehouseinfo", &SelfDrugApiController{}, "Post:ModifyDrugCodeWarehosueInfo")
 
+	beego.Router("/api/drug/getpatientadvicelist", &SelfDrugApiController{}, "Get:GetPatientAdviceList")
+
+	beego.Router("/api/drug/getpatientadvicelistdetail", &SelfDrugApiController{}, "Get:GetPatientAdviceListDetail")
+
 }
 
 func (this *SelfDrugApiController) GetCurrentPatient() {
@@ -6474,3 +6478,83 @@ func (c *SelfDrugApiController) ModifyDrugCodeWarehosueInfo() {
 	})
 
 }
+
+func (this *SelfDrugApiController) GetPatientAdviceList() {
+
+	patient_id, _ := this.GetInt64("patient_id")
+
+	start_time := this.GetString("start_time")
+
+	end_time := this.GetString("end_time")
+
+	timeLayout := "2006-01-02"
+	loc, _ := time.LoadLocation("Local")
+	var startTime int64
+	if len(start_time) > 0 {
+		theTime, err := time.ParseInLocation(timeLayout+" 15:04:05", start_time+" 00:00:00", loc)
+		if err != nil {
+			fmt.Println(err)
+			this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+			return
+		}
+		startTime = theTime.Unix()
+	}
+	var endTime int64
+	if len(end_time) > 0 {
+		theTime, err := time.ParseInLocation(timeLayout+" 15:04:05", end_time+" 23:59:59", loc)
+		if err != nil {
+			utils.ErrorLog(err.Error())
+			this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+			return
+		}
+		endTime = theTime.Unix()
+	}
+	orgId := this.GetAdminUserInfo().CurrentOrgId
+
+	adviceList, _ := service.GetNewPatientAdviceList(patient_id, startTime, endTime, orgId)
+	this.ServeSuccessJSON(map[string]interface{}{
+		"adviceList": adviceList,
+	})
+}
+
+func (this *SelfDrugApiController) GetPatientAdviceListDetail() {
+
+	patient_id, _ := this.GetInt64("patient_id")
+
+	start_time := this.GetString("start_time")
+
+	end_time := this.GetString("end_time")
+
+	timeLayout := "2006-01-02"
+	loc, _ := time.LoadLocation("Local")
+	var startTime int64
+	if len(start_time) > 0 {
+		theTime, err := time.ParseInLocation(timeLayout+" 15:04:05", start_time+" 00:00:00", loc)
+		if err != nil {
+			fmt.Println(err)
+			this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+			return
+		}
+		startTime = theTime.Unix()
+	}
+	var endTime int64
+	if len(end_time) > 0 {
+		theTime, err := time.ParseInLocation(timeLayout+" 15:04:05", end_time+" 23:59:59", loc)
+		if err != nil {
+			utils.ErrorLog(err.Error())
+			this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+			return
+		}
+		endTime = theTime.Unix()
+	}
+	orgId := this.GetAdminUserInfo().CurrentOrgId
+
+	advice_name := this.GetString("advice_name")
+
+	adviceList, _ := service.GetPatientAdviceListDetail(patient_id, startTime, endTime, orgId, advice_name)
+
+	this.ServeSuccessJSON(map[string]interface{}{
+		"adviceList": adviceList,
+	})
+
+}

controllers/stock_in_api_controller.go

@@ -7474,12 +7474,13 @@ func (this *StockManagerApiController) CheckWarehouseInfo() {
 	checker := this.GetAdminUserInfo().AdminUser.Id
 	//更改审核状态
 	err := service.UpdateNewCheckWarehouseInfo(warehousing_info_id, checker, tx)
+	var is_success = 2
 	if err == nil {
 		list, _ := service.GetNewWarehouseInfoList(warehousing_info_id, orgId, tx)
 
 		for _, item := range list {
+			var now_count = item.WarehousingCount
 			service.UpdateNewWarehouseInfoByIdListThree(item.WarehousingCount, item.ID, tx)
-
 			//查询该耗材剩余库存库
 			stockList, _ := service.GetNewStockCountByGoodId(item.GoodId, storeHouseConfig.StorehouseOutInfo, orgId, tx)
 			var total_count int64
@@ -7562,10 +7563,29 @@ func (this *StockManagerApiController) CheckWarehouseInfo() {
 			if stockCount.ID > 0 {
 				service.UpdateNewGoodStockCount(orgId, item.StorehouseId, item.GoodId, item.WarehousingCount, flush_count, tx)
 			}
+
+			//查询该耗材的流水数量
+			goodFlowList, _ := service.GetInitGoodFlow(orgId, item.GoodId, item.ID, tx)
+
+			var flow_count int64
+			if len(goodFlowList) > 0 {
+				for _, item := range goodFlowList {
+					flow_count += item.Count
+				}
+			}
+
+			if now_count != flow_count {
+				is_success = 1
+				tx.Rollback()
+				this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeFlow)
+				return
+			}
+
 		}
 	}
-
-	tx.Commit()
+	if is_success != 1 {
+		tx.Commit()
+	}
 
 	if err == nil {
 		this.ServeSuccessJSON(map[string]interface{}{

service/mobile_dialysis_service.go

@@ -8269,7 +8269,7 @@ func GetDialysisTotalCountOne(org_id int64, patient_id int64) (models.BloodDialy
 	order := models.BloodDialysisOrderCount{}
 	db := XTReadDB().Table("xt_dialysis_order as o")
 
-	err = db.Raw("select count(o.id) as count,o.patient_id from xt_dialysis_order as o left join xt_schedule as x on x.patient_id = o.patient_id where o.status =1 and o.user_org_id = ? and o.patient_id = ? and o.dialysis_date>=1704038400 and  x.schedule_date = o.dialysis_date and x.status = 1 ", org_id, patient_id).Scan(&order).Error
+	err = db.Raw("select count(o.id) as count,o.patient_id from xt_dialysis_order as o left join xt_schedule as x on x.patient_id = o.patient_id where o.status =1 and o.user_org_id = ? and o.patient_id = ? and o.dialysis_date>=1735660800 and  x.schedule_date = o.dialysis_date and x.status = 1 ", org_id, patient_id).Scan(&order).Error
 
 	return order, err
 }

service/stock_service.go

@@ -9176,6 +9176,18 @@ func UpdateNewDrugMaxNumber(count int64, id int64, tx *gorm.DB) error {
 	return err
 }
 
+func UpdateNewDrugMaxNumberOne(count int64, id int64, tx *gorm.DB) error {
+
+	err := tx.Model(&models.DrugWarehouseInfo{}).Where("id = ? and status = 1", id).UpdateColumn("stock_min_number", gorm.Expr("stock_min_number + ?", count)).Error
+	if err != gorm.ErrRecordNotFound {
+		if err != nil {
+			tx.Rollback()
+			return err
+		}
+	}
+	return err
+}
+
 func UpdateDrugMinNumber(count int64, id int64) error {
 	err := XTWriteDB().Model(&models.DrugWarehouseInfo{}).Where("id = ? and status = 1", id).UpdateColumn("stock_min_number", gorm.Expr("stock_min_number + ?", count)).Error
 	return err
@@ -10903,7 +10915,7 @@ func GetHisDrugCodeQuery(orgId int64, start_time int64, end_time int64, limit in
 		db = db.Where("is_upload = 2 or is_upload =0")
 	}
 	err = db.Count(&total).Offset(offset).Limit(limit).Order("record_date desc").Find(&list).Error
-	fmt.Println("totla====================", total)
+
 	return list, total, err
 }
 
@@ -10926,3 +10938,75 @@ func GetNewGoodWarehouseOutInfo(good_id int64, user_org_id int64, warehouse_out_
 	}
 	return info, err
 }
+
+func GetInitGoodFlow(user_org_id int64, good_id int64, warehousing_detail_id int64, tx *gorm.DB) (list []*models.VmStockFlow, err error) {
+
+	err = tx.Where("user_org_id = ? and good_id = ? and warehousing_detail_id = ? and status=1", user_org_id, good_id, warehousing_detail_id).Find(&list).Error
+
+	if err != gorm.ErrRecordNotFound {
+		if err != nil {
+			tx.Rollback()
+			return list, err
+		}
+	}
+	return list, err
+}
+
+func GetNewDrugFlowList(drug_id int64, user_org_id int64, warehousing_detail_id int64, tx *gorm.DB) (flow []*models.DrugFlow, err error) {
+
+	err = tx.Where("drug_id = ? and user_org_id =? and warehousing_detail_id = ? and status=1", drug_id, user_org_id, warehousing_detail_id).Find(&flow).Error
+	if err != gorm.ErrRecordNotFound {
+		if err != nil {
+			tx.Rollback()
+			return flow, err
+		}
+	}
+	return flow, err
+}
+
+func GetNewPatientAdviceList(patient_id int64, start_time int64, end_time int64, user_org_id int64) (advice []*models.DoctorAdvice, err error) {
+
+	db := XTReadDB().Model(&advice).Where("status=1 and advice_type =2")
+
+	if patient_id > 0 {
+		db = db.Where("patient_id = ?", patient_id)
+	}
+	if start_time > 0 {
+		db = db.Where("advice_date>=?", start_time)
+	}
+	if end_time > 0 {
+		db = db.Where("advice_date<=?", end_time)
+	}
+	if user_org_id > 0 {
+		db = db.Where("user_org_id = ?", user_org_id)
+	}
+	err = db.Find(&advice).Error
+
+	return advice, err
+}
+
+func GetPatientAdviceListDetail(patient_id int64, start_time int64, end_time int64, user_org_id int64, advice_name string) (advice []*models.DoctorAdvice, err error) {
+
+	db := XTReadDB().Model(&advice).Where("status = 1")
+
+	if patient_id > 0 {
+		db = db.Where("patient_id = ?", patient_id)
+	}
+	if start_time > 0 {
+		db = db.Where("advice_date>=?", start_time)
+	}
+
+	if end_time > 0 {
+		db = db.Where("advice_date<=?", end_time)
+	}
+
+	if user_org_id > 0 {
+		db = db.Where("user_org_id = ?", user_org_id)
+	}
+	if len(advice_name) > 0 {
+		db = db.Where("advice_name =?", advice_name)
+	}
+	err = db.Order("advice_date asc").Find(&advice).Error
+
+	return advice, err
+}