Merge branch '20230223_xt_api_new_branch' of http://git.shengws.com/csx/XT_New into 20230223_xt_api_new_branch

service/statistis_qc_service.go

@@ -717,7 +717,7 @@ func GetDialysisCompletionRate(org_id int64, start_time int64, end_time int64) (
             CASE
                 WHEN ABS(TIMESTAMPDIFF(MINUTE, MAKETIME(p.dialysis_duration_hour, p.dialysis_duration_minute, 0), MAKETIME(a.actual_treatment_hour, a.actual_treatment_minute, 0))) <= 15 THEN '达到透析处方时间'
                 WHEN TIMESTAMPDIFF(MINUTE, MAKETIME(p.dialysis_duration_hour, p.dialysis_duration_minute, 0), MAKETIME(a.actual_treatment_hour, a.actual_treatment_minute, 0)) < -15 THEN '超出处方时间'
-                ELSE '未到达处方时间'
+                ELSE '未达到处方时间'
             END AS dialysis_status,
             COUNT(*) AS count
         FROM
@@ -765,8 +765,8 @@ func GetDialysisCompletionDetail(org_id int64, start_time int64, end_time int64,
 	if mode == 0 {
 		query = `
 	   SELECT
-	      p.dialysis_no as dialysis_no,
-	      p.name as patient_name,
+	      pp.dialysis_no as dialysis_no,
+	    	pp.name as patient_name,
 	      FROM_UNIXTIME(o.dialysis_date) as dialysis_date,
 	      CONCAT(p.dialysis_duration_hour, 'h', p.dialysis_duration_minute,'min') as dialysis_duration,
 	      CONCAT(a.actual_treatment_hour, 'h', a.actual_treatment_minute,'min') as actual_duration,
@@ -3326,35 +3326,10 @@ func GetNewDialysisWeightDetailTableTenT(
                ORDER BY b2.assessment_date DESC LIMIT 1
            ) AS last_weight_after,
            CASE
-               WHEN (
-                   SELECT a2.weight_after
-                   FROM xt_assessment_after_dislysis a2
-                   JOIN xt_assessment_before_dislysis b2
-                   ON a2.patient_id = b2.patient_id
-                   AND a2.assessment_date = b2.assessment_date
-                   WHERE b2.patient_id = b.patient_id
-                   AND b2.assessment_date < b.assessment_date
-                   ORDER BY b2.assessment_date DESC LIMIT 1
-               ) IS NOT NULL
-               THEN (b.weight_before - (
-                   SELECT a2.weight_after
-                   FROM xt_assessment_after_dislysis a2
-                   JOIN xt_assessment_before_dislysis b2
-                   ON a2.patient_id = b2.patient_id
-                   AND a2.assessment_date = b2.assessment_date
-                   WHERE b2.patient_id = b.patient_id
-                   AND b2.assessment_date < b.assessment_date
-                   ORDER BY b2.assessment_date DESC LIMIT 1
-               )) / (
-                   SELECT a2.weight_after
-                   FROM xt_assessment_after_dislysis a2
-                   JOIN xt_assessment_before_dislysis b2
-                   ON a2.patient_id = b2.patient_id
-                   AND a2.assessment_date = b2.assessment_date
-                   WHERE b2.patient_id = b.patient_id
-                   AND b2.assessment_date < b.assessment_date
-                   ORDER BY b2.assessment_date DESC LIMIT 1
-               )
+               WHEN 
+                    a.weight_after and b.dry_weight
+                IS NOT NULL
+               THEN a.weight_after - b.dry_weight
                ELSE NULL
            END AS weight_add,
            CASE
@@ -3397,10 +3372,10 @@ func GetNewDialysisWeightDetailTableTenT(
                ORDER BY b2.assessment_date DESC LIMIT 1
            ) AS last_weight_after,
            CASE
-               WHEN b.dry_weight and b.weight_before IS NOT NULL 
-               THEN (b.weight_before - b.dry_weight) / (
-                   b.dry_weight
-               )
+               WHEN 
+                    a.weight_after and b.dry_weight
+                IS NOT NULL
+               THEN a.weight_after - b.dry_weight
                ELSE NULL
            END AS weight_add,
            CASE