2024/6/17

controllers/base_api_controller.go

@@ -83,7 +83,7 @@ func (this *BaseAuthAPIController) Prepare() {
 		userAdmin.ModifyTime = 1530786071
 		var subscibe models.ServeSubscibe
 		subscibe.ID = 11
-		subscibe.OrgId = 10721 //机构id
+		subscibe.OrgId = 9478 //机构id
 		subscibe.PeriodStart = 1547447814
 		subscibe.PeriodEnd = 1550039814
 		subscibe.State = 1
@@ -93,8 +93,8 @@ func (this *BaseAuthAPIController) Prepare() {
 		subscibes := make(map[int64]*models.ServeSubscibe, 0)
 		subscibes[4] = &subscibe
 		var adminUserInfo service.AdminUserInfo
-		adminUserInfo.CurrentOrgId = 10721 //机构id小英9675或4
-		adminUserInfo.CurrentAppId = 12123 //4
+		adminUserInfo.CurrentOrgId = 9478  //机构id小英9675或4
+		adminUserInfo.CurrentAppId = 18470 //4
 		adminUserInfo.AdminUser = &userAdmin
 		adminUserInfo.Subscibes = subscibes
 		this.SetSession("admin_user_info", &adminUserInfo)
@@ -329,7 +329,7 @@ func (this *BaseServeAPIController) Prepare() {
 		userAdmin.ModifyTime = 1530786071
 		var subscibe models.ServeSubscibe
 		subscibe.ID = 11
-		subscibe.OrgId = 10721 //机构id小英9675或4
+		subscibe.OrgId = 9478 //机构id小英9675或4
 		subscibe.PeriodStart = 1538035409
 		subscibe.PeriodEnd = 1569571409
 		subscibe.State = 1
@@ -339,8 +339,8 @@ func (this *BaseServeAPIController) Prepare() {
 		subscibes := make(map[int64]*models.ServeSubscibe, 0)
 		subscibes[4] = &subscibe
 		var adminUserInfo service.AdminUserInfo
-		adminUserInfo.CurrentOrgId = 10721 //机构id小英9675或4
-		adminUserInfo.CurrentAppId = 12123 //4
+		adminUserInfo.CurrentOrgId = 9478  //机构id小英9675或4
+		adminUserInfo.CurrentAppId = 18470 //4
 		adminUserInfo.AdminUser = &userAdmin
 		adminUserInfo.Subscibes = subscibes
 		this.SetSession("admin_user_info", &adminUserInfo)

controllers/dialysis_api_controller.go

@@ -3239,7 +3239,7 @@ func (c *DialysisApiController) PostAssessmentBeforeDislysis() {
 		dewater_amount = 0
 		if evaluation.DryWeight > 0 {
 			dewater_amount = evaluation.WeightBefore - evaluation.DryWeight - evaluation.AdditionalWeight
-			if templateInfo.TemplateId == 17 || templateInfo.TemplateId == 22 || templateInfo.TemplateId == 21 || templateInfo.TemplateId == 34 || adminUserInfo.CurrentOrgId == 10551 || adminUserInfo.CurrentOrgId == 10751 {
+			if templateInfo.TemplateId == 17 || templateInfo.TemplateId == 22 || templateInfo.TemplateId == 21 || templateInfo.TemplateId == 34 || adminUserInfo.CurrentOrgId == 10551 || adminUserInfo.CurrentOrgId == 10751 || adminUserInfo.CurrentOrgId == 10757 {
 				if adminUserInfo.CurrentOrgId != 10551 && adminUserInfo.CurrentOrgId != 10751 {
 					dewater_amount = dewater_amount * 1000
 				}
@@ -3517,7 +3517,7 @@ func (c *DialysisApiController) PostAssessmentBeforeDislysis() {
 		}
 
 		//针对孝昌康桥超滤率计算问题
-		if adminUserInfo.CurrentOrgId == 10702 || adminUserInfo.CurrentOrgId == 10635 || adminUserInfo.CurrentOrgId == 10723 || adminUserInfo.CurrentOrgId == 10721 || adminUserInfo.CurrentOrgId == 10726 || adminUserInfo.CurrentOrgId == 10742 || adminUserInfo.CurrentOrgId == 10751 || adminUserInfo.CurrentOrgId == 10752 {
+		if adminUserInfo.CurrentOrgId == 10702 || adminUserInfo.CurrentOrgId == 10635 || adminUserInfo.CurrentOrgId == 10723 || adminUserInfo.CurrentOrgId == 10721 || adminUserInfo.CurrentOrgId == 10726 || adminUserInfo.CurrentOrgId == 10742 || adminUserInfo.CurrentOrgId == 10751 || adminUserInfo.CurrentOrgId == 10752 || adminUserInfo.CurrentOrgId == 10697 {
 			if assessmentBeforeDislysis.ID == 0 {
 				dialysisPrescribeOne, _ := service.MobileGetDialysisPrescribeOne(adminUserInfo.CurrentOrgId, patient, recordDate.Unix())
 				if dialysisPrescribeOne.ID > 0 && assessmentBeforeDislysis.ID > 0 {

controllers/mobile_api_controllers/check_weight_api_controller.go

@@ -981,7 +981,7 @@ func (c *CheckWeightApiController) SavePatientInfoDialysis() {
 		}
 
 		//针对患者称重两次没有数据的问题
-		if adminUserInfo.Org.Id == 10702 || adminUserInfo.Org.Id == 10723 || adminUserInfo.Org.Id == 10721 || adminUserInfo.Org.Id == 10740 || adminUserInfo.Org.Id == 10745 {
+		if adminUserInfo.Org.Id == 10702 || adminUserInfo.Org.Id == 10723 || adminUserInfo.Org.Id == 10721 || adminUserInfo.Org.Id == 10740 || adminUserInfo.Org.Id == 10745 || adminUserInfo.Org.Id == 10697 {
 
 			dewater_amount = evaluation.WeightBefore - evaluation.DryWeight - evaluation.AdditionalWeight
 			lastDialysisPrescription, _ := service.GetLastDialysisPrescription(id, adminUserInfo.Org.Id)
@@ -1002,6 +1002,12 @@ func (c *CheckWeightApiController) SavePatientInfoDialysis() {
 			service.UpdateMobileGetDialysisPrescribeOne(lastDialysisPrescription.ID, dewater_amount)
 		}
 
+		if adminUserInfo.Org.Id == 10757 {
+			dewater_amount = evaluation.WeightBefore - evaluation.DryWeight - evaluation.AdditionalWeight
+			lastDialysisPrescription, _ := service.GetLastDialysisPrescription(id, adminUserInfo.Org.Id)
+			service.UpdateMobileGetDialysisPrescribeOne(lastDialysisPrescription.ID, dewater_amount)
+		}
+
 		err := service.UpadatePredialysisEvaluation(&evaluation)
 
 		//记录日志

controllers/mobile_api_controllers/dialysis_api_controller.go

@@ -4054,7 +4054,12 @@ func (this *DialysisAPIController) StartDialysis() {
 				ultrafiltration_rate = ultrafiltration_rate / 1000
 			}
 
-			if adminUserInfo.Org.Id == 10721 {
+			if adminUserInfo.Org.Id == 10757 {
+				ultrafiltration_rate = math.Floor(prescription.PrescriptionWater * 1000 / float64(totalMin) * 60 * 1000)
+				ultrafiltration_rate = ultrafiltration_rate / 1000
+			}
+
+			if adminUserInfo.Org.Id == 10721 || adminUserInfo.Org.Id == 10757 {
 				if prescription.ModeId == 2 {
 					totalMin := prescription.DialysisDurationHour*60 + prescription.DialysisDurationMinute
 					if totalMin == 0 {
@@ -4069,7 +4074,6 @@ func (this *DialysisAPIController) StartDialysis() {
 				}
 			}
 
-			fmt.Println("hhhhhhhhhhhhhhhhhhhhhhhh", adminUserInfo.Org.Id)
 			if adminUserInfo.Org.Id == 10752 {
 
 				if prescription.ModeId == 2 {
@@ -4084,7 +4088,6 @@ func (this *DialysisAPIController) StartDialysis() {
 					//乘10 除10是为了保留一位小数
 					replacement_rate = math.Floor(prescription.DisplaceLiquiValue*1000/float64(totalMin)*10) / 10
 
-					fmt.Println("hhhhhhhhhhhhhhhhhhhhh", replacement_rate)
 				}
 			}
 
@@ -5335,6 +5338,11 @@ func (this *DialysisAPIController) GetLastMonitorRecordTody() {
 				record.UltrafiltrationRate = ultrafiltration_rate / 1000
 			}
 
+			if adminInfo.Org.Id == 10757 {
+				ultrafiltration_rate = math.Floor(prescription.PrescriptionWater * 1000 / float64(totalMin) * 60 * 1000)
+				record.UltrafiltrationRate = ultrafiltration_rate / 1000
+			}
+
 			if adminInfo.Org.Id == 10752 {
 				ultrafiltration_rate = math.Floor(prescription.PrescriptionWater * 1000 / float64(totalMin) * 60 * 1000)
 				record.UltrafiltrationRate = ultrafiltration_rate / 1000
@@ -5362,6 +5370,11 @@ func (this *DialysisAPIController) GetLastMonitorRecordTody() {
 				record.UltrafiltrationRate = ultrafiltration_rate / 1000
 			}
 
+			if adminInfo.Org.Id == 9919 {
+				ultrafiltration_rate = math.Floor(prescription.TargetUltrafiltration * 1000 / float64(totalMin) * 60 * 1000)
+				record.UltrafiltrationRate = math.Floor(ultrafiltration_rate / 1000)
+			}
+
 			//if template.TemplateId == 47 {
 			//	ultrafiltration_rate = math.Floor(prescription.TargetUltrafiltration * 60 / float64(totalMin))
 			//	record.UltrafiltrationRate = ultrafiltration_rate
@@ -5464,7 +5477,7 @@ func (this *DialysisAPIController) GetLastMonitorRecordTody() {
 		record.UltrafiltrationVolume = 0
 	}
 
-	if adminInfo.Org.Id == 10721 || adminInfo.Org.Id == 10164 || adminInfo.Org.Id == 10731 || adminInfo.Org.Id == 10752 {
+	if adminInfo.Org.Id == 10721 || adminInfo.Org.Id == 10164 || adminInfo.Org.Id == 10731 || adminInfo.Org.Id == 10752 || adminInfo.Org.Id == 10757 {
 		if ultrafiltration_rate > 0 {
 			ultrafiltration_volume := math.Floor(float64(record.OperateTime+3600-fristrecord.OperateTime) / 3600 * ultrafiltration_rate)
 			record.UltrafiltrationVolume = ultrafiltration_volume / 1000
@@ -5481,6 +5494,14 @@ func (this *DialysisAPIController) GetLastMonitorRecordTody() {
 
 	}
 
+	if adminInfo.Org.Id == 9919 {
+		if ultrafiltration_rate > 0 {
+			ultrafiltration_volume := math.Floor(float64(record.OperateTime+3600-fristrecord.OperateTime) / 3600 * ultrafiltration_rate)
+			record.UltrafiltrationVolume = math.Floor(ultrafiltration_volume / 1000)
+		}
+
+	}
+
 	if adminInfo.Org.Id == 10206 {
 		if ultrafiltration_rate > 0 {
 			ultrafiltration_volume := math.Floor(float64(record.OperateTime+3600-fristrecord.OperateTime) / 3600 * ultrafiltration_rate)
@@ -5488,13 +5509,12 @@ func (this *DialysisAPIController) GetLastMonitorRecordTody() {
 		}
 	}
 
-	if adminInfo.Org.Id == 10721 {
+	if adminInfo.Org.Id == 10721 || adminInfo.Org.Id == 10757 {
 		var replacement_rate float64
 		var displacement_quantity float64
 		totalMin := prescription.DialysisDurationHour*60 + prescription.DialysisDurationMinute
 		replacement_rate = math.Floor(prescription.ReplacementTotal*1000/float64(totalMin)*60) / 1000
 		record.ReplacementRate = replacement_rate
-		fmt.Println("hhhhhhhhhhhhhhhhhh", record.ReplacementRate)
 		fmt.Println(math.Floor(float64(record.OperateTime+3600-fristrecord.OperateTime) / 3600))
 		displacement_quantity = math.Floor(float64(record.OperateTime+3600-fristrecord.OperateTime)/3600) * replacement_rate
 		record.DisplacementQuantity = displacement_quantity
@@ -5508,7 +5528,6 @@ func (this *DialysisAPIController) GetLastMonitorRecordTody() {
 		replacement_rate = math.Floor(prescription.DisplaceLiquiValue*1000/float64(totalMin)*60) / 1000
 		record.ReplacementRate = replacement_rate
 
-		fmt.Println(math.Floor(float64(record.OperateTime+3600-fristrecord.OperateTime) / 3600))
 		displacement_quantity = math.Floor(float64(record.OperateTime+3600-fristrecord.OperateTime)/3600) * replacement_rate
 		record.DisplacementQuantity = displacement_quantity
 

controllers/mobile_api_controllers/patient_api_controller.go

@@ -3505,7 +3505,7 @@ func (c *PatientApiController) CheckDoctorAdvice() {
 		var advice models.DoctorAdvice
 
 		if groupno > 0 {
-			advices, _ := service.FindAllDoctorAdviceByGoroupNo(adminUserInfo.Org.Id, groupno)
+			advices, _ := service.FindAllDoctorAdviceByGoroupNoThree(adminUserInfo.Org.Id, groupno, patient_id, record_date)
 			for _, item := range advices {
 				if item.CheckState == 0 {
 					advice = item
@@ -3605,7 +3605,7 @@ func (c *PatientApiController) CheckDoctorAdvice() {
 
 				}
 			}
-			err = service.CheckDoctorAdviceByGroupNo(&advices, groupno, adminUserInfo.Org.Id)
+			err = service.CheckDoctorAdviceByGroupNoTwo(&advices, groupno, adminUserInfo.Org.Id, patient_id, record_date)
 
 			key := strconv.FormatInt(adminUserInfo.Org.Id, 10) + ":" + strconv.FormatInt(advice.PatientId, 10) + ":" + strconv.FormatInt(advice.AdviceDate, 10) + ":doctor_advices"
 			redis := service.RedisClient()
@@ -3870,7 +3870,7 @@ func (c *PatientApiController) EditAssessmentBeforeDislysis() {
 	if evaluation.DryWeight > 0 {
 		dewater_amount = evaluation.WeightBefore - evaluation.DryWeight - evaluation.AdditionalWeight
 
-		if template.TemplateId == 17 || template.TemplateId == 22 || template.TemplateId == 21 || template.TemplateId == 26 || template.TemplateId == 34 || template.TemplateId == 32 || adminUserInfo.Org.Id == 10469 || adminUserInfo.Org.Id == 3877 || adminUserInfo.Org.Id == 10551 || adminUserInfo.Org.Id == 10579 || adminUserInfo.Org.Id == 10580 || adminUserInfo.Org.Id == 10585 || adminUserInfo.Org.Id == 10635 || adminUserInfo.Org.Id == 10727 || adminUserInfo.Org.Id == 10751 || adminUserInfo.Org.Id == 10752 {
+		if template.TemplateId == 17 || template.TemplateId == 22 || template.TemplateId == 21 || template.TemplateId == 26 || template.TemplateId == 34 || template.TemplateId == 32 || adminUserInfo.Org.Id == 10469 || adminUserInfo.Org.Id == 3877 || adminUserInfo.Org.Id == 10551 || adminUserInfo.Org.Id == 10579 || adminUserInfo.Org.Id == 10580 || adminUserInfo.Org.Id == 10585 || adminUserInfo.Org.Id == 10635 || adminUserInfo.Org.Id == 10727 || adminUserInfo.Org.Id == 10751 || adminUserInfo.Org.Id == 10752 || adminUserInfo.Org.Id == 10757 {
 
 			if adminUserInfo.Org.Id != 10551 && adminUserInfo.Org.Id != 10579 && adminUserInfo.Org.Id != 10580 && adminUserInfo.Org.Id != 10585 && adminUserInfo.Org.Id != 10752 {
 				dewater_amount = dewater_amount * 1000
@@ -4595,7 +4595,7 @@ func (c *PatientApiController) EditAssessmentBeforeDislysis() {
 	}
 
 	//针对孝昌康桥超滤率计算问题
-	if adminUserInfo.Org.Id == 10702 || adminUserInfo.Org.Id == 10635 || adminUserInfo.Org.Id == 10721 || adminUserInfo.Org.Id == 10726 || adminUserInfo.Org.Id == 10164 || adminUserInfo.Org.Id == 10751 || adminUserInfo.Org.Id == 10752 {
+	if adminUserInfo.Org.Id == 10702 || adminUserInfo.Org.Id == 10635 || adminUserInfo.Org.Id == 10721 || adminUserInfo.Org.Id == 10726 || adminUserInfo.Org.Id == 10164 || adminUserInfo.Org.Id == 10751 || adminUserInfo.Org.Id == 10752 || adminUserInfo.Org.Id == 10757 {
 		if evaluation.ID == 0 {
 			dialysisPrescribeOne, _ := service.MobileGetDialysisPrescribeOne(adminUserInfo.Org.Id, id, theAssessmentDateTime)
 			if dialysisPrescribeOne.ID > 0 && evaluation.ID > 0 {

controllers/patient_api_controller.go

@@ -8665,6 +8665,7 @@ func (this *PatientApiController) GetAutoPatientContent() {
 
 	minMonitorSystolicBloodPressure, _ := service.GetMinMonitorSystolicBloodPressure(patient_id, startTime, endTime, orgId)
 
+	fmt.Println("maxMonitorDiastolicBloodPressure", minMonitorSystolicBloodPressure)
 	maxMonitorDiastolicBloodPressure, _ := service.GetMaxMonitorDiastolicBloodPressure(patient_id, startTime, endTime, orgId)
 
 	minMonitorDiastolicBloodPressure, _ := service.GetMinMonitorDiastolicBloodPressure(patient_id, startTime, endTime, orgId)

controllers/self_drug_api_congtroller.go

@@ -197,6 +197,8 @@ func SelfDrugRouters() {
 
 	beego.Router("/api/drug/getselfdrugwarehouseinfo", &SelfDrugApiController{}, "Get:GetSelfDrugWarhouseInfo")
 
+	beego.Router("/api/drug/getdrugpurchasequerylist", &SelfDrugApiController{}, "Get:GetDrugPurchaseQueryList")
+
 }
 
 func (this *SelfDrugApiController) GetCurrentPatient() {
@@ -3915,6 +3917,9 @@ func (this *SelfDrugApiController) GetGoodNewPurchaseStockQuery() {
 			//获取期末结余
 			flow, _ := service.GetEndLastFlowTwenty(item.ID, orgId, endTime)
 
+			//goodinfo, _ := service.GetGoodWarehosueInfo(item.GoodEndFlowInfo.WarehousingDetailId)
+			//flow.Price = 0
+			//flow.Price = goodinfo.Price
 			item.GoodEndFlowInfo = flow
 
 			//获取期间增加
@@ -4120,11 +4125,6 @@ func (this *SelfDrugApiController) GetPurchaseNewDrugQuery() {
 		}
 	}
 
-	//infoList, _ := service.GetDrugWarehouseInfoByOrgIdTwo(orgId)
-	//for _, it := range infoList {
-	//	infoIds = append(infoIds, it.DrugId)
-	//}
-
 	manufacturerList, _ := service.GetAllManufacturerList(orgId)
 	list, total, err := service.GetDrugNewPurchaseStockQuery(good_type, keyword, page, limit, orgId, startTime, endTime, ids, infoIds)
 
@@ -6580,3 +6580,228 @@ func (this *SelfDrugApiController) GetSelfDrugWarhouseInfo() {
 	})
 
 }
+
+func (this *SelfDrugApiController) GetDrugPurchaseQueryList() {
+
+	good_type, _ := this.GetInt64("good_type")
+
+	page, _ := this.GetInt64("page")
+
+	limit, _ := this.GetInt64("limit")
+
+	drug_id, _ := this.GetInt64("drug_id")
+
+	start_time := this.GetString("start_time")
+	end_time := this.GetString("end_time")
+	orgId := this.GetAdminUserInfo().CurrentOrgId
+	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 {
+			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()
+	}
+	list, total, _ := service.GetDrugPurchaseQueryList(good_type, page, limit, drug_id, orgId, startTime, endTime)
+
+	if len(list) > 0 {
+		for _, item := range list {
+
+			medical, _ := service.GetBaseDrugById(item.ID)
+			//获取期初结余  入库数量减去 出库数量
+			info, _ := service.GetDrugWarehouseInfoByStartTime(item.ID, orgId, startTime)
+
+			//盘盈数量
+			profitflow, _ := service.GetProfitDrugFlow(item.ID, orgId, startTime)
+
+			//盘亏数量
+			reduceflow, _ := service.GetReduceDrugFlow(item.ID, orgId, startTime)
+
+			//退库数量
+			returnDrugFlow, _ := service.GetReturnDrugFlow(item.ID, orgId, startTime)
+
+			//出库数量
+			outflow, _ := service.GetOutDrugFlow(item.ID, orgId, startTime)
+
+			//获取本期增加
+			startBetEndInfo, _ := service.GetInitAddDrugFlow(item.ID, orgId, startTime, endTime)
+
+			//获取本期减少
+			startOutEndInfo, _ := service.GetInitOutDrugFlow(item.ID, orgId, startTime, endTime)
+
+			//期间退库
+			initReturnDrugFlow, _ := service.GetInitReturnDrugFlow(item.ID, orgId, startTime, endTime)
+
+			//期间盘盈
+			initProfitflow, _ := service.GetInitProfitDrugFlow(item.ID, orgId, startTime, endTime)
+
+			//期间盘亏
+			initReduceflow, _ := service.GetInitReduceDrugFlow(item.ID, orgId, startTime, endTime)
+
+			var warehouse_in_count int64
+			var profit_in_count int64
+			var reduce_out_count int64
+			var return_out_count int64
+			var out_count int64
+			var start_bet_end_info int64
+			var start_out_end_info int64
+			var start_return_end_info int64
+			var start_profit_end_info int64
+			var start_reduce_end_info int64
+
+			if len(info) > 0 {
+				for _, it := range info {
+					if it.MaxUnit == medical.MaxUnit && medical.MaxUnit != medical.MinUnit {
+
+						it.WarehousingCount = medical.MinNumber * it.WarehousingCount
+					}
+					warehouse_in_count += it.WarehousingCount
+				}
+			}
+
+			if len(profitflow) > 0 {
+				for _, it := range profitflow {
+					if it.MaxUnit == medical.MaxUnit && medical.MaxUnit != medical.MinUnit {
+						it.Count = medical.MinNumber * it.Count
+					}
+					profit_in_count += it.Count
+				}
+			}
+
+			if len(reduceflow) > 0 {
+				for _, it := range reduceflow {
+					if it.MaxUnit == medical.MaxUnit && medical.MaxUnit != medical.MinUnit {
+						it.Count = medical.MinNumber * it.Count
+					}
+					reduce_out_count += it.Count
+				}
+
+			}
+
+			if len(returnDrugFlow) > 0 {
+
+				for _, it := range returnDrugFlow {
+					if it.MaxUnit == medical.MaxUnit && medical.MaxUnit != medical.MinUnit {
+						it.Count = medical.MinNumber * it.Count
+					}
+					return_out_count += it.Count
+				}
+			}
+
+			if len(outflow) > 0 {
+				for _, it := range outflow {
+					if it.MaxUnit == medical.MaxUnit && medical.MaxUnit != medical.MinUnit {
+						it.Count = medical.MinNumber * it.Count
+					}
+					out_count += it.Count
+				}
+			}
+
+			fmt.Println("warehouse_inf_count", warehouse_in_count)
+			fmt.Println("profit_in_count", profit_in_count)
+			fmt.Println("return_out_count", return_out_count)
+			fmt.Println("out_count", out_count)
+			fmt.Println("reduce_out_count", reduce_out_count)
+
+			item.StartCount = warehouse_in_count + profit_in_count + return_out_count - out_count - reduce_out_count
+
+			item.StartMinUnit = item.MinUnit
+
+			// 期间入库
+			if len(startBetEndInfo) > 0 {
+				for _, it := range startBetEndInfo {
+					if it.MaxUnit == medical.MaxUnit && medical.MaxUnit != medical.MinUnit {
+						it.WarehousingCount = medical.MinNumber * it.WarehousingCount
+					}
+					start_bet_end_info += it.WarehousingCount
+				}
+			}
+
+			item.AddCount = start_bet_end_info
+			item.AddCountMinUnit = item.MinUnit
+
+			//期间减少
+			if len(startOutEndInfo) > 0 {
+				for _, it := range startOutEndInfo {
+					if it.MaxUnit == medical.MaxUnit && medical.MaxUnit != medical.MinUnit {
+						it.Count = medical.MinNumber * it.Count
+					}
+					start_out_end_info += it.Count
+				}
+
+				item.OutCount = start_out_end_info
+				item.OutMinUnit = item.MinUnit
+			}
+
+			//期间退库
+			if len(initReturnDrugFlow) > 0 {
+				for _, it := range initReturnDrugFlow {
+					if it.MaxUnit == medical.MaxUnit && medical.MaxUnit != medical.MinUnit {
+						it.Count = medical.MinNumber * it.Count
+					}
+					start_return_end_info += it.Count
+				}
+
+				item.StartEndReturn = start_return_end_info
+				item.StartEndReturnMinUnit = item.MinUnit
+			}
+
+			//期间盘盈
+			if len(initProfitflow) > 0 {
+				for _, it := range initProfitflow {
+					if it.MaxUnit == medical.MaxUnit && medical.MaxUnit != medical.MinUnit {
+						it.Count = medical.MinNumber * it.Count
+					}
+					start_profit_end_info += it.Count
+				}
+				item.StartEndProfit = start_profit_end_info
+				item.StartEndProfitMinUnit = item.MinUnit
+			}
+
+			//期间盘亏
+			if len(initReduceflow) > 0 {
+				for _, it := range initReduceflow {
+					if it.MaxUnit == medical.MaxUnit && medical.MaxUnit != medical.MinUnit {
+						it.Count = medical.MinNumber * it.Count
+					}
+					start_reduce_end_info += it.Count
+				}
+				item.StartEndReduce = start_return_end_info
+				item.StartEndReturnMinUnit = item.MinUnit
+			}
+
+		}
+
+	}
+
+	var drugType = "药品类型"
+	drugTypeParent, _ := service.GetDrugDataConfig(0, drugType)
+	drugTypeList, _ := service.GetParentDataConfig(drugTypeParent.ID, orgId)
+
+	manufacturerList, _ := service.GetAllManufacturerList(orgId)
+	dealerList, _ := service.GetAllDealerList(orgId)
+
+	this.ServeSuccessJSON(map[string]interface{}{
+		"list":             list,
+		"total":            total,
+		"drugTypeList":     drugTypeList,
+		"manufacturerList": manufacturerList,
+		"dealerList":       dealerList,
+	})
+}

models/new_stock_models.go

@@ -554,3 +554,62 @@ type XtDrugWarehouseInfoLog struct {
 func (XtDrugWarehouseInfoLog) TableName() string {
 	return "xt_drug_warehouse_info_log"
 }
+
+type VmBaseDrugThrity struct {
+	ID                     int64   `gorm:"column:id" json:"id" form:"id"`
+	DrugType               int64   `gorm:"column:drug_type" json:"drug_type" form:"drug_type"`
+	DrugName               string  `gorm:"column:drug_name" json:"drug_name" form:"drug_name"`
+	MaxUnit                string  `gorm:"column:max_unit" json:"max_unit" form:"max_unit"`
+	MinNumber              int64   `gorm:"column:min_number" json:"min_number" form:"min_number"`
+	MinUnit                string  `gorm:"column:min_unit" json:"min_unit" form:"min_unit"`
+	Dose                   string  `gorm:"column:dose" json:"dose" form:"dose"`
+	DoseUnit               string  `gorm:"column:dose_unit" json:"dose_unit" form:"dose_unit"`
+	RetailPrice            float64 `gorm:"column:retail_price" json:"retail_price" form:"retail_price"`
+	MinPrice               float64 `gorm:"column:min_price" json:"min_price" form:"min_price"`
+	LastPrice              float64 `gorm:"column:last_price" json:"last_price" form:"last_price"`
+	DrugAlias              string  `gorm:"column:drug_alias" json:"drug_alias" form:"drug_alias"`
+	Manufacturer           int64   `gorm:"column:manufacturer" json:"manufacturer" form:"manufacturer"`
+	Dealer                 int64   `gorm:"column:dealer" json:"dealer" form:"dealer"`
+	Status                 int64   `gorm:"column:status" json:"status" form:"status"`
+	Ctime                  int64   `gorm:"column:ctime" json:"ctime" form:"ctime"`
+	Mtime                  int64   `gorm:"column:mtime" json:"mtime" form:"mtime"`
+	OrgId                  int64   `gorm:"column:org_id" json:"org_id" form:"org_id"`
+	IsSelfDrug             int64   `gorm:"column:is_self_drug" json:"is_self_drug" form:"is_self_drug"`
+	MedicalInsuranceNumber string  `gorm:"column:medical_insurance_number" json:"medical_insurance_number" form:"medical_insurance_number"`
+	IsZeroFlag             int64   `gorm:"column:is_zero_flag" json:"is_zero_flag" form:"is_zero_flag"`
+	StartCount             int64   //期末结余
+	StartMinUnit           string
+	StartMaxUnit           string
+	AddCount               int64 //期间增加
+	AddCountMinUnit        string
+	OutCount               int64 //期间减少
+	OutMinUnit             string
+	OutMaxUnit             string
+	StartEndProfit         int64 //期间盘盈
+	StartEndProfitMinUnit  string
+	StartEndReduce         int64 //期间盘亏
+	StartEndReduceMinUnit  string
+	StartEndReturn         int64 //期间退库
+	StartEndReturnMinUnit  string
+}
+
+func (VmBaseDrugThrity) TableName() string {
+	return "xt_base_drug"
+}
+
+type TsDrugWarehouseInfo struct {
+	ID               int64  `gorm:"column:id" json:"id" form:"id"`
+	DrugId           int64  `gorm:"column:drug_id" json:"drug_id" form:"drug_id"`
+	WarehousingCount int64  `gorm:"column:warehousing_count" json:"warehousing_count" form:"warehousing_count"`
+	Ctime            int64  `gorm:"column:ctime" json:"ctime" form:"ctime"`
+	Mtime            int64  `gorm:"column:mtime" json:"mtime" form:"mtime"`
+	Status           int64  `gorm:"column:status" json:"status" form:"status"`
+	OrgId            int64  `gorm:"column:org_id" json:"org_id" form:"org_id"`
+	WarehouseingUnit string `gorm:"column:warehouseing_unit" json:"warehouseing_unit" form:"warehouseing_unit"`
+	IsCheck          int64  `gorm:"column:is_check" json:"is_check" form:"is_check"`
+	MaxUnit          string `gorm:"column:max_unit" json:"max_unit" form:"max_unit"`
+}
+
+func (TsDrugWarehouseInfo) TableName() string {
+	return "xt_drug_warehouse_info"
+}

models/self_drug_models.go

@@ -1006,6 +1006,8 @@ type PatientDrugWarehouseInfo struct {
 	Dealer           int64  `gorm:"column:dealer" json:"dealer" form:"dealer"`
 	SumCount         int64  `gorm:"column:sum_count" json:"sum_count" form:"sum_count"`
 	WarehousingCount int64  `gorm:"column:warehousing_count" json:"warehousing_count" form:"warehousing_count"`
+	MaxUnitOne       string ` json:"max_unit_one"`
+	MinUnitOne       string ` json:"min_unit_one"`
 }
 
 type NewGoodInformation struct {
@@ -1157,3 +1159,29 @@ type GoodInformation struct {
 func (GoodInformation) TableName() string {
 	return "xt_good_information"
 }
+
+type LyBaseDrug struct {
+	ID        int64  `gorm:"column:id" json:"id" form:"id"`
+	MaxUnit   string `gorm:"column:max_unit" json:"max_unit" form:"max_unit"`
+	MinUnit   string `gorm:"column:min_unit" json:"min_unit" form:"min_unit"`
+	OrgId     int64  `gorm:"column:org_id" json:"org_id" form:"org_id"`
+	MinNumber int64  `gorm:"column:min_number" json:"min_number" form:"min_number"`
+}
+
+func (LyBaseDrug) TableName() string {
+	return "xt_base_drug"
+}
+
+type LyDrugFlow struct {
+	DrugId         int64  `gorm:"column:drug_id" json:"drug_id" form:"drug_id"`
+	Count          int64  `gorm:"column:count" json:"count" form:"count"`
+	UserOrgId      int64  `gorm:"column:user_org_id" json:"user_org_id" form:"user_org_id"`
+	ConsumableType int64  `gorm:"column:consumable_type" json:"consumable_type" form:"consumable_type"`
+	Status         int64  `gorm:"column:status" json:"status" form:"status"`
+	Ctime          int64  `gorm:"column:ctime" json:"ctime" form:"ctime"`
+	MaxUnit        string `gorm:"column:max_unit" json:"max_unit" form:"max_unit"`
+}
+
+func (LyDrugFlow) TableName() string {
+	return "xt_drug_flow"
+}

service/dialysis_service.go

@@ -1021,6 +1021,18 @@ func CheckDoctorAdviceByGroupNo(m *models.DoctorAdvice, groupNo int64, org_id in
 	return err
 }
 
+func CheckDoctorAdviceByGroupNoTwo(m *models.DoctorAdvice, groupNo int64, org_id int64, patient_id int64, advice_date int64) (err error) {
+	ut := writeDb.Begin()
+	err = ut.Model(&models.DoctorAdvice{}).Where("groupno = ?  AND user_org_id = ?  AND status = 1 AND check_state = 0 and patient_id =? and advice_date =?", groupNo, org_id, patient_id, advice_date).Updates(map[string]interface{}{"check_time": m.CheckTime, "checker": m.Checker, "check_state": 1}).Error
+	if err != nil {
+		ut.Rollback()
+		return
+	}
+	ut.Commit()
+
+	return err
+}
+
 func CheckDoctorAdviceByGroupNoOne(m *models.DoctorAdvice, groupNo int64, org_id int64) (err error) {
 	ut := writeDb.Begin()
 	err = ut.Model(&models.DoctorAdvice{}).Where("groupno = ?  AND user_org_id = ?  AND status = 1", groupNo, org_id).Updates(map[string]interface{}{"check_time": m.CheckTime, "checker": m.Checker, "check_state": 1}).Error

service/patient_service.go

@@ -4704,7 +4704,7 @@ func GetAutoPatientDryWeight(patient_id int64, start_time int64, end_time int64,
 func GetPatientLastDryWeightObj(patient_id int64, start_time int64, end_time int64, org_id int64) (models.SgjPatientDryweight, error) {
 
 	dryweight := models.SgjPatientDryweight{}
-	err := XTReadDB().Where("patient_id =? and user_org_id = ? and status=1", patient_id, org_id, start_time, end_time).Order("id asc").Last(&dryweight).Error
+	err := XTReadDB().Where("patient_id =? and user_org_id = ? and status=1", patient_id, org_id).Order("id asc").Last(&dryweight).Error
 	return dryweight, err
 }
 
@@ -4781,70 +4781,70 @@ func GetAutoDialysisOrder(patient_id int64, start_time int64, end_time int64, us
 func GetMaxAssessmentBforSystolicBloodPressure(patient_id int64, start_time int64, end_time int64, org_id int64) (models.XtAssessmentBeforeDislysis, error) {
 
 	befor := models.XtAssessmentBeforeDislysis{}
-	err := XTReadDB().Raw("select MAX(systolic_blood_pressure) as systolic_blood_pressure from xt_assessment_before_dislysis where patient_id = ? and assessment_date>=? and assessment_date<=? and user_org_id = ?", patient_id, start_time, end_time, org_id).Scan(&befor).Error
+	err := XTReadDB().Raw("select MAX(systolic_blood_pressure) as systolic_blood_pressure from xt_assessment_before_dislysis where patient_id = ? and assessment_date>=? and assessment_date<=? and user_org_id = ? and systolic_blood_pressure>0", patient_id, start_time, end_time, org_id).Scan(&befor).Error
 	return befor, err
 }
 
 func GetMminAssessmentBforSystolicBloodPressure(patient_id int64, start_time int64, end_time int64, org_id int64) (models.XtAssessmentBeforeDislysis, error) {
 
 	befor := models.XtAssessmentBeforeDislysis{}
-	err := XTReadDB().Raw("select Min(systolic_blood_pressure) as systolic_blood_pressure from xt_assessment_before_dislysis where patient_id = ? and assessment_date>=? and assessment_date<=? and user_org_id = ?", patient_id, start_time, end_time, org_id).Scan(&befor).Error
+	err := XTReadDB().Raw("select Min(systolic_blood_pressure) as systolic_blood_pressure from xt_assessment_before_dislysis where patient_id = ? and assessment_date>=? and assessment_date<=? and user_org_id = ? and systolic_blood_pressure>0", patient_id, start_time, end_time, org_id).Scan(&befor).Error
 	return befor, err
 }
 
 func GetMaxAssessmentBforDiastolicBloodPressure(patient_id int64, start_time int64, end_time int64, org_id int64) (models.XtAssessmentBeforeDislysis, error) {
 
 	befor := models.XtAssessmentBeforeDislysis{}
-	err := XTReadDB().Raw("select MAX(diastolic_blood_pressure) as diastolic_blood_pressure from xt_assessment_before_dislysis where patient_id = ? and assessment_date>=? and assessment_date<=? and user_org_id = ?", patient_id, start_time, end_time, org_id).Scan(&befor).Error
+	err := XTReadDB().Raw("select MAX(diastolic_blood_pressure) as diastolic_blood_pressure from xt_assessment_before_dislysis where patient_id = ? and assessment_date>=? and assessment_date<=? and user_org_id = ? and diastolic_blood_pressure>0", patient_id, start_time, end_time, org_id).Scan(&befor).Error
 	return befor, err
 }
 
 func GetMinAssessmentBforDiastolicBloodPressure(patient_id int64, start_time int64, end_time int64, org_id int64) (models.XtAssessmentBeforeDislysis, error) {
 
 	befor := models.XtAssessmentBeforeDislysis{}
-	err := XTReadDB().Raw("select Min(diastolic_blood_pressure) as diastolic_blood_pressure from xt_assessment_before_dislysis where patient_id = ? and assessment_date>=? and assessment_date<=? and user_org_id = ?", patient_id, start_time, end_time, org_id).Scan(&befor).Error
+	err := XTReadDB().Raw("select Min(diastolic_blood_pressure) as diastolic_blood_pressure from xt_assessment_before_dislysis where patient_id = ? and assessment_date>=? and assessment_date<=? and user_org_id = ? and diastolic_blood_pressure>0", patient_id, start_time, end_time, org_id).Scan(&befor).Error
 	return befor, err
 }
 
 func GetMaxAssessmentAfterSystolicBloodPressure(patient_id int64, start_time int64, end_time int64, org_id int64) (models.XtAssessmentAfterDislysis, error) {
 
 	befor := models.XtAssessmentAfterDislysis{}
-	err := XTReadDB().Raw("select MAX(systolic_blood_pressure) as systolic_blood_pressure from xt_assessment_after_dislysis where patient_id = ? and assessment_date>=? and assessment_date<=? and user_org_id = ?", patient_id, start_time, end_time, org_id).Scan(&befor).Error
+	err := XTReadDB().Raw("select MAX(systolic_blood_pressure) as systolic_blood_pressure from xt_assessment_after_dislysis where patient_id = ? and assessment_date>=? and assessment_date<=? and user_org_id = ? and systolic_blood_pressure>0", patient_id, start_time, end_time, org_id).Scan(&befor).Error
 	return befor, err
 }
 
 func GetMinAssessmentAfterSystolicBloodPressure(patient_id int64, start_time int64, end_time int64, org_id int64) (models.XtAssessmentAfterDislysis, error) {
 
 	befor := models.XtAssessmentAfterDislysis{}
-	err := XTReadDB().Raw("select Min(systolic_blood_pressure) as systolic_blood_pressure from xt_assessment_after_dislysis where patient_id = ? and assessment_date>=? and assessment_date<=? and user_org_id = ?", patient_id, start_time, end_time, org_id).Scan(&befor).Error
+	err := XTReadDB().Raw("select Min(systolic_blood_pressure) as systolic_blood_pressure from xt_assessment_after_dislysis where patient_id = ? and assessment_date>=? and assessment_date<=? and user_org_id = ? and systolic_blood_pressure>0", patient_id, start_time, end_time, org_id).Scan(&befor).Error
 	return befor, err
 }
 
 func GetMaxAssessmentAfterDiastolicBloodPressureList(patient_id int64, start_time int64, end_time int64, org_id int64) (models.XtAssessmentAfterDislysis, error) {
 
 	befor := models.XtAssessmentAfterDislysis{}
-	err := XTReadDB().Raw("select Max(diastolic_blood_pressure) as diastolic_blood_pressure from xt_assessment_after_dislysis where patient_id = ? and assessment_date>=? and assessment_date<=? and user_org_id = ?", patient_id, start_time, end_time, org_id).Scan(&befor).Error
+	err := XTReadDB().Raw("select Max(diastolic_blood_pressure) as diastolic_blood_pressure from xt_assessment_after_dislysis where patient_id = ? and assessment_date>=? and assessment_date<=? and user_org_id = ? and diastolic_blood_pressure>0", patient_id, start_time, end_time, org_id).Scan(&befor).Error
 	return befor, err
 }
 
 func GetMinAssessmentAfterDiastolicBloodPressureList(patient_id int64, start_time int64, end_time int64, org_id int64) (models.XtAssessmentAfterDislysis, error) {
 
 	befor := models.XtAssessmentAfterDislysis{}
-	err := XTReadDB().Raw("select Min(diastolic_blood_pressure) as diastolic_blood_pressure from xt_assessment_after_dislysis where patient_id = ? and assessment_date>=? and assessment_date<=? and user_org_id = ?", patient_id, start_time, end_time, org_id).Scan(&befor).Error
+	err := XTReadDB().Raw("select Min(diastolic_blood_pressure) as diastolic_blood_pressure from xt_assessment_after_dislysis where patient_id = ? and assessment_date>=? and assessment_date<=? and user_org_id = ? and diastolic_blood_pressure>0", patient_id, start_time, end_time, org_id).Scan(&befor).Error
 	return befor, err
 }
 
 func GetMaxMonitorSystolicBloodPressure(patient_id int64, start_time int64, end_time int64, org_id int64) (models.XTMonitoringRecord, error) {
 
 	monitor := models.XTMonitoringRecord{}
-	err := XTReadDB().Raw("select Min(diastolic_blood_pressure) as diastolic_blood_pressure from xt_monitoring_record where patient_id = ? and monitoring_date>=? and monitoring_date<=? and user_org_id = ?", patient_id, start_time, end_time, org_id).Scan(&monitor).Error
+	err := XTReadDB().Raw("select Max(systolic_blood_pressure) as systolic_blood_pressure from xt_monitoring_record where patient_id = ? and monitoring_date>=? and monitoring_date<=? and user_org_id = ? and systolic_blood_pressure>0", patient_id, start_time, end_time, org_id).Scan(&monitor).Error
 	return monitor, err
 }
 
 func GetMinMonitorSystolicBloodPressure(patient_id int64, start_time int64, end_time int64, org_id int64) (models.XTMonitoringRecord, error) {
 
 	monitor := models.XTMonitoringRecord{}
-	err := XTReadDB().Raw("select Min(systolic_blood_pressure) as systolic_blood_pressure from xt_monitoring_record where patient_id = ? and monitoring_date>=? and monitoring_date<=? and user_org_id = ?", patient_id, start_time, end_time, org_id).Scan(&monitor).Error
+	err := XTReadDB().Raw("select Min(systolic_blood_pressure) as systolic_blood_pressure from xt_monitoring_record where patient_id = ? and monitoring_date>=? and monitoring_date<=? and user_org_id = ? and systolic_blood_pressure>0", patient_id, start_time, end_time, org_id).Scan(&monitor).Error
 	return monitor, err
 
 }
@@ -4852,14 +4852,14 @@ func GetMinMonitorSystolicBloodPressure(patient_id int64, start_time int64, end_
 func GetMaxMonitorDiastolicBloodPressure(patient_id int64, start_time int64, end_time int64, org_id int64) (models.XTMonitoringRecord, error) {
 
 	monitor := models.XTMonitoringRecord{}
-	err := XTReadDB().Raw("select Max(diastolic_blood_pressure) as diastolic_blood_pressure from xt_monitoring_record where patient_id = ? and monitoring_date>=? and monitoring_date<=? and user_org_id = ?", patient_id, start_time, end_time, org_id).Scan(&monitor).Error
+	err := XTReadDB().Raw("select Max(diastolic_blood_pressure) as diastolic_blood_pressure from xt_monitoring_record where patient_id = ? and monitoring_date>=? and monitoring_date<=? and user_org_id = ? and diastolic_blood_pressure>0", patient_id, start_time, end_time, org_id).Scan(&monitor).Error
 	return monitor, err
 }
 
 func GetMinMonitorDiastolicBloodPressure(patient_id int64, start_time int64, end_time int64, org_id int64) (models.XTMonitoringRecord, error) {
 
 	monitor := models.XTMonitoringRecord{}
-	err := XTReadDB().Raw("select Min(diastolic_blood_pressure) as diastolic_blood_pressure from xt_monitoring_record where patient_id = ? and monitoring_date>=? and monitoring_date<=? and user_org_id = ?", patient_id, start_time, end_time, org_id).Scan(&monitor).Error
+	err := XTReadDB().Raw("select Min(diastolic_blood_pressure) as diastolic_blood_pressure from xt_monitoring_record where patient_id = ? and monitoring_date>=? and monitoring_date<=? and user_org_id = ? and diastolic_blood_pressure>0", patient_id, start_time, end_time, org_id).Scan(&monitor).Error
 	return monitor, err
 }
 

service/self_drug_service.go

@@ -1271,7 +1271,7 @@ func GetInventoryModeList(orgid int64) (info []*models.PatientDrugWarehouseInfo,
 		if orgid > 0 {
 			db = db.Where("x.org_id = ?", orgid)
 		}
-		err = db.Select("x.drug_id,x.number,x.product_date,x.expiry_date,x.stock_max_number,x.stock_min_number,x.batch_number,t.drug_name,t.max_unit,t.min_unit,t.min_number,t.dose,t.dose_unit,x.manufacturer,x.dealer,t.sum_count").Joins("left join xt_base_drug as t on t.id = x.drug_id").Group("x.drug_id,x.batch_number").Scan(&info).Error
+		err = db.Select("x.drug_id,x.number,x.product_date,x.expiry_date,x.stock_max_number,x.stock_min_number,x.batch_number,t.drug_name,t.max_unit,t.min_unit,t.min_number,t.dose,t.dose_unit,x.manufacturer,x.dealer,t.sum_count,x.max_unit as max_unit_one,x.min_unit as min_unit_one").Joins("left join xt_base_drug as t on t.id = x.drug_id").Group("x.drug_id,x.batch_number").Scan(&info).Error
 		return info, err
 	} else {
 		db := XTReadDB().Table("xt_drug_warehouse_info as x").Where("x.status = 1 and (x.warehousing_count>0)")
@@ -1280,7 +1280,7 @@ func GetInventoryModeList(orgid int64) (info []*models.PatientDrugWarehouseInfo,
 		if orgid > 0 {
 			db = db.Where("x.org_id = ?", orgid)
 		}
-		err = db.Select("x.drug_id,x.number,x.product_date,x.expiry_date,x.stock_max_number,x.stock_min_number,x.batch_number,t.drug_name,t.max_unit,t.min_unit,t.min_number,t.dose,t.dose_unit,x.manufacturer,x.dealer,t.sum_count").Joins("left join xt_base_drug as t on t.id = x.drug_id").Group("x.drug_id,x.batch_number").Scan(&info).Error
+		err = db.Select("x.drug_id,x.number,x.product_date,x.expiry_date,x.stock_max_number,x.stock_min_number,x.batch_number,t.drug_name,t.max_unit,t.min_unit,t.min_number,t.dose,t.dose_unit,x.manufacturer,x.dealer,t.sum_count,x.max_unit as max_unit_one,x.min_unit as min_unit_one").Joins("left join xt_base_drug as t on t.id = x.drug_id").Group("x.drug_id,x.batch_number").Scan(&info).Error
 		return info, err
 	}
 
@@ -2933,6 +2933,15 @@ func GetEndLastFlowTwenty(goodid int64, orgid int64, endtime int64) (models.VmSt
 	return flwo, err
 }
 
+func GetGoodWarehosueInfo(id int64) (models.WarehousingInfo, error) {
+
+	info := models.WarehousingInfo{}
+
+	err := XTReadDB().Where("id = ? and status=1", id).Find(&info).Error
+
+	return info, err
+}
+
 func GetDrugNewPurchaseStockQuery(good_type int64, keyword string, page int64, limit int64, orgid int64, startime int64, endtime int64, ids []int64, infos []int64) (druginfo []*models.VmBaseDrugTwenty, total int64, err error) {
 
 	db := XTReadDB().Model(&druginfo).Where("status = 1 and is_self_drug!=1")
@@ -2952,9 +2961,38 @@ func GetDrugNewPurchaseStockQuery(good_type int64, keyword string, page int64, l
 	if len(keyword) > 0 {
 		db = db.Where("drug_name like ? or manufacturer in(?)", likeKey, ids)
 	}
-	//if len(infos) > 0 {
-	//	db = db.Where("id in(?)", infos)
+
+	err = db.Count(&total).Offset(offset).Limit(limit).Order("ctime desc").Find(&druginfo).Error
+
+	return druginfo, total, err
+}
+
+func GetDrugPurchaseQueryList(good_type int64, page int64, limit int64, drug_id int64, orgId int64, startTime int64, endTime int64) (druginfo []*models.VmBaseDrugThrity, total int64, err error) {
+
+	db := XTReadDB().Model(&druginfo).Where("status = 1 and is_self_drug!=1")
+	offset := (page - 1) * limit
+	if good_type > 0 {
+		db = db.Where("drug_type = ?", good_type)
+	}
+	if orgId == 10697 || orgId == 10644 {
+		db = db.Where("find_in_set('停用',drug_status) = 0")
+	}
+
+	if drug_id > 0 {
+		db = db.Where("id = ?", drug_id)
+	}
+
+	if orgId > 0 {
+		db = db.Where("org_id = ?", orgId)
+	}
+
+	//if startTime > 0 {
+	//	db = db.Where("ctime>=?", startTime)
 	//}
+	//if endTime > 0 {
+	//	db = db.Where("ctime<=?", endTime)
+	//}
+
 	err = db.Count(&total).Offset(offset).Limit(limit).Order("ctime desc").Find(&druginfo).Error
 
 	return druginfo, total, err
@@ -5432,3 +5470,206 @@ func GetSelfDrugWarhouseInfoByPatient(drug_id int64, patient_id int64, user_org_
 
 	return info, err
 }
+
+func GetDrugWarehouseInfoByStartTime(drug_id int64, org_id int64, ctime int64) (drugInfo []*models.TsDrugWarehouseInfo, err error) {
+
+	db := XTReadDB().Model(&drugInfo).Where("status=1 and is_check=1")
+
+	if drug_id > 0 {
+		db = db.Where("drug_id = ?", drug_id)
+	}
+
+	if org_id > 0 {
+		db = db.Where("org_id = ?", org_id)
+	}
+
+	if ctime > 0 {
+		db = db.Where("ctime < ?", ctime)
+	}
+	err = db.Find(&drugInfo).Error
+
+	return drugInfo, err
+}
+
+func GetBaseDrugById(id int64) (models.LyBaseDrug, error) {
+
+	baseDrug := models.LyBaseDrug{}
+	err := XTReadDB().Where("id = ?", id).Find(&baseDrug).Error
+	return baseDrug, err
+}
+
+func GetProfitDrugFlow(drug_id int64, user_org_id int64, ctime int64) (flow []*models.LyDrugFlow, err error) {
+
+	db := XTReadDB().Model(&flow).Where("status=1 and consumable_type = 10")
+
+	if drug_id > 0 {
+		db = db.Where("drug_id = ?", drug_id)
+	}
+	if user_org_id > 0 {
+		db = db.Where("user_org_id = ?", user_org_id)
+	}
+
+	if ctime > 0 {
+		db = db.Where("ctime<?", ctime)
+	}
+	err = db.Find(&flow).Error
+
+	return flow, err
+}
+
+func GetReduceDrugFlow(drug_id int64, user_org_id int64, ctime int64) (flow []*models.LyDrugFlow, err error) {
+
+	db := XTReadDB().Model(&flow).Where("status=1 and consumable_type = 11")
+
+	if drug_id > 0 {
+		db = db.Where("drug_id = ?", drug_id)
+	}
+	if user_org_id > 0 {
+		db = db.Where("user_org_id = ?", user_org_id)
+	}
+
+	if ctime > 0 {
+		db = db.Where("ctime<?", ctime)
+	}
+
+	err = db.Find(&flow).Error
+	return flow, err
+}
+
+func GetReturnDrugFlow(drug_id int64, user_org_id int64, ctime int64) (flow []*models.LyDrugFlow, err error) {
+
+	db := XTReadDB().Model(&flow).Where("status=1 and consumable_type = 7")
+	if drug_id > 0 {
+		db = db.Where("drug_id = ?", drug_id)
+	}
+	if user_org_id > 0 {
+		db = db.Where("user_org_id = ?", user_org_id)
+	}
+
+	if ctime > 0 {
+		db = db.Where("ctime<?", ctime)
+	}
+	err = db.Find(&flow).Error
+	return flow, err
+
+}
+
+func GetOutDrugFlow(drug_id int64, user_org_id int64, ctime int64) (flow []*models.LyDrugFlow, err error) {
+
+	db := XTReadDB().Model(&flow).Where("status=1 and consumable_type = 3")
+	if drug_id > 0 {
+		db = db.Where("drug_id = ?", drug_id)
+	}
+	if user_org_id > 0 {
+		db = db.Where("user_org_id = ?", user_org_id)
+	}
+
+	if ctime > 0 {
+		db = db.Where("ctime<?", ctime)
+	}
+	err = db.Find(&flow).Error
+	return flow, err
+
+}
+
+func GetInitAddDrugFlow(drug_id int64, org_id int64, start_time int64, end_time int64) (info []*models.TsDrugWarehouseInfo, err error) {
+
+	db := XTReadDB().Model(&info).Where("status=1 and is_check=1")
+	if drug_id > 0 {
+		db = db.Where("drug_id = ?", drug_id)
+	}
+	if org_id > 0 {
+		db = db.Where("org_id = ?", org_id)
+	}
+
+	if start_time > 0 {
+		db = db.Where("ctime>=?", start_time)
+	}
+
+	if end_time > 0 {
+		db = db.Where("ctime<=?", end_time)
+	}
+	err = db.Find(&info).Error
+	return info, err
+}
+
+func GetInitOutDrugFlow(drug_id int64, org_id int64, start_time int64, end_time int64) (flow []*models.LyDrugFlow, err error) {
+
+	db := XTReadDB().Model(&flow).Where("status=1 and consumable_type = 3")
+	if drug_id > 0 {
+		db = db.Where("drug_id = ?", drug_id)
+	}
+	if org_id > 0 {
+		db = db.Where("user_org_id = ?", org_id)
+	}
+
+	if start_time > 0 {
+		db = db.Where("ctime>=?", start_time)
+	}
+	if end_time > 0 {
+		db = db.Where("ctime<=?", end_time)
+	}
+	err = db.Find(&flow).Error
+
+	return flow, err
+}
+
+func GetInitReturnDrugFlow(drug_id int64, org_id int64, start_time int64, end_time int64) (flow []*models.LyDrugFlow, err error) {
+
+	db := XTReadDB().Model(&flow).Where("status=1 and consumable_type = 7")
+	if drug_id > 0 {
+		db = db.Where("drug_id = ?", drug_id)
+	}
+	if org_id > 0 {
+		db = db.Where("user_org_id = ?", org_id)
+	}
+
+	if start_time > 0 {
+		db = db.Where("ctime>=?", start_time)
+	}
+	if end_time > 0 {
+		db = db.Where("ctime<=?", end_time)
+	}
+	err = db.Find(&flow).Error
+	return flow, err
+}
+
+func GetInitProfitDrugFlow(drug_id int64, org_id int64, start_time int64, end_time int64) (flow []*models.LyDrugFlow, err error) {
+
+	db := XTReadDB().Model(&flow).Where("status=1 and consumable_type = 10")
+	if drug_id > 0 {
+		db = db.Where("drug_id = ?", drug_id)
+	}
+	if org_id > 0 {
+		db = db.Where("user_org_id = ?", org_id)
+	}
+
+	if start_time > 0 {
+		db = db.Where("ctime>=?", start_time)
+	}
+	if end_time > 0 {
+		db = db.Where("ctime<=?", end_time)
+	}
+	err = db.Find(&flow).Error
+	return flow, err
+}
+
+func GetInitReduceDrugFlow(drug_id int64, org_id int64, start_time int64, end_time int64) (flow []*models.LyDrugFlow, err error) {
+
+	db := XTReadDB().Model(&flow).Where("status=1 and consumable_type = 11")
+	if drug_id > 0 {
+		db = db.Where("drug_id = ?", drug_id)
+	}
+	if org_id > 0 {
+		db = db.Where("user_org_id = ?", org_id)
+	}
+
+	if start_time > 0 {
+		db = db.Where("ctime>=?", start_time)
+	}
+	if end_time > 0 {
+		db = db.Where("ctime<=?", end_time)
+	}
+	err = db.Find(&flow).Error
+	return flow, err
+}

service/stock_service.go

@@ -7472,7 +7472,7 @@ func GetInventoryExportList(orgid int64) (info []*models.PatientWarehouseInfo, e
 		if orgid > 0 {
 			db = db.Where("x.org_id = ?", orgid)
 		}
-		err = db.Select("x.id,x.good_id,x.number,x.number,x.product_date,x.expiry_date,x.warehousing_unit,x.dealer,x.manufacturer,t.good_name,t.specification_name,t.packing_unit,t.remark").Joins("left join xt_good_information as t on t.id = x.good_id").Group("x.good_id,x.number").Scan(&info).Error
+		err = db.Select("x.id,x.good_id,x.number,x.number,x.product_date,x.expiry_date,x.warehousing_unit,x.dealer,x.manufacturer,x.stock_count,t.good_name,t.specification_name,t.packing_unit,t.remark").Joins("left join xt_good_information as t on t.id = x.good_id").Group("x.good_id,x.number").Scan(&info).Error
 		return info, err
 	} else {
 		db := XTReadDB().Table("xt_warehouse_info as x").Where("x.status = 1 and x.warehousing_count>0")
@@ -7481,7 +7481,7 @@ func GetInventoryExportList(orgid int64) (info []*models.PatientWarehouseInfo, e
 		if orgid > 0 {
 			db = db.Where("x.org_id = ?", orgid)
 		}
-		err = db.Select("x.id,x.good_id,x.number,x.number,x.product_date,x.expiry_date,x.warehousing_unit,x.dealer,x.manufacturer,t.good_name,t.specification_name,t.packing_unit,t.remark").Joins("left join xt_good_information as t on t.id = x.good_id").Group("x.good_id,x.number").Scan(&info).Error
+		err = db.Select("x.id,x.good_id,x.number,x.number,x.product_date,x.expiry_date,x.warehousing_unit,x.dealer,x.manufacturer,x.stock_count,t.good_name,t.specification_name,t.packing_unit,t.remark").Joins("left join xt_good_information as t on t.id = x.good_id").Group("x.good_id,x.number").Scan(&info).Error
 		return info, err
 	}
 

service/warhouse_service.go

@@ -8139,9 +8139,7 @@ func ConsumableNewPrescriptionDelivery(orgID int64, patient_id int64, record_tim
 		lastOut, _ := FindNewWarehouseOutInfoByPatientIdTwo(patient_id, record_time, goods.GoodId, orgID, goods.ProjectId, tx)
 
 		//如果本次出库数据大于历史出库数据 新增1条流水
-		fmt.Println("本次出库数据", count)
-		fmt.Println("历史出库数据", out_count)
-		fmt.Println("退库数据", out_count_one)
+
 		if count > (out_count - out_count_one) {
 
 			stockFlow := models.VmStockFlow{
@@ -8690,7 +8688,6 @@ func ConsumableNewPrescriptionDelivery(orgID int64, patient_id int64, record_tim
 
 	}
 
-	goods.Count = deliver_number - stock_number
 	prepare := &models.DialysisBeforePrepare{
 		Count:        deliver_number - stock_number,
 		GoodTypeId:   goods.GoodTypeId,
@@ -8704,6 +8701,7 @@ func ConsumableNewPrescriptionDelivery(orgID int64, patient_id int64, record_tim
 		StorehouseId: goods.StorehouseId,
 		ProjectId:    goods.ProjectId,
 	}
+	prepare.Count = deliver_number - stock_number
 	ConsumableNewPrescriptionDelivery(orgID, patient_id, record_time, prepare, warehouseOut, creator, count, tx)
 
 	return nil
@@ -8964,7 +8962,7 @@ func ConsumableNewHisPrescriptionDelivery(orgID int64, patient_id int64, record_
 		ProjectId:    goods.ProjectId,
 	}
 	CreatedDialysisPrepare(autoMatic, tx)
-	goods.Count = deliver_number - stock_number
+	dialyPrepareOne.Count = deliver_number - stock_number
 	ConsumableNewHisPrescriptionDelivery(orgID, patient_id, record_time, dialyPrepareOne, warehouseOut, creator, tx)
 
 	return nil