Browse Source

修改模版22超滤量和超滤率自动计算方式

csx 4 years ago
parent
commit
191062d643

+ 2 - 2
controllers/dialysis_api_controller.go View File

@@ -4858,12 +4858,12 @@ func (this *DialysisApiController) GetTodayMonitor() {
4858 4858
 		if prescription.TargetUltrafiltration > 0 && prescription.DialysisDurationHour > 0 {
4859 4859
 
4860 4860
 			totalMin := prescription.DialysisDurationHour*60 + prescription.DialysisDurationMinute
4861
-			if template.TemplateId == 6 || template.TemplateId == 22 { //adminInfo.CurrentOrgId == 9538
4861
+			if template.TemplateId == 6 { //adminInfo.CurrentOrgId == 9538
4862 4862
 				ultrafiltration_rate = math.Floor(prescription.TargetUltrafiltration / float64(totalMin) * 60 * 1000)
4863 4863
 				record.UltrafiltrationRate = ultrafiltration_rate
4864 4864
 			}
4865 4865
 
4866
-			if template.TemplateId == 20 { //adminInfo.CurrentOrgId == 9538
4866
+			if template.TemplateId == 20 || template.TemplateId == 22 { //adminInfo.CurrentOrgId == 9538
4867 4867
 				ultrafiltration_rate = math.Floor(prescription.TargetUltrafiltration / float64(totalMin) * 60)
4868 4868
 				record.UltrafiltrationRate = ultrafiltration_rate
4869 4869
 			}

+ 4 - 4
controllers/mobile_api_controllers/dialysis_api_controller.go View File

@@ -2747,11 +2747,11 @@ func (this *DialysisAPIController) StartDialysis() {
2747 2747
 		if prescription.TargetUltrafiltration > 0 && prescription.DialysisDurationHour > 0 {
2748 2748
 
2749 2749
 			totalMin := prescription.DialysisDurationHour*60 + prescription.DialysisDurationMinute
2750
-			if template.TemplateId == 6 || template.TemplateId == 22 { //adminUserInfo.Org.Id == 9538
2750
+			if template.TemplateId == 6 { //adminUserInfo.Org.Id == 9538
2751 2751
 				ultrafiltration_rate = math.Floor(prescription.TargetUltrafiltration / float64(totalMin) * 60 * 1000)
2752 2752
 			}
2753 2753
 
2754
-			if template.TemplateId == 20 { //adminUserInfo.Org.Id == 9538
2754
+			if template.TemplateId == 20 || template.TemplateId == 22 { //adminUserInfo.Org.Id == 9538
2755 2755
 				ultrafiltration_rate = math.Floor(prescription.TargetUltrafiltration / float64(totalMin) * 60)
2756 2756
 			}
2757 2757
 
@@ -5604,13 +5604,13 @@ func (this *DialysisAPIController) GetLastMonitorRecordTody() {
5604 5604
 			fmt.Println("4444444445555")
5605 5605
 
5606 5606
 			totalMin := prescription.DialysisDurationHour*60 + prescription.DialysisDurationMinute
5607
-			if template.TemplateId == 6 || template.TemplateId == 22 {
5607
+			if template.TemplateId == 6 {
5608 5608
 				fmt.Println("12222222")
5609 5609
 				ultrafiltration_rate = math.Floor(prescription.TargetUltrafiltration / float64(totalMin) * 60 * 1000)
5610 5610
 				record.UltrafiltrationRate = ultrafiltration_rate
5611 5611
 			}
5612 5612
 
5613
-			if template.TemplateId == 20 {
5613
+			if template.TemplateId == 20 || template.TemplateId == 22 {
5614 5614
 				ultrafiltration_rate = math.Floor(prescription.TargetUltrafiltration / float64(totalMin) * 60)
5615 5615
 				record.UltrafiltrationRate = ultrafiltration_rate
5616 5616
 			}