11月9日库存管理

controllers/dialysis_api_controller.go

@@ -3763,6 +3763,13 @@ func (this *DialysisApiController) GetTodayMonitor() {
 				ultrafiltration_rate = value
 				record.UltrafiltrationRate = ultrafiltration_rate
 			}
+
+			if adminInfo.CurrentOrgId == 10395 {
+				ultrafiltration_rate = math.Floor(prescription.TargetUltrafiltration * 60 / 1000 / float64(totalMin) * 1000)
+
+				record.UltrafiltrationRate = ultrafiltration_rate
+			}
+
 		}
 	}
 	// record.UltrafiltrationRate = ultrafiltration_rate

controllers/drug_stock_api_contorller.go

@@ -267,7 +267,7 @@ func (c *StockDrugApiController) CreateDrugWarehouse() {
 					IsCheck:          2,
 					StockMinNumber:   0,
 				}
-				fmt.Println(warehouseInfo)
+				//fmt.Println(warehouseInfo)
 				warehousingInfo = append(warehousingInfo, warehouseInfo)
 			}
 		}

controllers/his_api_controller.go

@@ -1109,7 +1109,7 @@ func (c *HisApiController) CreateHisPrescription() {
 												return
 											}
 
-											if adminInfo.CurrentOrgId == 10215 || adminInfo.CurrentOrgId == 10164 || adminInfo.CurrentOrgId == 3877 {
+											if adminInfo.CurrentOrgId == 10215 || adminInfo.CurrentOrgId == 10164 || adminInfo.CurrentOrgId == 3877 || adminInfo.CurrentOrgId == 9671 {
 												if prescribing_number > batch_number_all_count {
 													c.ServeDynamicFailJsonSend(drug.DrugName + "该批次剩余库存不足,剩余库存:" + strconv.FormatInt(info.StockMaxNumber, 10) + drug.MaxUnit + strconv.FormatInt(info.StockMinNumber, 10) + drug.MinUnit)
 													return
@@ -1126,7 +1126,7 @@ func (c *HisApiController) CreateHisPrescription() {
 												c.ServeDynamicFailJsonSend(drug.DrugName + "库存不足")
 												return
 											}
-											if adminInfo.CurrentOrgId == 10215 || adminInfo.CurrentOrgId == 10164 || adminInfo.CurrentOrgId == 3877 {
+											if adminInfo.CurrentOrgId == 10215 || adminInfo.CurrentOrgId == 10164 || adminInfo.CurrentOrgId == 3877 || adminInfo.CurrentOrgId == 9671 {
 												if num > batch_number_all_count {
 													c.ServeDynamicFailJsonSend(drug.DrugName + "该批次剩余库存不足,剩余库存:" + strconv.FormatInt(info.StockMaxNumber, 10) + drug.MaxUnit + strconv.FormatInt(info.StockMinNumber, 10) + drug.MinUnit)
 													return
@@ -1195,7 +1195,7 @@ func (c *HisApiController) CreateHisPrescription() {
 														c.ServeDynamicFailJsonSend(drug.DrugName + "库存不足")
 														return
 													}
-													if adminInfo.CurrentOrgId == 10215 || adminInfo.CurrentOrgId == 10164 || adminInfo.CurrentOrgId == 3877 {
+													if adminInfo.CurrentOrgId == 10215 || adminInfo.CurrentOrgId == 10164 || adminInfo.CurrentOrgId == 3877 || adminInfo.CurrentOrgId == 9671 {
 														if prescribing_number > batch_number_all_count {
 															c.ServeDynamicFailJsonSend(drug.DrugName + "该批次剩余库存不足,剩余库存:" + strconv.FormatInt(info.StockMaxNumber, 10) + drug.MaxUnit + strconv.FormatInt(info.StockMinNumber, 10) + drug.MinUnit)
 															return
@@ -1213,7 +1213,7 @@ func (c *HisApiController) CreateHisPrescription() {
 															c.ServeDynamicFailJsonSend(drug.DrugName + "库存不足")
 															return
 														}
-														if adminInfo.CurrentOrgId == 10215 || adminInfo.CurrentOrgId == 10164 || adminInfo.CurrentOrgId == 3877 {
+														if adminInfo.CurrentOrgId == 10215 || adminInfo.CurrentOrgId == 10164 || adminInfo.CurrentOrgId == 3877 || adminInfo.CurrentOrgId == 9671 {
 															if prescribing_number > batch_number_all_count {
 																c.ServeDynamicFailJsonSend(drug.DrugName + "该批次剩余库存不足,剩余库存:" + strconv.FormatInt(info.StockMaxNumber, 10) + drug.MaxUnit + strconv.FormatInt(info.StockMinNumber, 10) + drug.MinUnit)
 																return
@@ -1269,7 +1269,7 @@ func (c *HisApiController) CreateHisPrescription() {
 														c.ServeDynamicFailJsonSend(drug.DrugName + "该批次剩余库存不足,剩余库存:" + strconv.FormatInt(info.StockMaxNumber, 10) + drug.MaxUnit + strconv.FormatInt(info.StockMinNumber, 10) + drug.MinUnit)
 														return
 													}
-													if adminInfo.CurrentOrgId == 10215 || adminInfo.CurrentOrgId == 10164 || adminInfo.CurrentOrgId == 3877 {
+													if adminInfo.CurrentOrgId == 10215 || adminInfo.CurrentOrgId == 10164 || adminInfo.CurrentOrgId == 3877 || adminInfo.CurrentOrgId == 9671 {
 														// 查询该药品最后一次出库记录
 														outInfo, _ := service.GetLastDrugWarehouseOutByDrugIdTwenty(drug_id, patient_id, recordDateTime, adviceId)
 
@@ -1990,6 +1990,7 @@ func (c *HisApiController) CreateHisPrescription() {
 					projects := items["project"].([]interface{})
 					if len(projects) > 0 {
 						for _, project := range projects {
+
 							var p models.HisPrescriptionProject
 							p.PrescriptionId = tempPrescription.ID
 							p.Ctime = time.Now().Unix()
@@ -2001,13 +2002,20 @@ 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)
 								return
 							}
-
+							fmt.Println("projext22222222222222", p.ID)
+							if p.ID == 0 {
+								p.IsOut = 2
+							}
+							if p.ID > 0 {
+								projectDetail, _ := service.GetHisPrescriptonProjectById(p.ID)
+								p.IsOut = projectDetail.IsOut
+							}
 							service.CreateHisProjectTwo(&p)
 							projectList = append(projectList, p)
 							var randNum int
@@ -2640,7 +2648,7 @@ func (c *HisApiController) DeletePrescription() {
 						service.CreateStockFlowOne(flow)
 
 						//查询已出库数量
-						dialysisInfo, _ := service.GetGoodDialysisOutInfo(c.GetAdminUserInfo().CurrentOrgId, info.PatientId, info.SysRecordTime, item.ProjectId)
+						dialysisInfo, _ := service.GetGoodDialysisOutInfoSix(c.GetAdminUserInfo().CurrentOrgId, info.PatientId, info.SysRecordTime, item.ProjectId)
 
 						if prescribingNumber < dialysisInfo.Count {
 							//改变数量
@@ -3034,13 +3042,14 @@ func (c *HisApiController) DeleteProject() {
 				service.CreateStockFlowOne(flow)
 
 				//查询已出库数量
-				dialysisInfo, _ := service.GetGoodDialysisOutInfo(adminInfo.CurrentOrgId, info.PatientId, info.SysRecordTime, project.ProjectId)
+				dialysisInfo, _ := service.GetGoodDialysisOutInfoSix(adminInfo.CurrentOrgId, info.PatientId, info.SysRecordTime, project.ProjectId)
 
 				if prescribingNumber < dialysisInfo.Count {
 					//改变数量
 					service.UpdateAutoGood(adminInfo.CurrentOrgId, info.PatientId, info.SysRecordTime, project.ProjectId, id, prescribingNumber)
 				}
-
+				fmt.Println("prescribingNumber", prescribingNumber)
+				fmt.Println("Count2332333223qw", dialysisInfo.Count)
 				if prescribingNumber == dialysisInfo.Count {
 					//删除出库表
 					service.DeleteAutoRedeceDetailTen(adminInfo.CurrentOrgId, info.PatientId, info.SysRecordTime, project.ProjectId)

controllers/mobile_api_controllers/dialysis_api_controller.go

@@ -2959,6 +2959,11 @@ func (this *DialysisAPIController) GetLastMonitorRecordTody() {
 				record.UltrafiltrationRate = ultrafiltration_rate
 			}
 
+			if adminInfo.Org.Id == 10395 {
+				ultrafiltration_rate = math.Floor(prescription.TargetUltrafiltration * 60 / 1000 / float64(totalMin) * 1000)
+
+				record.UltrafiltrationRate = ultrafiltration_rate
+			}
 			//if template.TemplateId == 47 {
 			//	ultrafiltration_rate = math.Floor(prescription.TargetUltrafiltration * 60 / float64(totalMin))
 			//	record.UltrafiltrationRate = ultrafiltration_rate
@@ -2985,8 +2990,10 @@ func (this *DialysisAPIController) GetLastMonitorRecordTody() {
 	}
 
 	if adminInfo.Org.Id == 10395 {
+
 		if ultrafiltration_rate > 0 {
 			ultrafiltration_volume := math.Floor(float64(record.OperateTime+3600-fristrecord.OperateTime) / 3600 * ultrafiltration_rate / 1000)
+
 			record.UltrafiltrationVolume = ultrafiltration_volume
 		}
 

controllers/mobile_api_controllers/patient_api_controller.go

@@ -1227,6 +1227,24 @@ func (c *PatientApiController) ExecDoctorAdvice() {
 							}
 						}
 					}
+
+					//if config.IsOpen == 1 && item.UserOrgId == 10318 {
+					//
+					//  service.HisDrugsDelivery(adminInfo.Org.Id, creater, &advice)
+					//  //更新字典里面的库存
+					//  stockInfo, _ := service.GetDrugAllStockInfo(storeHouseConfig.DrugStorehouseOut, item.UserOrgId, item.DrugId)
+					//  var sum_count int64
+					//  for _, its := range stockInfo {
+					//    if its.MaxUnit == medical.MaxUnit {
+					//      its.StockMaxNumber = its.StockMaxNumber * medical.MinNumber
+					//    }
+					//    sum_count += its.StockMaxNumber + its.StockMinNumber
+					//  }
+					//  service.UpdateBaseDrugSumTwo(item.DrugId, sum_count, item.UserOrgId)
+					//  //剩余库存
+					//  service.UpdateDrugStockCount(item.DrugId, item.UserOrgId, storeHouseConfig.DrugStorehouseOut, sum_count)
+					//}
+
 				}
 			}
 			for _, item := range advices {

controllers/self_drug_api_congtroller.go

@@ -110,6 +110,8 @@ func SelfDrugRouters() {
 	//新数据
 	beego.Router("/api/stock/getnewpurchasestockquery", &SelfDrugApiController{}, "Get:GetGoodNewPurchaseStockQuery")
 	beego.Router("/api/stock/getpurchasenewdrugquery", &SelfDrugApiController{}, "Get:GetPurchaseNewDrugQuery")
+	beego.Router("/api/stock/getgoodovercount", &SelfDrugApiController{}, "Get:GetGoodOverCount")
+	beego.Router("/api/stock/getdrugovercount", &SelfDrugApiController{}, "Get:GetDrugOverCount")
 }
 
 func (this *SelfDrugApiController) GetCurrentPatient() {
@@ -3961,3 +3963,32 @@ func (this *SelfDrugApiController) GetPurchaseNewDrugQuery() {
 		"drugTypeList":     drugTypeList,
 	})
 }
+
+func (this *SelfDrugApiController) GetGoodOverCount() {
+
+	orgId := this.GetAdminUserInfo().CurrentOrgId
+
+	list, _ := service.GetAllStockCount(orgId)
+	for _, item := range list {
+		flow, _ := service.GetLastStockFlow(item.GoodId)
+		service.ModifyStockFlowById(flow.ID, item.FlushCount)
+	}
+	returnData := make(map[string]interface{}, 0)
+	returnData["msg"] = "ok"
+	this.ServeSuccessJSON(returnData)
+	return
+}
+
+func (this *SelfDrugApiController) GetDrugOverCount() {
+
+	orgId := this.GetAdminUserInfo().CurrentOrgId
+	list, _ := service.GetAllDrugCount(orgId)
+	for _, item := range list {
+		service.GetLastDrugFlow(item.DrugId)
+		service.ModifyDrugFlowById(item.ID, item.FlushCount)
+	}
+	returnData := make(map[string]interface{}, 0)
+	returnData["msg"] = "ok"
+	this.ServeSuccessJSON(returnData)
+	return
+}

controllers/stock_in_api_controller.go

@@ -2416,7 +2416,7 @@ func (this *StockManagerApiController) DeleteCancelStock() {
 }
 func (this *StockManagerApiController) DeleteCancelStockInfo() {
 	id, _ := this.GetInt64("id", 0)
-	fmt.Println(id)
+	//fmt.Println(id)
 	if id == 0 {
 		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
 		return

models/new_stock_models.go

@@ -393,6 +393,7 @@ type DrugFlowTwenty struct {
 	DrugWarehouseInfoOne   DrugWarehouseInfo      `gorm:"ForeignKey:ID;AssociationForeignKey:WarehousingDetailId"json:"xt_drug_warehouse_info" `
 	IsRead                 int64                  `gorm:"column:is_read" json:"is_read" form:"is_read"`
 	IsCheck                int64                  `gorm:"column:is_check" json:"is_check" form:"is_check"`
+	OverCount              int64                  `gorm:"column:over_count" json:"over_count" form:"over_count"`
 	XtDrugWarehouseOutInfo XtDrugWarehouseOutInfo `gorm:"ForeignKey:ID;AssociationForeignKey:WarehouseOutDetailId"json:"xt_drug_warehouse_out_info" `
 }
 

service/dialysis_solution_service.go

@@ -183,6 +183,7 @@ func GetDialysisGoodTotalCount(orgID int64, schedule_type int64, partition_id in
 	err = db.Preload("SchedualPatient", "status = 1 AND user_org_id = ?", orgID).
 		Preload("DeviceNumber", "status = 1 AND org_id = ?", orgID).
 		Preload("DialysisPrescription", "status = 1 AND user_org_id = ? and record_date = ?", orgID, scheduleDate).
+		Preload("DialysisSolution", "status = 1 AND user_org_id = ? AND solution_status = 1", orgID).
 		Preload("DeviceNumber.Zone", "status = 1 AND org_id = ?", orgID).Find(&schedule).Error
 
 	return schedule, err

service/his_service.go

@@ -2532,3 +2532,11 @@ func UpDateOrderTwo(order *models.HisOrder) (err error) {
 	err = writeDb.Save(&order).Error
 	return
 }
+
+func GetHisPrescriptonProjectById(id int64) (models.HisPrescriptionProject, error) {
+
+	project := models.HisPrescriptionProject{}
+
+	err := XTReadDB().Where("id = ? and status = 1", id).Find(&project).Error
+	return project, err
+}

service/self_drug_service.go

@@ -2635,3 +2635,43 @@ func GetDrugEndFlow(drug_id int64, user_org_id int64, endtime int64) (models.Dru
 	err := XTReadDB().Where("drug_id = ? and user_org_id = ? and ctime<=? and status = 1", drug_id, user_org_id, endtime).Last(&flow).Error
 	return flow, err
 }
+
+func GetAllStockCount(orgid int64) (stock []*models.XtGoodStockCount, err error) {
+
+	err = XTReadDB().Where("user_org_id = ? and status = 1", orgid).Find(&stock).Error
+	return stock, err
+}
+func GetLastStockFlow(good_id int64) (models.VmStockFlow, error) {
+
+	flow := models.VmStockFlow{}
+
+	err := XTReadDB().Where("good_id = ? and status =1  and ctime<=1667231999", good_id).Last(&flow).Error
+
+	return flow, err
+}
+
+func ModifyStockFlowById(id int64, over_count int64) error {
+
+	err := XTWriteDB().Model(&models.VmStockFlow{}).Where("id = ? and status = 1", id).Update(map[string]interface{}{"over_count": over_count}).Error
+	return err
+}
+
+func GetAllDrugCount(user_org_id int64) (drug []*models.XtDrugStockCount, err error) {
+
+	err = XTReadDB().Where("user_org_id = ? and status = 1", user_org_id).Find(&drug).Error
+	return drug, err
+}
+
+func GetLastDrugFlow(drug_id int64) (models.DrugFlow, error) {
+
+	flow := models.DrugFlow{}
+	err := XTReadDB().Where("drug_id = ? and status =1  and ctime<=1667231999", drug_id).Last(&flow).Error
+
+	return flow, err
+}
+
+func ModifyDrugFlowById(id int64, over_count int64) error {
+
+	err := XTWriteDB().Model(&models.DrugFlow{}).Where("id = ? and status = 1", id).Update(map[string]interface{}{"over_count": over_count}).Error
+	return err
+}

service/stock_service.go

@@ -7913,6 +7913,13 @@ func GetGoodDialysisOutInfo(orgid int64, patient_id int64, sys_record_time int64
 	return detail, err
 }
 
+func GetGoodDialysisOutInfoSix(orgid int64, patient_id int64, sys_record_time int64, good_id int64) (models.WarehouseOutInfo, error) {
+
+	detail := models.WarehouseOutInfo{}
+	err := XTReadDB().Where("org_id =? and patient_id = ? and sys_record_time = ? and good_id = ? and status= 1", orgid, patient_id, sys_record_time, good_id).Find(&detail).Error
+	return detail, err
+}
+
 func GetGoodSumCount(storehouse_id int64, good_id int64, orgid int64) (models.XtGoodStockCount, error) {
 
 	stock := models.XtGoodStockCount{}