提交代码

controllers/statistics_api_controller.go

@@ -1368,6 +1368,7 @@ func (c *StatisticsApiController) GetDialyzer() {
 	}
 
 	for _, item := range DialysisStrainer {
+		fmt.Println(item.Dialyzer)
 		if len(item.Dialyzer) > 0 {
 			var respData respData
 			respData.Name = item.Dialyzer
@@ -1424,13 +1425,22 @@ func (c *StatisticsApiController) GetDialyzerDetail() {
 
 }
 func (c *StatisticsApiController) GetDialyzerConfig() {
+	var dialyzer []string
 	dialyzers, _ := service.GetDialyzerSummary(c.GetAdminUserInfo().CurrentOrgId)
+	for _, item := range dialyzers {
+		dialyzer = append(dialyzer, item.DialysisDialyszers)
+	}
 	Irrigation, _ := service.GetIrrigationSummary(c.GetAdminUserInfo().CurrentOrgId)
+	for _, item := range Irrigation {
+		dialyzer = append(dialyzer, item.DialysisIrrigation)
+	}
 	DialysisStrainer, _ := service.GetDialysisStrainerSummary(c.GetAdminUserInfo().CurrentOrgId)
-	dialyzers = append(dialyzers, Irrigation...)
-	dialyzers = append(dialyzers, DialysisStrainer...)
+	for _, item := range DialysisStrainer {
+		dialyzer = append(dialyzer, item.DialysisStrainer)
+	}
+
 	c.ServeSuccessJSON(map[string]interface{}{
-		"dialyzers": dialyzers,
+		"dialyzers": dialyzer,
 	})
 }
 

service/statistis_qc_service.go

@@ -568,43 +568,45 @@ func GetAnticoagulantTotal(start_time int64, end_time int64, org_id int64) (tota
 
 	return
 }
-func GetDialyzerSummary(org_id int64) ([]string, error) {
-	var Dialyzer []string
+func GetDialyzerSummary(org_id int64) ([]models.DialysisPrescription, error) {
+	var Dialyzer []models.DialysisPrescription
 	err := XTReadDB().Model(&models.DialysisPrescription{}).
 		Select("dialysis_dialyszers").
-		Where(" user_org_id = ? and status = 1", org_id).
+		Where(" user_org_id = ? and status = 1 and dialysis_dialyszers <> ''", org_id).
 		Group("dialysis_dialyszers").
-		Scan(&Dialyzer).Error
+		Find(&Dialyzer).Error
 	if err != nil {
 		return nil, err
 	}
 	return Dialyzer, nil
 }
 
-func GetIrrigationSummary(org_id int64) ([]string, error) {
-	var Irrigation []string
+func GetIrrigationSummary(org_id int64) ([]models.DialysisPrescription, error) {
+	var Dialyzer []models.DialysisPrescription
+
 	err := XTReadDB().Model(&models.DialysisPrescription{}).
 		Select("dialysis_irrigation").
-		Where(" user_org_id = ? and status = 1", org_id).
+		Where(" user_org_id = ? and status = 1 and dialysis_irrigation <> ''", org_id).
 		Group("dialysis_irrigation").
-		Scan(&Irrigation).Error
+		Find(&Dialyzer).Error
 	if err != nil {
 		return nil, err
 	}
-	return Irrigation, nil
+	return Dialyzer, nil
 }
 
-func GetDialysisStrainerSummary(org_id int64) ([]string, error) {
-	var Irrigation []string
+func GetDialysisStrainerSummary(org_id int64) ([]models.DialysisPrescription, error) {
+	var Dialyzer []models.DialysisPrescription
+
 	err := XTReadDB().Model(&models.DialysisPrescription{}).
 		Select("dialysis_strainer").
-		Where(" user_org_id = ? and status = 1", org_id).
+		Where(" user_org_id = ? and status = 1 and dialysis_strainer <> ''", org_id).
 		Group("dialysis_strainer").
-		Scan(&Irrigation).Error
+		Find(&Dialyzer).Error
 	if err != nil {
 		return nil, err
 	}
-	return Irrigation, nil
+	return Dialyzer, nil
 }
 
 type DialyzerResult struct {
@@ -615,7 +617,7 @@ type DialyzerResult struct {
 func GetDialyzerData(start_time int64, end_time int64, org_id int64) (dr []DialyzerResult, err error) {
 	err = XTReadDB().Model(&models.DialysisPrescription{}).Joins("join xt_dialysis_order oo on oo.patient_id = xt_dialysis_prescription.patient_id and oo.dialysis_date = xt_dialysis_prescription.record_date and oo.status = 1").
 		Select("xt_dialysis_prescription.dialysis_dialyszers as dialyzer, COUNT(*) as count").
-		Where("xt_dialysis_prescription.record_date >= ? and xt_dialysis_prescription.record_date <= ? and xt_dialysis_prescription.user_org_id = ? and xt_dialysis_prescription.status = 1", start_time, end_time, org_id).
+		Where("xt_dialysis_prescription.record_date >= ? and xt_dialysis_prescription.record_date <= ? and xt_dialysis_prescription.user_org_id = ? and xt_dialysis_prescription.status = 1 and xt_dialysis_prescription.dialysis_dialyszers <> ''", start_time, end_time, org_id).
 		Group("xt_dialysis_prescription.dialysis_dialyszers").
 		Scan(&dr).Error
 	return
@@ -623,8 +625,8 @@ func GetDialyzerData(start_time int64, end_time int64, org_id int64) (dr []Dialy
 
 func GetDialysisIrrigationData(start_time int64, end_time int64, org_id int64) (dr []DialyzerResult, err error) {
 	err = XTReadDB().Model(&models.DialysisPrescription{}).Joins("join xt_dialysis_order oo on oo.patient_id = xt_dialysis_prescription.patient_id and oo.dialysis_date = xt_dialysis_prescription.record_date and oo.status = 1").
-		Select("xt_dialysis_prescription.dialysis_irrigation as dialysis_irrigation, COUNT(*) as count").
-		Where("xt_dialysis_prescription.record_date >= ? and xt_dialysis_prescription.record_date <= ? and xt_dialysis_prescription.user_org_id = ? and xt_dialysis_prescription.status = 1", start_time, end_time, org_id).
+		Select("xt_dialysis_prescription.dialysis_irrigation as dialyzer, COUNT(*) as count").
+		Where("xt_dialysis_prescription.record_date >= ? and xt_dialysis_prescription.record_date <= ? and xt_dialysis_prescription.user_org_id = ? and xt_dialysis_prescription.status = 1 and xt_dialysis_prescription.dialysis_irrigation <> '' ", start_time, end_time, org_id).
 		Group("xt_dialysis_prescription.dialysis_irrigation").
 		Scan(&dr).Error
 	return
@@ -632,8 +634,8 @@ func GetDialysisIrrigationData(start_time int64, end_time int64, org_id int64) (
 
 func GetDialysisStrainerData(start_time int64, end_time int64, org_id int64) (dr []DialyzerResult, err error) {
 	err = XTReadDB().Model(&models.DialysisPrescription{}).Joins("join xt_dialysis_order oo on oo.patient_id = xt_dialysis_prescription.patient_id and oo.dialysis_date = xt_dialysis_prescription.record_date and oo.status = 1").
-		Select("xt_dialysis_prescription.dialysis_strainer as dialysis_strainer, COUNT(*) as count").
-		Where("xt_dialysis_prescription.record_date >= ? and xt_dialysis_prescription.record_date <= ? and xt_dialysis_prescription.user_org_id = ? and xt_dialysis_prescription.status = 1", start_time, end_time, org_id).
+		Select("xt_dialysis_prescription.dialysis_strainer as dialyzer, COUNT(*) as count").
+		Where("xt_dialysis_prescription.record_date >= ? and xt_dialysis_prescription.record_date <= ? and xt_dialysis_prescription.user_org_id = ? and xt_dialysis_prescription.status = 1 and xt_dialysis_prescription.dialysis_strainer <> ''", start_time, end_time, org_id).
 		Group("xt_dialysis_prescription.dialysis_strainer").
 		Scan(&dr).Error
 	return