提交代码

service/statistis_qc_service.go

@@ -1250,13 +1250,32 @@ type Patient struct {
 
 // xt_assessment_before_dislysis model
 type Assessment struct {
-	ID          uint      `gorm:"id"`
-	PatientID   uint      `gorm:"column:patent_id"`
-	SystolicBP  int       `gorm:"column:systolic_blood_pressure"`
-	DiastolicBP int       `gorm:"column:diastolic_blood_pressure"`
-	RecordDate  time.Time `gorm:"column:record_date"`
-	UserOrgID   int       `gorm:"column:user_org_id"`
+	ID             uint      `gorm:"id"`
+	PatientID      uint      `gorm:"column:patient_id"`
+	SystolicBP     int       `gorm:"column:systolic_blood_pressure"`
+	DiastolicBP    int       `gorm:"column:diastolic_blood_pressure"`
+	AssessmentDate time.Time `gorm:"column:assessment_date"`
+	UserOrgID      int       `gorm:"column:user_org_id"`
 }
+
+func (Assessment) TableName() string {
+	return "xt_assessment_before_dislysis"
+}
+
+// xt_assessment_before_dislysis model
+type AssessmentAfter struct {
+	ID             uint      `gorm:"id"`
+	PatientID      uint      `gorm:"column:patient_id"`
+	SystolicBP     int       `gorm:"column:systolic_blood_pressure"`
+	DiastolicBP    int       `gorm:"column:diastolic_blood_pressure"`
+	AssessmentDate time.Time `gorm:"column:assessment_date"`
+	UserOrgID      int       `gorm:"column:user_org_id"`
+}
+
+func (AssessmentAfter) TableName() string {
+	return "xt_assessment_before_dislysis"
+}
+
 type WeightDetail struct {
 	DialysisNo      string
 	PatientName     string
@@ -1585,8 +1604,8 @@ func GetNewDialysisBloodChartData(user_org_id int64, start_time int64, end_time
 	switch statistics_type {
 	case 1:
 		var assessments []Assessment
-		err = db.Joins("JOIN xt_patients ON xt_patients.id = xt_assessment_before_dislysis.patent_id").
-			Where("record_date >= ? AND record_date <= ? AND user_org_id = ?", start_time, end_time, user_org_id).
+		err = db.Joins("JOIN xt_patients ON xt_patients.id = xt_assessment_before_dislysis.patient_id").
+			Where("xt_assessment_before_dislysis.assessment_date >= ? AND xt_assessment_before_dislysis.assessment_date <= ? AND xt_assessment_before_dislysis.user_org_id = ?", start_time, end_time, user_org_id).
 			Find(&assessments).Error
 		if err != nil {
 			log.Fatal("Query execution error:", err)
@@ -1644,9 +1663,9 @@ func GetNewDialysisBloodChartData(user_org_id int64, start_time int64, end_time
 
 		}
 	case 2:
-		var assessments []Assessment
-		err = db.Joins("JOIN xt_patients ON xt_patients.id = xt_assessment_after_dislysis.patent_id").
-			Where("record_date >= ? AND record_date <= ? AND user_org_id = ?", start_time, end_time, user_org_id).
+		var assessments []AssessmentAfter
+		err = db.Joins("JOIN xt_patients ON xt_patients.id = xt_assessment_after_dislysis.patient_id").
+			Where("xt_assessment_after_dislysis.assessment_date >= ? AND xt_assessment_after_dislysis.assessment_date <= ? AND xt_assessment_before_dislysis.user_org_id = ?", start_time, end_time, user_org_id).
 			Find(&assessments).Error
 		if err != nil {
 			log.Fatal("Query execution error:", err)