11月9日库存管理

conf/app.conf

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

controllers/dialysis_api_controller.go

@@ -2962,11 +2962,11 @@ func (c *DialysisApiController) GetDialysisOrder() {
 
 	check, _ := service.FindDoubleCheckById(adminUserInfo.CurrentOrgId, patientInfo.ID, xttime)
 
-	if adminUserInfo.CurrentOrgId != 10101 && adminUserInfo.CurrentOrgId != 10445 {
+	if adminUserInfo.CurrentOrgId != 10101 && adminUserInfo.CurrentOrgId != 10445 && adminUserInfo.CurrentOrgId != 10345 {
 		dialysis_count, _ := service.GetDialysisOrderCount(adminUserInfo.CurrentOrgId, patientInfo.ID, xttime)
 		patientInfo.TotalDialysis = dialysis_count
 	}
-	if adminUserInfo.CurrentOrgId == 10101 || adminUserInfo.CurrentOrgId == 10445 {
+	if adminUserInfo.CurrentOrgId == 10101 || adminUserInfo.CurrentOrgId == 10445 || adminUserInfo.CurrentOrgId == 10345 {
 
 		if xttime <= 1640966400 {
 			dialysis_count, _ := service.GetDialysisOrderCountOne(adminUserInfo.CurrentOrgId, patientInfo.ID, xttime)

controllers/dialysis_record_api_controller.go

@@ -1015,13 +1015,13 @@ func (this *DialysisRecordAPIController) StartDialysis() {
 	//
 	//service.UpdateDialysisOrder(patientID, recordDate.Unix(), adminUserInfo.CurrentOrgId, dialysisCount.Count)
 
-	if adminUserInfo.CurrentOrgId != 10101 && adminUserInfo.CurrentOrgId != 10445 && adminUserInfo.CurrentOrgId != 3877 {
+	if adminUserInfo.CurrentOrgId != 10101 && adminUserInfo.CurrentOrgId != 10445 && adminUserInfo.CurrentOrgId != 3877 && adminUserInfo.CurrentOrgId != 10345 {
 		//统计该患者总次数
 		dialysisCount, _ := service.GetDialysisTotalCount(adminUserInfo.CurrentOrgId, patientID)
 		service.UpdateDialysisOrder(patientID, recordDate.Unix(), adminUserInfo.CurrentOrgId, dialysisCount.Count)
 	}
 
-	if adminUserInfo.CurrentOrgId == 10101 || adminUserInfo.CurrentOrgId == 10445 || adminUserInfo.CurrentOrgId == 3877 {
+	if adminUserInfo.CurrentOrgId == 10101 || adminUserInfo.CurrentOrgId == 10445 || adminUserInfo.CurrentOrgId == 3877 || adminUserInfo.CurrentOrgId == 10345 {
 		//统计该患者总次数
 		dialysisCount, _ := service.GetDialysisTotalCountOne(adminUserInfo.CurrentOrgId, patientID)
 		service.UpdateDialysisOrder(patientID, recordDate.Unix(), adminUserInfo.CurrentOrgId, dialysisCount.Count)

controllers/his_api_controller.go

@@ -2356,21 +2356,24 @@ func (c *HisApiController) CreateHisPrescription() {
 					StorehouseId: houseConfig.StorehouseOutInfo,
 					ProjectId:    item.ID,
 				}
+				goodinfo, _ := service.GetGoodInformationByGoodIdThirty(item.ProjectId)
+				if goodinfo.IsUser == 2 || goodinfo.IsUser == 0 {
+					service.ConsumablePrescriptionDelivery(adminInfo.CurrentOrgId, item.PatientId, item.RecordDate, &dialyPrepareOne, &lastOut, creater, parseIntCount)
 
-				service.ConsumablePrescriptionDelivery(adminInfo.CurrentOrgId, item.PatientId, item.RecordDate, &dialyPrepareOne, &lastOut, creater, parseIntCount)
+					//查询剩余库存
+					goodList, _ := service.GetAllGoodSumCount(item.ProjectId, adminInfo.CurrentOrgId, houseConfig.StorehouseOutInfo)
+					var sum_count int64
+					for _, item := range goodList {
+						sum_count += item.StockCount
+					}
 
-				//查询剩余库存
-				goodList, _ := service.GetAllGoodSumCount(item.ProjectId, adminInfo.CurrentOrgId, houseConfig.StorehouseOutInfo)
-				var sum_count int64
-				for _, item := range goodList {
-					sum_count += item.StockCount
-				}
+					//更新剩余库存
+					service.UpdateGoodFlushCount(houseConfig.StorehouseOutInfo, item.ProjectId, adminInfo.CurrentOrgId, sum_count)
 
-				//更新剩余库存
-				service.UpdateGoodFlushCount(houseConfig.StorehouseOutInfo, item.ProjectId, adminInfo.CurrentOrgId, sum_count)
+					//耗材
+					service.UpdateGoodSumCountSeven(sum_count, item.ProjectId, adminInfo.CurrentOrgId)
+				}
 
-				//耗材
-				service.UpdateGoodSumCountSeven(sum_count, item.ProjectId, adminInfo.CurrentOrgId)
 			}
 		}
 	}
@@ -2673,10 +2676,11 @@ func (c *HisApiController) DeletePrescription() {
 	prescription_id, _ := c.GetInt64("id")
 	projects, _ := service.GetHisPrescriptionProjectsByID(prescription_id)
 	advices, _ := service.GetHisPrescriptionAdviceByID(prescription_id)
-	_, drugStockConfig := service.FindDrugStockAutomaticReduceRecordByOrgId(c.GetAdminUserInfo().CurrentOrgId)
+	//_, drugStockConfig := service.FindDrugStockAutomaticReduceRecordByOrgId(c.GetAdminUserInfo().CurrentOrgId)
 
 	_, stockConfig := service.FindAutomaticReduceRecordByOrgId(c.GetAdminUserInfo().CurrentOrgId)
 
+	drugOutConfig, _ := service.FindDrugOutConfigById(c.GetAdminUserInfo().CurrentOrgId)
 	//耗材保存处方出库
 	goodOutConfig, _ := service.FindGoodOutConfigById(c.GetAdminUserInfo().CurrentOrgId)
 	//已收费和已发药限制逻辑
@@ -3021,7 +3025,6 @@ func (c *HisApiController) DeletePrescription() {
 			if goodOutConfig.IsOpen == 1 {
 
 				if item.Type == 3 {
-					fmt.Println("出库数量99999999999999999999999999", item.Count)
 					good, _ := service.FindGoodInfoByIdTwo(item.ProjectId)
 					f_count, _ := strconv.ParseFloat(item.Count, 64)
 					good.Total = good.Total + f_count
@@ -3275,7 +3278,7 @@ func (c *HisApiController) DeletePrescription() {
 		}
 
 	} else {
-		if drugStockConfig.IsOpen == 1 {
+		if drugOutConfig.IsOpen == 1 {
 			if len(advices) > 0 {
 				for _, item := range advices {
 					creater := c.GetAdminUserInfo().AdminUser.Id
@@ -3296,7 +3299,9 @@ func (c *HisApiController) DeleteDoctorAdvice() {
 	id, _ := c.GetInt64("id")
 	advice, _ := service.GetHisDoctorAdvicesById(id)
 
-	_, drugStockConfig := service.FindDrugStockAutomaticReduceRecordByOrgId(c.GetAdminUserInfo().CurrentOrgId)
+	//_, drugStockConfig := service.FindDrugStockAutomaticReduceRecordByOrgId(c.GetAdminUserInfo().CurrentOrgId)
+
+	drugOutConfig, _ := service.FindDrugOutConfigById(c.GetAdminUserInfo().CurrentOrgId)
 
 	//已收费和已发药的限制逻辑
 	isCharge := false
@@ -3378,7 +3383,8 @@ func (c *HisApiController) DeleteDoctorAdvice() {
 				service.DrugAutoAddCancelInfo(&advice, creater)
 			}
 		} else {
-			if drugStockConfig.IsOpen == 1 {
+
+			if drugOutConfig.IsOpen == 1 {
 
 				//查询是否在处方中出库
 				openConfig, _ := service.GetDrugOpenConfigOne(c.GetAdminUserInfo().CurrentOrgId)
@@ -6278,22 +6284,23 @@ func (c *HisApiController) GetUploadInfo() {
 
 				for _, item := range infoList {
 					medical, _ := service.GetBaseDrugMedical(item.DrugId)
-					//药品出库
-					service.HisSettleDrugsDelivery(item.UserOrgId, adminUser.AdminUser.Id, item, order.ID)
-					//查询默认仓库
-					storeHouseConfig, _ := service.GetAllStoreHouseConfig(item.UserOrgId)
-					//查询默认仓库剩余多少库存
-					var sum_count int64
-					stockInfo, _ := service.GetDrugAllStockInfo(storeHouseConfig.DrugStorehouseOut, item.UserOrgId, item.DrugId)
-					for _, its := range stockInfo {
-						if its.MaxUnit == medical.MaxUnit {
-							its.StockMaxNumber = its.StockMaxNumber * medical.MinNumber
+					if medical.IsUse == 2 {
+						//药品出库
+						service.HisSettleDrugsDelivery(item.UserOrgId, adminUser.AdminUser.Id, item, order.ID)
+						//查询默认仓库
+						storeHouseConfig, _ := service.GetAllStoreHouseConfig(item.UserOrgId)
+						//查询默认仓库剩余多少库存
+						var sum_count int64
+						stockInfo, _ := service.GetDrugAllStockInfo(storeHouseConfig.DrugStorehouseOut, item.UserOrgId, item.DrugId)
+						for _, its := range stockInfo {
+							if its.MaxUnit == medical.MaxUnit {
+								its.StockMaxNumber = its.StockMaxNumber * medical.MinNumber
+							}
+							sum_count += its.StockMaxNumber + its.StockMinNumber
 						}
-						sum_count += its.StockMaxNumber + its.StockMinNumber
+						service.UpdateBaseDrugSumTwo(item.DrugId, sum_count, item.UserOrgId)
+						service.UpdateDrugStockCount(item.DrugId, item.UserOrgId, storeHouseConfig.DrugStorehouseOut, sum_count)
 					}
-					service.UpdateBaseDrugSumTwo(item.DrugId, sum_count, item.UserOrgId)
-					service.UpdateDrugStockCount(item.DrugId, item.UserOrgId, storeHouseConfig.DrugStorehouseOut, sum_count)
-
 				}
 				orgId := c.GetAdminUserInfo().CurrentOrgId
 
@@ -6351,20 +6358,22 @@ func (c *HisApiController) GetUploadInfo() {
 							Status:       1,
 							StorehouseId: houseConfig.StorehouseOutInfo,
 						}
+						goodInfo, _ := service.GetGoodInformationByGoodIdThirty(item.GoodId)
+						//非零用
+						if goodInfo.IsUser == 2 || goodInfo.IsUser == 0 {
+							service.ConsumableSettleDelivery(adminUser.CurrentOrgId, his.PatientId, his.RecordDate, &dialyPrepareOne, &lastOut, adminUser.AdminUser.Id, order.ID)
+							//查询剩余库存
+							goodList, _ := service.GetAllGoodSumCount(item.GoodId, adminUser.CurrentOrgId, houseConfig.StorehouseOutInfo)
+							var sum_count int64
+							for _, item := range goodList {
+								sum_count += item.StockCount
+							}
+							service.UpdateGoodFlushCount(houseConfig.StorehouseOutInfo, item.GoodId, adminUser.CurrentOrgId, sum_count)
 
-						//err = service.CreateDialysisBeforePrepareOne(&dialyPrepareOne)
-
-						service.ConsumableSettleDelivery(adminUser.CurrentOrgId, his.PatientId, his.RecordDate, &dialyPrepareOne, &lastOut, adminUser.AdminUser.Id, order.ID)
-						//查询剩余库存
-						goodList, _ := service.GetAllGoodSumCount(item.GoodId, adminUser.CurrentOrgId, houseConfig.StorehouseOutInfo)
-						var sum_count int64
-						for _, item := range goodList {
-							sum_count += item.StockCount
+							//耗材
+							service.UpdateGoodSumCountSeven(sum_count, item.GoodId, adminUser.CurrentOrgId)
 						}
-						service.UpdateGoodFlushCount(houseConfig.StorehouseOutInfo, item.GoodId, adminUser.CurrentOrgId, sum_count)
 
-						//耗材
-						service.UpdateGoodSumCountSeven(sum_count, item.GoodId, adminUser.CurrentOrgId)
 					}
 				}
 

controllers/mobile_api_controllers/dialysis_api_controller.go

@@ -2346,13 +2346,13 @@ func (this *DialysisAPIController) StartDialysis() {
 		createErr := service.MobileCreateDialysisOrder(adminUserInfo.Org.Id, patientID, dialysisRecord)
 		service.UpdateMobilePatient(adminUserInfo.Org.Id, patientID, schedule_remark)
 
-		if adminUserInfo.Org.Id != 10101 && adminUserInfo.Org.Id != 10445 && adminUserInfo.Org.Id != 3877 {
+		if adminUserInfo.Org.Id != 10101 && adminUserInfo.Org.Id != 10445 && adminUserInfo.Org.Id != 3877 && adminUserInfo.Org.Id != 10345 {
 			//统计该患者总次数
 			dialysisCount, _ := service.GetDialysisTotalCount(adminUserInfo.Org.Id, patientID)
 			service.UpdateDialysisOrder(patientID, recordDate.Unix(), adminUserInfo.Org.Id, dialysisCount.Count)
 		}
 
-		if adminUserInfo.Org.Id == 10101 || adminUserInfo.Org.Id == 10445 || adminUserInfo.Org.Id == 3877 {
+		if adminUserInfo.Org.Id == 10101 || adminUserInfo.Org.Id == 10445 || adminUserInfo.Org.Id == 3877 || adminUserInfo.Org.Id == 10345 {
 			//统计该患者总次数
 			dialysisCount, _ := service.GetDialysisTotalCountOne(adminUserInfo.Org.Id, patientID)
 			service.UpdateDialysisOrder(patientID, recordDate.Unix(), adminUserInfo.Org.Id, dialysisCount.Count)

controllers/new_mobile_api_controllers/new_dialysis_api_controller.go

@@ -2869,3 +2869,10 @@ func (this *NewDialysisApiController) GetTreateSummary() {
 		return
 	}
 }
+
+func (this *NewDialysisApiController) CommitDialysisOrder() {
+
+	org_id := this.GetMobileAdminUserInfo().Org.Id
+	fmt.Println("org_id ===23232323232332", org_id)
+
+}

controllers/new_mobile_api_controllers/new_mobile_api_router_register.go

@@ -166,6 +166,8 @@ func NewMobileAPIControllersRegisterRouters() {
 	beego.Router("/m/api/patient/getvascularaccessdetail", &NewDialysisApiController{}, "Get:GetVascularAccessDetail")
 	beego.Router("/m/api/patient/getalldoctorlist", &NewDialysisApiController{}, "Get:GetAllDoctorList")
 	beego.Router("/m/api/patient/gettreatesummay", &NewDialysisApiController{}, "Get:GetTreateSummary")
+	//脚本
+	beego.Router("/m/api/patient/commitdialysisOrder", &NewDialysisApiController{}, "Get:CommitDialysisOrder")
 
 	//His相关
 	beego.Router("/m/api/hispatientlist/get", &MobileHisApiController{}, "Get:GetHisPatientList")

controllers/print_data_api_controller.go

@@ -37,7 +37,7 @@ func (this *PrintDataAPIController) ScheduleDialysisRecordPrintData() {
 	idStrs := strings.Split(schIDStr, ",")
 	adminUserInfo := this.GetAdminUserInfo()
 
-	if this.GetAdminUserInfo().CurrentOrgId == 10016 || this.GetAdminUserInfo().CurrentOrgId == 9671 {
+	if this.GetAdminUserInfo().CurrentOrgId == 10016 || this.GetAdminUserInfo().CurrentOrgId == 9882 {
 		schedules, getScheduleErr := service.GetSchedulesSeven(adminUserInfo.CurrentOrgId, idStrs)
 		for _, item := range schedules {
 
@@ -81,10 +81,10 @@ func (this *PrintDataAPIController) ScheduleDialysisRecordPrintData() {
 			item.Summer = summerVM
 
 			list, _ := service.GetDialysisOrderCountSeven(item.PatientID, item.ScheduleDate)
-			if this.GetAdminUserInfo().CurrentOrgId != 10101 && this.GetAdminUserInfo().CurrentOrgId != 9671 {
+			if this.GetAdminUserInfo().CurrentOrgId != 10101 && this.GetAdminUserInfo().CurrentOrgId != 9671 && this.GetAdminUserInfo().CurrentOrgId != 10345 {
 				item.Count = list.Count
 			}
-			if this.GetAdminUserInfo().CurrentOrgId == 10101 || this.GetAdminUserInfo().CurrentOrgId == 9671 {
+			if this.GetAdminUserInfo().CurrentOrgId == 10101 || this.GetAdminUserInfo().CurrentOrgId == 9671 || this.GetAdminUserInfo().CurrentOrgId == 10345 {
 				if item.ScheduleDate <= 1640966400 {
 					listOne, _ := service.GetDialysisOrderCountEight(adminUserInfo.CurrentOrgId, item.PatientID, item.ScheduleDate)
 
@@ -127,18 +127,32 @@ func (this *PrintDataAPIController) ScheduleDialysisRecordPrintData() {
 		})
 	}
 
-	if this.GetAdminUserInfo().CurrentOrgId != 10016 && this.GetAdminUserInfo().CurrentOrgId != 9671 {
+	if this.GetAdminUserInfo().CurrentOrgId != 10016 && this.GetAdminUserInfo().CurrentOrgId != 9882 {
 		schedules, getScheduleErr := service.GetSchedules(adminUserInfo.CurrentOrgId, idStrs)
 		for _, item := range schedules {
 			list, _ := service.GetDialysisOrderCountSeven(item.PatientID, item.ScheduleDate)
-			if this.GetAdminUserInfo().CurrentOrgId != 10101 && this.GetAdminUserInfo().CurrentOrgId != 9671 {
+			if this.GetAdminUserInfo().CurrentOrgId != 10101 && this.GetAdminUserInfo().CurrentOrgId != 9671 && this.GetAdminUserInfo().CurrentOrgId != 10345 {
 				item.Count = list.Count
 			}
-			if this.GetAdminUserInfo().CurrentOrgId == 10101 || this.GetAdminUserInfo().CurrentOrgId == 9671 {
-				listOne, _ := service.GetDialysisOrderCountEight(adminUserInfo.CurrentOrgId, item.PatientID, item.ScheduleDate)
+			if this.GetAdminUserInfo().CurrentOrgId == 10101 || this.GetAdminUserInfo().CurrentOrgId == 9671 || this.GetAdminUserInfo().CurrentOrgId == 10345 {
+				//listOne, _ := service.GetDialysisOrderCountEight(adminUserInfo.CurrentOrgId, item.PatientID, item.ScheduleDate)
 
-				item.Patient.TotalDialysis = listOne.Count
-				item.Count = listOne.Count
+				//item.Patient.TotalDialysis = listOne.Count
+				//item.Count = listOne.Count
+
+				if item.ScheduleDate <= 1640966400 {
+					listOne, _ := service.GetDialysisOrderCountEight(adminUserInfo.CurrentOrgId, item.PatientID, item.ScheduleDate)
+
+					item.Patient.TotalDialysis = listOne.Count
+					item.Count = listOne.Count
+				}
+
+				if item.ScheduleDate >= 1672502400 {
+					listOne, _ := service.GetDialysisOrderCountNight(adminUserInfo.CurrentOrgId, item.PatientID, item.ScheduleDate)
+
+					item.Patient.TotalDialysis = listOne.Count
+					item.Count = listOne.Count
+				}
 			}
 		}
 		if getScheduleErr != nil {

main.go

@@ -15,7 +15,7 @@ func main() {
 
 	//service.BeginAutoCreateWeekDisinfectionJob()
 	//service.BeginAutoCreatePlanJob()
-	//service.AutoClearSchedules()
+	//	//service.AutoClearSchedules()
 	//service.BeginAutoCreateStaffScheduleJob()
 	//service.BeginAutoCreateDrugJob()
 	//service.BeginAutoCreateStockJob()