11月8日库存管理

conf/app.conf

@@ -1,6 +1,6 @@
 appname = 血透
-httpport = 9529
-runmode = dev
+httpport = 9531
+runmode = prod
 
 #
 copyrequestbody = true

controllers/mobile_api_controllers/dialysis_api_controller.go

@@ -2866,14 +2866,16 @@ func (this *DialysisAPIController) GetLastMonitorRecordTody() {
 				ultrafiltration_rate = value
 				record.UltrafiltrationRate = ultrafiltration_rate
 			}
-
+			fmt.Println("hhh23232323223232323323232323", template.TemplateId)
 			if template.TemplateId == 41 || template.TemplateId == 47 {
 				ultrafiltration_rate = math.Floor(prescription.TargetUltrafiltration * 60 / float64(totalMin) * 1000)
+				fmt.Println("prescritpin2332322323232323223", ultrafiltration_rate)
 				record.UltrafiltrationRate = ultrafiltration_rate
 			}
 
 			if template.TemplateId == 43 {
 				ultrafiltration_rate = math.Floor(prescription.TargetUltrafiltration * 60 / float64(totalMin))
+
 				record.UltrafiltrationRate = ultrafiltration_rate
 			}
 			if template.TemplateId == 46 {
@@ -2881,10 +2883,10 @@ func (this *DialysisAPIController) GetLastMonitorRecordTody() {
 				record.UltrafiltrationRate = ultrafiltration_rate
 			}
 
-			if template.TemplateId == 47 {
-				ultrafiltration_rate = math.Floor(prescription.TargetUltrafiltration * 60 / float64(totalMin))
-				record.UltrafiltrationRate = ultrafiltration_rate
-			}
+			//if template.TemplateId == 47 {
+			//	ultrafiltration_rate = math.Floor(prescription.TargetUltrafiltration * 60 / float64(totalMin))
+			//	record.UltrafiltrationRate = ultrafiltration_rate
+			//}
 		}
 	}
 	// record.UltrafiltrationRate = ultrafiltration_rate
@@ -4329,9 +4331,6 @@ func (c *DialysisAPIController) CreateStockOutInfo() {
 						StorehouseId: houseConfig.StorehouseOutInfo,
 					}
 
-					//清空准备表数据
-					err = service.DeleteDialysisBefor(adminInfo.Org.Id, patient_id, record_time, item.GoodId, item.GoodTypeId)
-					service.CreateDialysisBeforePrepareOne(&prepare)
 					//清空准备表数据
 					service.DeleteDialysisBefor(adminInfo.Org.Id, patient_id, record_time, item.GoodId, item.GoodTypeId)
 					service.CreateDialysisBeforePrepareOne(&prepare)

service/dialysis_service.go

@@ -702,13 +702,13 @@ func GetDialysisWatch(orgID int64, schedulDate int64, schedulType int64, partiti
 		Preload("DeviceNumber", "status = 1 AND org_id = ?", orgID).
 		// Preload("DeviceZone", "status = 1 AND org_id = ?", orgID).
 		Preload("TreatmentMode", "status = 1").
-		Preload("Prescription", "status = 1 AND user_org_id = ?", orgID).
-		Preload("AssessmentBeforeDislysis", "status = 1 AND  user_org_id = ?", orgID).
-		Preload("AssessmentAfterDislysis", "status = 1 AND  user_org_id = ?", orgID).
+		Preload("Prescription", "status = 1 AND user_org_id = ? and record_date>=? and record_date <=?", orgID, start, end).
+		Preload("AssessmentBeforeDislysis", "status = 1 AND  user_org_id = ? and assessment_date >=? and assessment_date <=?", orgID, start, end).
+		Preload("AssessmentAfterDislysis", "status = 1 AND  user_org_id = ? and assessment_date >=? and assessment_date <=?", orgID, start, end).
 		Preload("MonitoringRecord", func(db *gorm.DB) *gorm.DB {
-			return db.Where("status = 1 AND user_org_id = ? ", orgID).Order("operate_time asc")
+			return db.Where("status = 1 AND user_org_id = ? and monitoring_date >=? and monitoring_date<=? ", orgID, start, end).Order("operate_time asc")
 		}).
-		Preload("DialysisOrder", "status = 1 AND user_org_id = ?", orgID).
+		Preload("DialysisOrder", "status = 1 AND user_org_id = ? and dialysis_date>=? and dialysis_date<=?", orgID, start, end).
 		Preload("MonitorPatients", "status = 1 AND user_org_id = ?", orgID)
 	db = db.Where("xt_schedule.status = 1 AND user_org_id = ?", orgID)
 	if schedulDate > 0 {
@@ -763,11 +763,11 @@ func GetDialysisWatchByKeyword(orgID int64, keyword string, schedulType int64, p
 		Preload("DeviceNumber", "org_id = ?", orgID).
 		// Preload("DeviceZone", "status = 1 AND org_id = ?", orgID).
 		Preload("TreatmentMode", "status = 1").
-		Preload("Prescription", "status = 1 AND user_org_id = ?", orgID).
-		Preload("AssessmentBeforeDislysis", "status = 1 AND  user_org_id = ?", orgID).
-		Preload("AssessmentAfterDislysis", "status = 1 AND  user_org_id = ?", orgID).
-		Preload("MonitoringRecord", "status = 1 AND  user_org_id = ?", orgID).
-		Preload("DialysisOrder", "status = 1 AND user_org_id = ?", orgID).
+		Preload("Prescription", "status = 1 AND user_org_id = ? and record_date>=? and record_date<=?", orgID, start, end).
+		Preload("AssessmentBeforeDislysis", "status = 1 AND  user_org_id = ? and assessment_date>=? and assessment_date<=?", orgID, start, end).
+		Preload("AssessmentAfterDislysis", "status = 1 AND  user_org_id = ? and assessment_date>=? and assessment_date<=?", orgID, start, end).
+		Preload("MonitoringRecord", "status = 1 AND  user_org_id = ? and monitoring_date>=? and monitoring_date<=?", orgID, start, end).
+		Preload("DialysisOrder", "status = 1 AND user_org_id = ? and dialysis_date >= ? and dialysis_date<=?", orgID, start, end).
 		Preload("MonitorPatients", "status = 1 AND user_org_id = ?", orgID)
 	db = db.Where("xt_schedule.status = 1 AND patient_id in (?)", patientIDs)
 	if schedulType > 0 {