|
@@ -1546,6 +1546,12 @@ func (c *DialysisAPIController) PostAssessmentAfterDislysis() {
|
1546
|
1546
|
|
1547
|
1547
|
}
|
1548
|
1548
|
|
|
1549
|
+ recordDialysis, _ := service.GetSigleAssessmentAfterDislysisRecord(assessmentAfterDislysis.PatientId, assessmentAfter.AssessmentDate, assessmentAfter.UserOrgId)
|
|
1550
|
+
|
|
1551
|
+ if assessmentAfterDislysis.WeightAfter == 0 {
|
|
1552
|
+ assessmentAfterDislysis.WeightAfter = recordDialysis.WeightAfter
|
|
1553
|
+ }
|
|
1554
|
+
|
1549
|
1555
|
err := service.AddSigleAssessmentAfterDislysisRecord(&assessmentAfterDislysis)
|
1550
|
1556
|
|
1551
|
1557
|
//记录日志
|
|
@@ -1631,7 +1637,11 @@ func (c *DialysisAPIController) PostAssessmentAfterDislysis() {
|
1631
|
1637
|
|
1632
|
1638
|
assessmentAfterDislysis.CreatedTime = assessmentAfter.CreatedTime
|
1633
|
1639
|
assessmentAfterDislysis.ID = assessmentAfter.ID
|
|
1640
|
+ recordDialysis, _ := service.GetSigleAssessmentAfterDislysisRecord(assessmentAfterDislysis.PatientId, assessmentAfter.AssessmentDate, assessmentAfter.UserOrgId)
|
1634
|
1641
|
|
|
1642
|
+ if assessmentAfterDislysis.WeightAfter == 0 {
|
|
1643
|
+ assessmentAfterDislysis.WeightAfter = recordDialysis.WeightAfter
|
|
1644
|
+ }
|
1635
|
1645
|
err := service.UpdateAssessmentAfterDislysisRecord(&assessmentAfterDislysis)
|
1636
|
1646
|
|
1637
|
1647
|
//记录日志
|
|
@@ -2731,6 +2741,11 @@ func (c *DialysisAPIController) Finish() {
|
2731
|
2741
|
tempassessmentAfterDislysis.BreathingRate = endmonitorRecords.BreathingRate
|
2732
|
2742
|
}
|
2733
|
2743
|
|
|
2744
|
+ if endmonitorRecords.ID > 0 && adminUserInfo.Org.Id == 10598 {
|
|
2745
|
+ tempassessmentAfterDislysis.SystolicBloodPressure = 0
|
|
2746
|
+ tempassessmentAfterDislysis.DiastolicBloodPressure = 0
|
|
2747
|
+ }
|
|
2748
|
+
|
2734
|
2749
|
if lastAssessmentAfterDislysis != nil {
|
2735
|
2750
|
tempassessmentAfterDislysis.BloodPressureType = lastAssessmentAfterDislysis.BloodPressureType
|
2736
|
2751
|
|
|
@@ -2798,6 +2813,11 @@ func (c *DialysisAPIController) Finish() {
|
2798
|
2813
|
tempassessmentAfterDislysis.DiastolicBloodPressure = endmonitorRecords.DiastolicBloodPressure
|
2799
|
2814
|
}
|
2800
|
2815
|
|
|
2816
|
+ if endmonitorRecords.ID > 0 && adminUserInfo.Org.Id == 10598 {
|
|
2817
|
+ tempassessmentAfterDislysis.SystolicBloodPressure = 0
|
|
2818
|
+ tempassessmentAfterDislysis.DiastolicBloodPressure = 0
|
|
2819
|
+ }
|
|
2820
|
+
|
2801
|
2821
|
}
|
2802
|
2822
|
|
2803
|
2823
|
finish := models.XtDialysisFinish{
|
|
@@ -2952,8 +2972,6 @@ func (c *DialysisAPIController) Finish() {
|
2952
|
2972
|
dialysisOrder.FinishModifier = adminUserInfo.AdminUser.Id
|
2953
|
2973
|
dialysisOrder.EndTime = endDate.Unix()
|
2954
|
2974
|
|
2955
|
|
- fmt.Println("ADMINWOOWOWOWOWO", adminUserInfo.Org.Id)
|
2956
|
|
-
|
2957
|
2975
|
// 长沙南雅需求
|
2958
|
2976
|
if adminUserInfo.Org.Id == 9671 || adminUserInfo.Org.Id == 3877 || adminUserInfo.Org.Id == 10340 || adminUserInfo.Org.Id == 9675 {
|
2959
|
2977
|
|
|
@@ -2968,7 +2986,7 @@ func (c *DialysisAPIController) Finish() {
|
2968
|
2986
|
|
2969
|
2987
|
// 查询未执行的医嘱
|
2970
|
2988
|
doctorAdvice, _ := service.GetDoctorAdviceListNoExecution(dialysisOrder.PatientId, dialysisOrder.DialysisDate, dialysisOrder.UserOrgId)
|
2971
|
|
- fmt.Println("doctorAdviceWOWOOWOWOWOWOWOW", doctorAdvice)
|
|
2989
|
+
|
2972
|
2990
|
for _, item := range doctorAdvice {
|
2973
|
2991
|
service.UpdateDoctorAdviceNoExecution(item.ID, dialysisOrder.FinishNurse, dialysisOrder.EndTime)
|
2974
|
2992
|
key := strconv.FormatInt(adminUserInfo.Org.Id, 10) + ":" + strconv.FormatInt(item.PatientId, 10) + ":" + strconv.FormatInt(item.AdviceDate, 10) + ":doctor_advices"
|
|
@@ -3425,7 +3443,7 @@ func (this *DialysisAPIController) StartDialysis() {
|
3425
|
3443
|
ultrafiltration_rate = ultrafiltration_rate / 1000
|
3426
|
3444
|
}
|
3427
|
3445
|
|
3428
|
|
- if adminUserInfo.Org.Id == 10612 {
|
|
3446
|
+ if adminUserInfo.Org.Id == 10612 || adminUserInfo.Org.Id == 10617 {
|
3429
|
3447
|
ultrafiltration_rate = math.Floor(prescription.TargetUltrafiltration * 1000 / float64(totalMin) * 60 * 1000)
|
3430
|
3448
|
ultrafiltration_rate = ultrafiltration_rate / 1000
|
3431
|
3449
|
}
|