新功能

controllers/dialysis_api_controller.go

@@ -4857,10 +4857,16 @@ func (this *DialysisApiController) GetTodayMonitor() {
 		if prescription.TargetUltrafiltration > 0 && prescription.DialysisDurationHour > 0 {
 
 			totalMin := prescription.DialysisDurationHour*60 + prescription.DialysisDurationMinute
-			if template.TemplateId == 6 || template.TemplateId == 20 { //adminInfo.CurrentOrgId == 9538
+			if template.TemplateId == 6 { //adminInfo.CurrentOrgId == 9538
 				ultrafiltration_rate = math.Floor(prescription.TargetUltrafiltration / float64(totalMin) * 60 * 1000)
 				record.UltrafiltrationRate = ultrafiltration_rate
 			}
+
+			if template.TemplateId == 20 { //adminInfo.CurrentOrgId == 9538
+				ultrafiltration_rate = math.Floor(prescription.TargetUltrafiltration / float64(totalMin) * 60)
+				record.UltrafiltrationRate = ultrafiltration_rate
+			}
+
 			// 只针对方济医院
 			if template.TemplateId == 1 {
 				value, _ := strconv.ParseFloat(fmt.Sprintf("%.3f", prescription.TargetUltrafiltration/float64(totalMin)*60), 6)

controllers/mobile_api_controllers/dialysis_api_controller.go

@@ -5589,6 +5589,7 @@ func (this *DialysisAPIController) GetLastMonitorRecordTody() {
 	fristrecord, _ := service.FindFirstMonitorRecordToday(patientID, adminInfo.Org.Id, monitorDate)
 
 	template, _ := service.GetOrgInfoTemplate(adminInfo.Org.Id)
+	fmt.Println("1122233333")
 
 	var ultrafiltration_rate float64
 	_, prescription := service.FindDialysisPrescriptionByReordDate(patientID, theAssessmentDateTime, adminInfo.Org.Id)
@@ -5596,10 +5597,16 @@ func (this *DialysisAPIController) GetLastMonitorRecordTody() {
 		if prescription.TargetUltrafiltration > 0 && prescription.DialysisDurationHour > 0 {
 
 			totalMin := prescription.DialysisDurationHour*60 + prescription.DialysisDurationMinute
-			if template.TemplateId == 6 || template.TemplateId == 20 {
+			if template.TemplateId == 6 {
 				ultrafiltration_rate = math.Floor(prescription.TargetUltrafiltration / float64(totalMin) * 60 * 1000)
 				record.UltrafiltrationRate = ultrafiltration_rate
 			}
+
+			if template.TemplateId == 20 {
+				ultrafiltration_rate = math.Floor(prescription.TargetUltrafiltration / float64(totalMin) * 60)
+				record.UltrafiltrationRate = ultrafiltration_rate
+			}
+
 			// 只针对方济医院
 			if template.TemplateId == 1 {
 				value, _ := strconv.ParseFloat(fmt.Sprintf("%.3f", prescription.TargetUltrafiltration/float64(totalMin)*60), 6)
@@ -5619,6 +5626,7 @@ func (this *DialysisAPIController) GetLastMonitorRecordTody() {
 
 	if template.TemplateId == 6 || template.TemplateId == 20 { //adminInfo.Org.Id == 9538
 		if ultrafiltration_rate > 0 && adminInfo.Org.Id != 9538 {
+			fmt.Println("11222344444444443333")
 			ultrafiltration_volume := math.Floor(float64(record.OperateTime+3600-fristrecord.OperateTime) / 3600 * ultrafiltration_rate)
 			record.UltrafiltrationVolume = ultrafiltration_volume
 		}