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

@@ -2087,18 +2087,19 @@ func afterTypeCondition(query *gorm.DB, afterType int64) {
 }
 
 type DialysisDataThree struct {
-	DialysisNo          string  `json:"透析号"`
-	PatientName         string  `json:"患者姓名"`
-	Gender              string  `json:"性别"`
-	Age                 int     `json:"年龄"`
-	AssessmentDate      string  `json:"透析日期"`
-	DryWeight           float64 `json:"干体重"`
-	PreDialysisBP       string  `json:"透前血压"`
-	PostDialysisBP      string  `json:"透后血压"`
-	MonitoringBP        string  `json:"监测记录血压"`
-	UltrafiltrationRate float64 `json:"超滤率"`
-	UltrafiltrationVol  float64 `json:"超滤总量"`
-	BPStatus            string  `json:"血压达标状态"`
+	DialysisNo            string  `json:"dialysis_no"`
+	PatientName           string  `json:"patient_name"`
+	Gender                string  `json:"gender"`
+	Age                   int     `json:"age"`
+	AssessmentDate        string  `json:"assessment_date"`
+	DryWeight             float64 `json:"dry_weight"`
+	PreDialysisBP         string  `json:"pre_dialysis_bp"`
+	PostDialysisBP        string  `json:"post_dialysis_bp"`
+	MonitoringBP          string  `json:"monitoring_bp"`
+	UltrafiltrationRate   float64 `json:"ultrafiltration_rate"`
+	UltrafiltrationVol    float64 `json:"ultrafiltration_vol"`
+	BPStatus              string  `json:"bp_status"`
+	ActualUltrafiltration float64 `json:"actual_ultrafiltration"`
 }
 
 //	func GetNewDialysisBPDetailTableTen(user_org_id int64, start_time int64, end_time int64, addType, page, limit int64) ([]DialysisDataThree, int64, error) {
