|
|
@@ -736,7 +736,8 @@ func GetDialysisCompletionDetail(org_id int64, start_time int64, end_time int64,
|
|
736
|
736
|
CONCAT(a.actual_treatment_hour, 'h', a.actual_treatment_minute,'min') as actual_duration,
|
|
737
|
737
|
ABS(TIMESTAMPDIFF(MINUTE, MAKETIME(p.dialysis_duration_hour, p.dialysis_duration_minute, 0), MAKETIME(a.actual_treatment_hour, a.actual_treatment_minute, 0))) as diff,
|
|
738
|
738
|
p.prescription_doctor as doctor,
|
|
739
|
|
- o.finish_nurse as nurse
|
|
|
739
|
+ o.finish_nurse as nurse,
|
|
|
740
|
+ p.id_card_no as id_card_no
|
|
740
|
741
|
FROM
|
|
741
|
742
|
xt_dialysis_order o
|
|
742
|
743
|
JOIN
|
|
|
@@ -765,7 +766,9 @@ func GetDialysisCompletionDetail(org_id int64, start_time int64, end_time int64,
|
|
765
|
766
|
CONCAT(a.actual_treatment_hour, 'h', a.actual_treatment_minute,'min') as actual_duration,
|
|
766
|
767
|
ABS(TIMESTAMPDIFF(MINUTE, MAKETIME(p.dialysis_duration_hour, p.dialysis_duration_minute, 0), MAKETIME(a.actual_treatment_hour, a.actual_treatment_minute, 0))) as diff,
|
|
767
|
768
|
p.prescription_doctor as doctor,
|
|
768
|
|
- o.finish_nurse as nurse
|
|
|
769
|
+ o.finish_nurse as nurse,
|
|
|
770
|
+ p.id_card_no as id_card_no
|
|
|
771
|
+
|
|
769
|
772
|
FROM
|
|
770
|
773
|
xt_dialysis_order o
|
|
771
|
774
|
JOIN
|
|
|
@@ -793,7 +796,8 @@ func GetDialysisCompletionDetail(org_id int64, start_time int64, end_time int64,
|
|
793
|
796
|
CONCAT(a.actual_treatment_hour, 'h', a.actual_treatment_minute,'min') as actual_duration,
|
|
794
|
797
|
ABS(TIMESTAMPDIFF(MINUTE, MAKETIME(p.dialysis_duration_hour, p.dialysis_duration_minute, 0), MAKETIME(a.actual_treatment_hour, a.actual_treatment_minute, 0))) as diff,
|
|
795
|
798
|
p.prescription_doctor as doctor,
|
|
796
|
|
- o.finish_nurse as nurse
|
|
|
799
|
+ o.finish_nurse as nurse,
|
|
|
800
|
+ p.id_card_no as id_card_no
|
|
797
|
801
|
FROM
|
|
798
|
802
|
xt_dialysis_order o
|
|
799
|
803
|
JOIN
|
|
|
@@ -821,7 +825,8 @@ func GetDialysisCompletionDetail(org_id int64, start_time int64, end_time int64,
|
|
821
|
825
|
CONCAT(a.actual_treatment_hour, 'h', a.actual_treatment_minute,'min') as actual_duration,
|
|
822
|
826
|
ABS(TIMESTAMPDIFF(MINUTE, MAKETIME(p.dialysis_duration_hour, p.dialysis_duration_minute, 0), MAKETIME(a.actual_treatment_hour, a.actual_treatment_minute, 0))) as diff,
|
|
823
|
827
|
p.prescription_doctor as doctor,
|
|
824
|
|
- o.finish_nurse as nurse
|
|
|
828
|
+ o.finish_nurse as nurse,
|
|
|
829
|
+ p.id_card_no as id_card_no
|
|
825
|
830
|
FROM
|
|
826
|
831
|
xt_dialysis_order o
|
|
827
|
832
|
JOIN
|
