提交代码

service/statistis_qc_service.go

@@ -2087,18 +2087,19 @@ func afterTypeCondition(query *gorm.DB, afterType int64) {
 }
 
 type DialysisDataThree struct {
-	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"`
+	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) {
@@ -2224,6 +2225,7 @@ func GetNewDialysisBPDetailTableTen(
 	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,