28169 před 1 měsícem
rodič
revize
73489ddc20

binární
XT_New.exe Zobrazit soubor


+ 5 - 5
controllers/dialysis_api_controller.go Zobrazit soubor

@@ -3025,7 +3025,7 @@ func (c *DialysisApiController) PostAssessmentBeforeDislysis() {
3025 3025
 			service.CreateDialysisFinish(finish)
3026 3026
 		}
3027 3027
 
3028
-		if adminUserInfo.CurrentOrgId == 9671 || adminUserInfo.CurrentOrgId == 3877 || adminUserInfo.CurrentOrgId == 10469 || adminUserInfo.CurrentOrgId == 10551 || adminUserInfo.CurrentOrgId == 10579 || adminUserInfo.CurrentOrgId == 10580 || adminUserInfo.CurrentOrgId == 10585 || adminUserInfo.CurrentOrgId == 10344 || adminUserInfo.CurrentOrgId == 10622 || adminUserInfo.CurrentOrgId == 10702 || adminUserInfo.CurrentOrgId == 10635 || adminUserInfo.CurrentOrgId == 10723 || adminUserInfo.CurrentOrgId == 10164 || adminUserInfo.CurrentOrgId == 10727 || adminUserInfo.CurrentOrgId == 10726 || adminUserInfo.CurrentOrgId == 10164 || adminUserInfo.CurrentOrgId == 10727 || adminUserInfo.CurrentOrgId == 10751 || adminUserInfo.CurrentOrgId == 10752 || adminUserInfo.CurrentOrgId == 10480 || adminUserInfo.CurrentOrgId == 10293 || adminUserInfo.CurrentOrgId == 9478 || adminUserInfo.CurrentOrgId == 10766 {
3028
+		if adminUserInfo.CurrentOrgId == 9671 || adminUserInfo.CurrentOrgId == 3877 || adminUserInfo.CurrentOrgId == 10469 || adminUserInfo.CurrentOrgId == 10551 || adminUserInfo.CurrentOrgId == 10579 || adminUserInfo.CurrentOrgId == 10580 || adminUserInfo.CurrentOrgId == 10585 || adminUserInfo.CurrentOrgId == 10344 || adminUserInfo.CurrentOrgId == 10622 || adminUserInfo.CurrentOrgId == 10702 || adminUserInfo.CurrentOrgId == 10635 || adminUserInfo.CurrentOrgId == 10723 || adminUserInfo.CurrentOrgId == 10164 || adminUserInfo.CurrentOrgId == 10727 || adminUserInfo.CurrentOrgId == 10726 || adminUserInfo.CurrentOrgId == 10164 || adminUserInfo.CurrentOrgId == 10727 || adminUserInfo.CurrentOrgId == 10751 || adminUserInfo.CurrentOrgId == 10752 || adminUserInfo.CurrentOrgId == 10480 || adminUserInfo.CurrentOrgId == 10293 || adminUserInfo.CurrentOrgId == 9478 || adminUserInfo.CurrentOrgId == 10766 || adminUserInfo.CurrentOrgId == 10768 {
3029 3029
 			var dewater_amount float64
3030 3030
 			dewater_amount = 0
3031 3031
 			if dry_weight > 0 {
@@ -3679,7 +3679,7 @@ func (c *DialysisApiController) PostAssessmentBeforeDislysis() {
3679 3679
 		}
3680 3680
 
3681 3681
 		//针对孝昌康桥超滤率计算问题
3682
-		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 || adminUserInfo.CurrentOrgId == 9478 || adminUserInfo.CurrentOrgId == 10766 {
3682
+		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 || adminUserInfo.CurrentOrgId == 9478 || adminUserInfo.CurrentOrgId == 10766 || adminUserInfo.CurrentOrgId == 10768 {
3683 3683
 			if assessmentBeforeDislysis.ID == 0 {
3684 3684
 				dialysisPrescribeOne, _ := service.MobileGetDialysisPrescribeOne(adminUserInfo.CurrentOrgId, patient, recordDate.Unix())
3685 3685
 				if dialysisPrescribeOne.ID > 0 && assessmentBeforeDislysis.ID > 0 {
@@ -3696,9 +3696,9 @@ func (c *DialysisApiController) PostAssessmentBeforeDislysis() {
3696 3696
 					dialysisPrescribeOne, _ := service.MobileGetDialysisPrescribeOne(adminUserInfo.CurrentOrgId, patient, recordDate.Unix())
3697 3697
 					if dialysisPrescribeOne.ID > 0 && assessmentBeforeDislysis.ID > 0 {
3698 3698
 						dewater_amount = assessmentBeforeDislysis.WeightBefore - assessmentBeforeDislysis.DryWeight - assessmentBeforeDislysis.AdditionalWeight
3699
-						//if adminUserInfo.CurrentOrgId == 10751 {
3700
-						//	dewater_amount = dewater_amount * 1000
3701
-						//}
3699
+						if adminUserInfo.CurrentOrgId == 10768 {
3700
+							dewater_amount = dewater_amount * 1000
3701
+						}
3702 3702
 						service.UpdateMobileGetDialysisPrescribeOne(dialysisPrescribeOne.ID, dewater_amount)
3703 3703
 					}
3704 3704
 				}

+ 1 - 1
controllers/his_api_controller.go Zobrazit soubor

@@ -3536,7 +3536,7 @@ func (c *HisApiController) CreateHisPrescription() {
3536 3536
 	var adviceList []models.HisDoctorAdviceInfo
3537 3537
 	var projectList []models.HisPrescriptionProject
3538 3538
 
3539
-	if adminInfo.CurrentOrgId == 10489 || adminInfo.CurrentOrgId == 10510 || adminInfo.CurrentOrgId == 10164 || adminInfo.CurrentOrgId == 10478 || adminInfo.CurrentOrgId == 10318 || adminInfo.CurrentOrgId == 10480 || adminInfo.CurrentOrgId == 10633 || adminInfo.CurrentOrgId == 10610 || adminInfo.CurrentOrgId == 10402 || adminInfo.CurrentOrgId == 10138 || adminInfo.CurrentOrgId == 10278 || adminInfo.CurrentOrgId == 10537 || adminInfo.CurrentOrgId == 10265 || adminInfo.CurrentOrgId == 10644 || adminInfo.CurrentOrgId == 10635 || adminInfo.CurrentOrgId == 10598 || adminInfo.CurrentOrgId == 10028 || adminInfo.CurrentOrgId == 10721 || adminInfo.CurrentOrgId == 10726 || adminInfo.CurrentOrgId == 10731 || adminInfo.CurrentOrgId == 10571 || adminInfo.CurrentOrgId == 10724 || adminInfo.CurrentOrgId == 9671 || adminInfo.CurrentOrgId == 10731 || adminInfo.CurrentOrgId == 10653 || adminInfo.CurrentOrgId == 10567 || adminInfo.CurrentOrgId == 10751 || adminInfo.CurrentOrgId == 10752 || adminInfo.CurrentOrgId == 9478 || adminInfo.CurrentOrgId == 10567 {
3539
+	if adminInfo.CurrentOrgId == 10489 || adminInfo.CurrentOrgId == 10510 || adminInfo.CurrentOrgId == 10164 || adminInfo.CurrentOrgId == 10478 || adminInfo.CurrentOrgId == 10318 || adminInfo.CurrentOrgId == 10480 || adminInfo.CurrentOrgId == 10633 || adminInfo.CurrentOrgId == 10610 || adminInfo.CurrentOrgId == 10402 || adminInfo.CurrentOrgId == 10138 || adminInfo.CurrentOrgId == 10278 || adminInfo.CurrentOrgId == 10537 || adminInfo.CurrentOrgId == 10265 || adminInfo.CurrentOrgId == 10644 || adminInfo.CurrentOrgId == 10635 || adminInfo.CurrentOrgId == 10598 || adminInfo.CurrentOrgId == 10028 || adminInfo.CurrentOrgId == 10721 || adminInfo.CurrentOrgId == 10726 || adminInfo.CurrentOrgId == 10731 || adminInfo.CurrentOrgId == 10571 || adminInfo.CurrentOrgId == 10724 || adminInfo.CurrentOrgId == 9671 || adminInfo.CurrentOrgId == 10731 || adminInfo.CurrentOrgId == 10653 || adminInfo.CurrentOrgId == 10567 || adminInfo.CurrentOrgId == 10751 || adminInfo.CurrentOrgId == 10752 || adminInfo.CurrentOrgId == 9478 || adminInfo.CurrentOrgId == 10567 || adminInfo.CurrentOrgId == 10768 {
3540 3540
 		if dataBody["prescriptions"] != nil && reflect.TypeOf(dataBody["prescriptions"]).String() == "[]interface {}" {
3541 3541
 			prescriptions, _ := dataBody["prescriptions"].([]interface{})
3542 3542
 

+ 19 - 2
controllers/mobile_api_controllers/dialysis_api_controller.go Zobrazit soubor

@@ -4306,6 +4306,11 @@ func (this *DialysisAPIController) StartDialysis() {
4306 4306
 				ultrafiltration_rate = ultrafiltration_rate / 1000
4307 4307
 			}
4308 4308
 
4309
+			if adminUserInfo.Org.Id == 10768 {
4310
+				ultrafiltration_rate = math.Floor(prescription.PrescriptionWater / float64(totalMin) * 60 * 1000)
4311
+				ultrafiltration_rate = ultrafiltration_rate / 1000
4312
+			}
4313
+
4309 4314
 			if adminUserInfo.Org.Id == 10667 {
4310 4315
 				ultrafiltration_rate = math.Floor(prescription.TargetUltrafiltration / float64(totalMin) * 60 * 1000)
4311 4316
 				ultrafiltration_rate = ultrafiltration_rate / 1000
@@ -4383,7 +4388,7 @@ func (this *DialysisAPIController) StartDialysis() {
4383 4388
 				}
4384 4389
 			}
4385 4390
 
4386
-			if adminUserInfo.Org.Id == 10766 {
4391
+			if adminUserInfo.Org.Id == 10766 || adminUserInfo.Org.Id == 10768 {
4387 4392
 				if prescription.ModeId == 2 || prescription.ModeId == 13 {
4388 4393
 					totalMin := prescription.DialysisDurationHour*60 + prescription.DialysisDurationMinute
4389 4394
 					if totalMin == 0 {
@@ -5652,6 +5657,11 @@ func (this *DialysisAPIController) GetLastMonitorRecordTody() {
5652 5657
 				record.UltrafiltrationRate = ultrafiltration_rate
5653 5658
 			}
5654 5659
 
5660
+			if adminInfo.Org.Id == 10768 {
5661
+				ultrafiltration_rate = math.Floor(prescription.PrescriptionWater / float64(totalMin) * 60)
5662
+				record.UltrafiltrationRate = ultrafiltration_rate
5663
+			}
5664
+
5655 5665
 			if adminInfo.Org.Id == 10510 {
5656 5666
 				record.UltrafiltrationRate = 0
5657 5667
 			}
@@ -5919,6 +5929,13 @@ func (this *DialysisAPIController) GetLastMonitorRecordTody() {
5919 5929
 		}
5920 5930
 	}
5921 5931
 
5932
+	if adminInfo.Org.Id == 10768 {
5933
+		if ultrafiltration_rate > 0 {
5934
+			ultrafiltration_volume := math.Floor(float64(record.OperateTime+3600-fristrecord.OperateTime) / 3600 * ultrafiltration_rate)
5935
+			record.UltrafiltrationVolume = ultrafiltration_volume
5936
+		}
5937
+	}
5938
+
5922 5939
 	if adminInfo.Org.Id == 10721 || adminInfo.Org.Id == 10757 || adminInfo.Org.Id == 10290 {
5923 5940
 		var replacement_rate float64
5924 5941
 		var displacement_quantity float64
@@ -5931,7 +5948,7 @@ func (this *DialysisAPIController) GetLastMonitorRecordTody() {
5931 5948
 
5932 5949
 	}
5933 5950
 
5934
-	if adminInfo.Org.Id == 10766 || adminInfo.Org.Id == 10164 {
5951
+	if adminInfo.Org.Id == 10766 || adminInfo.Org.Id == 10164 || adminInfo.Org.Id == 10768 {
5935 5952
 		var replacement_rate float64
5936 5953
 		var displacement_quantity float64
5937 5954
 		totalMin := prescription.DialysisDurationHour*60 + prescription.DialysisDurationMinute

+ 7 - 4
controllers/mobile_api_controllers/patient_api_controller.go Zobrazit soubor

@@ -3878,7 +3878,7 @@ func (c *PatientApiController) EditAssessmentBeforeDislysis() {
3878 3878
 	if evaluation.DryWeight > 0 {
3879 3879
 		dewater_amount = evaluation.WeightBefore - evaluation.DryWeight - evaluation.AdditionalWeight
3880 3880
 
3881
-		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 || adminUserInfo.Org.Id == 9478 || adminUserInfo.Org.Id == 10766 {
3881
+		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 || adminUserInfo.Org.Id == 9478 || adminUserInfo.Org.Id == 10766 || adminUserInfo.Org.Id == 10768 {
3882 3882
 
3883 3883
 			if adminUserInfo.Org.Id != 10551 && adminUserInfo.Org.Id != 10579 && adminUserInfo.Org.Id != 10580 && adminUserInfo.Org.Id != 10585 && adminUserInfo.Org.Id != 10752 && adminUserInfo.Org.Id != 9478 && adminUserInfo.Org.Id != 10766 {
3884 3884
 				dewater_amount = dewater_amount * 1000
@@ -4613,12 +4613,12 @@ func (c *PatientApiController) EditAssessmentBeforeDislysis() {
4613 4613
 	}
4614 4614
 
4615 4615
 	//针对孝昌康桥超滤率计算问题
4616
-	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 || adminUserInfo.Org.Id == 9478 || adminUserInfo.Org.Id == 10766 {
4616
+	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 || adminUserInfo.Org.Id == 9478 || adminUserInfo.Org.Id == 10766 || adminUserInfo.Org.Id == 10768 {
4617 4617
 		if evaluation.ID == 0 {
4618 4618
 			dialysisPrescribeOne, _ := service.MobileGetDialysisPrescribeOne(adminUserInfo.Org.Id, id, theAssessmentDateTime)
4619 4619
 			if dialysisPrescribeOne.ID > 0 && evaluation.ID > 0 {
4620 4620
 				dewater_amount = evaluation.WeightBefore - evaluation.DryWeight - evaluation.AdditionalWeight
4621
-				if adminUserInfo.Org.Id == 10751 {
4621
+				if adminUserInfo.Org.Id == 10751 || adminUserInfo.Org.Id == 10768 {
4622 4622
 					dewater_amount = dewater_amount * 1000
4623 4623
 				}
4624 4624
 				service.UpdateMobileGetDialysisPrescribe(dialysisPrescribeOne.ID, dewater_amount)
@@ -4714,13 +4714,16 @@ func (c *PatientApiController) EditAssessmentBeforeDislysis() {
4714 4714
 		}
4715 4715
 	}
4716 4716
 
4717
-	if adminUserInfo.Org.Id == 10597 || adminUserInfo.Org.Id == 10742 {
4717
+	if adminUserInfo.Org.Id == 10597 || adminUserInfo.Org.Id == 10742 || adminUserInfo.Org.Id == 10768 {
4718 4718
 
4719 4719
 		if evaluation.ID > 0 {
4720 4720
 
4721 4721
 			dialysisPrescribeOne, _ := service.MobileGetDialysisPrescribeOne(adminUserInfo.Org.Id, id, theAssessmentDateTime)
4722 4722
 			if dialysisPrescribeOne.ID > 0 && evaluation.ID > 0 {
4723 4723
 				dewater_amount = evaluation.WeightBefore - evaluation.DryWeight - evaluation.AdditionalWeight
4724
+				if adminUserInfo.Org.Id == 10768 {
4725
+					dewater_amount = dewater_amount * 1000
4726
+				}
4724 4727
 				service.UpdateMobileGetDialysisPrescribeOne(dialysisPrescribeOne.ID, dewater_amount)
4725 4728
 			}
4726 4729
 			keyThree := strconv.FormatInt(adminUserInfo.Org.Id, 10) + ":" + strconv.FormatInt(id, 10) + ":" + strconv.FormatInt(mode_id, 10) + ":dialysis_prescribe_by_mode"

+ 1 - 1
service/schedule_service.go Zobrazit soubor

@@ -244,7 +244,7 @@ func GetDialysisPrescriptionByRecord(orgID int64, patient_id int64, record_date
244 244
 	return prescription, err
245 245
 }
246 246
 
247
-func GetDialysisPrescriptionDoctorAdviceList(orgID int64, patient_id int64, record_date int64) (advices []*models.DoctorAdvices, err error) {
247
+func GetDialysisPrescriptionDoctorAdviceList(orgID int64, patient_id int64, record_date int64) (advices []*models.XtDoctorAdvice, err error) {
248 248
 
249 249
 	err = readDb.Where("user_org_id = ? and patient_id = ? and advice_date = ? and status=1", orgID, patient_id, record_date).Find(&advices).Error
250 250