提交代码

controllers/statistics_api_controller.go

@@ -1238,8 +1238,8 @@ func (c *StatisticsApiController) GetDialyzerDetail() {
 }
 func (c *StatisticsApiController) GetDialyzerConfig() {
 	dialyzers, _ := service.GetDialyzerSummary(c.GetAdminUserInfo().CurrentOrgId)
-	Irrigation, _ := service.GetIrrigationSummary(c.GetAdminUserInfo().CurrentOrgId)
-	dialyzers = append(dialyzers, Irrigation...)
+	//Irrigation, _ := service.GetIrrigationSummary(c.GetAdminUserInfo().CurrentOrgId)
+	//dialyzers = append(dialyzers, Irrigation...)
 	c.ServeSuccessJSON(map[string]interface{}{
 		"dialyzers": dialyzers,
 	})

models/patient_models.go

@@ -334,6 +334,7 @@ type DialysisPrescription struct {
 	TubingHemodialysis         int64         `gorm:"column:tubing_hemodialysis" json:"tubing_hemodialysis"`
 	Package                    int64         `gorm:"column:package" json:"package"`
 	ALiquid                    int64         `gorm:"column:a_liquid" json:"a_liquid"`
+	QCPatients                 QCPatients    `json:"patient" gorm:"foreignkey:ID;AssociationForeignKey:PatientID;"`
 	UserAdminRole              UserAdminRole `json:"role" gorm:"foreignkey:AdminUserId;AssociationForeignKey:Creater;"`
 	PreImpulse                 float64       `gorm:"column:pre_impulse" json:"pre_impulse" form:"pre_impulse"`
 	AnticoagulantStopTimeMin   int64         `gorm:"column:anticoagulant_stop_time_min" json:"anticoagulant_stop_time_min" form:"anticoagulant_stop_time_min"`

service/statistis_qc_service.go

@@ -608,6 +608,15 @@ func GetDialyzerData(start_time int64, end_time int64, org_id int64) (dr []Dialy
 	return
 }
 
+func GetIrrigationData(start_time int64, end_time int64, org_id int64) (dr []DialyzerResult, err error) {
+	err = XTReadDB().Model(&models.DialysisPrescription{}).
+		Select("dialysis_irrigation as dialyzer, COUNT(*) as count").
+		Where("record_date >= ? and record_date <= ? and user_org_id = ? and status = 1", start_time, end_time, org_id).
+		Group("dialysis_irrigation").
+		Scan(&dr).Error
+	return
+}
+
 func GetDialyzerTotal(start_time int64, end_time int64, org_id int64) (total int64, err error) {
 	err = XTReadDB().Model(&models.DialysisPrescription{}).
 		Where("status = 1 and record_date >= ? and record_date <= ? and user_org_id = ? and dialysis_dialyszers <> ''", start_time, end_time, org_id).
@@ -617,7 +626,7 @@ func GetDialyzerTotal(start_time int64, end_time int64, org_id int64) (total int
 
 func GetPrescriptionByAnticoagulant(page int64, limit int64, orgid int64, anticoagulant int64, start_time int64, end_time int64) (solution []*models.DialysisPrescription, total int64, err error) {
 
-	db := XTReadDB().Model(&models.DialysisPrescription{}).Where("status = 1")
+	db := XTReadDB().Model(&models.DialysisPrescription{}).Preload("QCPatients", "status = 1 and user_org_id = ?", orgid).Where("status = 1")
 	if anticoagulant > 0 {
 		db = db.Where("anticoagulant = ?", anticoagulant)
 	}