@@ -2217,31 +2218,36 @@ func GetNewDialysisBPDetailTableTen(
 	addType, page, limit int64,
 ) ([]DialysisDataThree, int64, error) {
 	offset := (page - 1) * limit
-	var total int64
 	var results []DialysisDataThree
+	var total int64
 
-	// SQL 查询
-	query := `
-        SELECT
-            p.dialysis_no AS DialysisNo,
-            p.name AS PatientName,
-            p.gender AS Gender,
-            FLOOR((YEAR(CURDATE()) - SUBSTRING(p.id_card_no, 7, 4))) AS Age,
-            b.assessment_date AS AssessmentDate,
-            b.dry_weight AS DryWeight,
-            CONCAT(b.systolic_blood_pressure, '/', b.diastolic_blood_pressure) AS PreDialysisBP,
-            CONCAT(a.systolic_blood_pressure, '/', a.diastolic_blood_pressure) AS PostDialysisBP,
-            GROUP_CONCAT(CONCAT(m.systolic_blood_pressure, '/', m.diastolic_blood_pressure) ORDER BY m.monitoring_date ASC SEPARATOR ',') AS MonitoringBP,
-            (SELECT mr.ultrafiltration_rate
-             FROM xt_monitoring_record mr
-             WHERE mr.patient_id = p.id AND mr.monitoring_date = b.assessment_date
-             ORDER BY mr.operate_time DESC
-             LIMIT 1) AS UltrafiltrationRate,
-            (SELECT mr.ultrafiltration_volume
-             FROM xt_monitoring_record mr
-             WHERE mr.patient_id = p.id AND mr.monitoring_date = b.assessment_date
-             ORDER BY mr.operate_time DESC
-             LIMIT 1) AS UltrafiltrationVol,
+	// 构建基本查询
+	query := readDb.Table("xt_assessment_before_dislysis b").
+		Select(`
+            p.dialysis_no AS dialysis_no,
+			a.actual_ultrafiltration as actual_ultrafiltration,
+            p.name AS patient_name,
+            p.gender AS gender,
+            FLOOR((YEAR(CURDATE()) - SUBSTRING(p.id_card_no, 7, 4))) AS age,
+            b.assessment_date AS assessment_date,
+            b.dry_weight AS dry_weight,
+            CONCAT(b.systolic_blood_pressure, '/', b.diastolic_blood_pressure) AS pre_dialysis_bp,
+            CONCAT(a.systolic_blood_pressure, '/', a.diastolic_blood_pressure) AS post_dialysis_bp,
+            GROUP_CONCAT(CONCAT(m.systolic_blood_pressure, '/', m.diastolic_blood_pressure) ORDER BY m.monitoring_date ASC SEPARATOR ',') AS monitoring_bp,
+            (
+                SELECT mr.ultrafiltration_rate
+                FROM xt_monitoring_record mr
+                WHERE mr.patient_id = p.id 
+                AND mr.monitoring_date = b.assessment_date
+                ORDER BY mr.operate_time DESC LIMIT 1
+            ) AS ultrafiltration_rate,
+            (
+                SELECT mr.ultrafiltration_volume
+                FROM xt_monitoring_record mr
+                WHERE mr.patient_id = p.id 
+                AND mr.monitoring_date = b.assessment_date
+                ORDER BY mr.operate_time DESC LIMIT 1
+            ) AS ultrafiltration_vol,
             CASE 
                 WHEN FLOOR((YEAR(CURDATE()) - SUBSTRING(p.id_card_no, 7, 4))) < 60 THEN
                     CASE 
@@ -2253,74 +2259,47 @@ func GetNewDialysisBPDetailTableTen(
                         WHEN b.systolic_blood_pressure < 160 OR b.diastolic_blood_pressure < 90 THEN '达标'
                         ELSE '不达标'
                     END
-            END AS BPStatus
-        FROM
-            xt_patients p
-        JOIN
-            xt_assessment_before_dislysis b ON p.id = b.patient_id
-        JOIN
-            xt_assessment_after_dislysis a ON p.id = a.patient_id AND b.assessment_date = a.assessment_date
-        JOIN
-            xt_monitoring_record m ON p.id = m.patient_id AND m.monitoring_date = b.assessment_date
-        WHERE
-            b.user_org_id = ?
-            AND b.assessment_date >= ?
-            AND b.assessment_date <= ?
-            AND (
-                (? = 1 AND CASE 
-                    WHEN FLOOR((YEAR(CURDATE()) - SUBSTRING(p.id_card_no, 7, 4))) < 60 THEN
-                        CASE 
-                            WHEN b.systolic_blood_pressure < 140 OR b.diastolic_blood_pressure < 90 THEN 1
-                            ELSE 0
-                        END
-                    WHEN FLOOR((YEAR(CURDATE()) - SUBSTRING(p.id_card_no, 7, 4))) >= 60 THEN
-                        CASE 
-                            WHEN b.systolic_blood_pressure < 160 OR b.diastolic_blood_pressure < 90 THEN 1
-                            ELSE 0
-                        END
-                END = 1)
-                OR
-                (? = 2 AND CASE 
-                    WHEN FLOOR((YEAR(CURDATE()) - SUBSTRING(p.id_card_no, 7, 4))) < 60 THEN
-                        CASE 
-                            WHEN b.systolic_blood_pressure >= 140 AND b.diastolic_blood_pressure >= 90 THEN 1
-                            ELSE 0
-                        END
-                    WHEN FLOOR((YEAR(CURDATE()) - SUBSTRING(p.id_card_no, 7, 4))) >= 60 THEN
-                        CASE 
-                            WHEN b.systolic_blood_pressure >= 160 AND b.diastolic_blood_pressure >= 90 THEN 1
-                            ELSE 0
-                        END
-                END = 1)
-            )
-        GROUP BY
-            p.id, b.assessment_date
-        ORDER BY
-            p.id, b.assessment_date
-        LIMIT ? OFFSET ?;
-    `
+            END AS bp_status
+        `).
+		Joins("JOIN xt_patients p ON p.id = b.patient_id").
+		Joins("JOIN xt_assessment_after_dislysis a ON p.id = a.patient_id AND b.assessment_date = a.assessment_date").
+		Joins("JOIN xt_monitoring_record m ON p.id = m.patient_id AND m.monitoring_date = b.assessment_date").
+		Where("b.user_org_id = ?", user_org_id).
+		Where("b.assessment_date >= ?", start_time).
+		Where("b.assessment_date <= ?", end_time).
+		Group("p.id, b.assessment_date")
 
-	// 计算总数
-	countQuery := `
-        SELECT COUNT(*)
-        FROM
-            xt_patients p
-        JOIN
-            xt_assessment_before_dislysis b ON p.id = b.patient_id
-        WHERE
-            b.user_org_id = ?
-            AND b.assessment_date >= ?
-            AND b.assessment_date <= ?
-    `
+	// 根据传入的 addType 值动态构建条件
+	switch addType {
+	case 1:
+		query = query.Where(`
+			CASE 
+				WHEN FLOOR((YEAR(CURDATE()) - SUBSTRING(p.id_card_no, 7, 4))) < 60 THEN
+					b.systolic_blood_pressure < 140 OR b.diastolic_blood_pressure < 90
+				WHEN FLOOR((YEAR(CURDATE()) - SUBSTRING(p.id_card_no, 7, 4))) >= 60 THEN
+					b.systolic_blood_pressure < 160 OR b.diastolic_blood_pressure < 90
+			END`)
+	case 2:
+		query = query.Where(`
+			CASE 
+				WHEN FLOOR((YEAR(CURDATE()) - SUBSTRING(p.id_card_no, 7, 4))) < 60 THEN
+					b.systolic_blood_pressure >= 140 AND b.diastolic_blood_pressure >= 90
+				WHEN FLOOR((YEAR(CURDATE()) - SUBSTRING(p.id_card_no, 7, 4))) >= 60 THEN
+					b.systolic_blood_pressure >= 160 AND b.diastolic_blood_pressure >= 90
+			END`)
+	}
 
-	// 执行统计查询
-	if err := readDb.Raw(countQuery, user_org_id, start_time, end_time).Scan(&total).Error; err != nil {
-		return nil, 0, fmt.Errorf("error calculating total count: %v", err)
+	// 获取总记录数
+	if err := query.Count(&total).Error; err != nil {
+		return nil, 0, fmt.Errorf("count query failed: %v", err)
 	}
 
-	// 执行数据查询
-	if err := readDb.Raw(query, user_org_id, start_time, end_time, addType, addType, limit, offset).Scan(&results).Error; err != nil {
-		return nil, 0, fmt.Errorf("error executing query: %v", err)
+	// 获取分页数据
+	if err := query.Order("p.id, b.assessment_date").
+		Offset(int(offset)).
+		Limit(int(limit)).
+		Scan(&results).Error; err != nil {
+		return nil, 0, fmt.Errorf("query execution failed: %v", err)
 	}
 
 	return results, total, nil