提交代码

controllers/statistics_api_controller.go

@@ -1335,6 +1335,8 @@ func (c *StatisticsApiController) GetDialyzer() {
 	dialyzers, err := service.GetDialyzerData(startTime, endTime, c.GetAdminUserInfo().CurrentOrgId)
 	DialysisIrrigation, err := service.GetDialysisIrrigationData(startTime, endTime, c.GetAdminUserInfo().CurrentOrgId)
 
+	DialysisStrainer, err := service.GetDialysisStrainerData(startTime, endTime, c.GetAdminUserInfo().CurrentOrgId)
+
 	if err != nil {
 		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
 		return
@@ -1364,6 +1366,17 @@ func (c *StatisticsApiController) GetDialyzer() {
 			respDatas = append(respDatas, respData)
 		}
 	}
+
+	for _, item := range DialysisStrainer {
+		if len(item.Dialyzer) > 0 {
+			var respData respData
+			respData.Name = item.Dialyzer
+			respData.Count = item.Count
+			respData.Percentage = float64(item.Count) / float64(total) * 100
+			respDatas = append(respDatas, respData)
+		}
+	}
+
 	c.ServeSuccessJSON(map[string]interface{}{
 		"data": respDatas,
 	})
@@ -1413,7 +1426,9 @@ func (c *StatisticsApiController) GetDialyzerDetail() {
 func (c *StatisticsApiController) GetDialyzerConfig() {
 	dialyzers, _ := service.GetDialyzerSummary(c.GetAdminUserInfo().CurrentOrgId)
 	Irrigation, _ := service.GetIrrigationSummary(c.GetAdminUserInfo().CurrentOrgId)
+	DialysisStrainer, _ := service.GetDialysisStrainerSummary(c.GetAdminUserInfo().CurrentOrgId)
 	dialyzers = append(dialyzers, Irrigation...)
+	dialyzers = append(dialyzers, DialysisStrainer...)
 	c.ServeSuccessJSON(map[string]interface{}{
 		"dialyzers": dialyzers,
 	})

service/statistis_qc_service.go

@@ -594,6 +594,19 @@ func GetIrrigationSummary(org_id int64) ([]string, error) {
 	return Irrigation, nil
 }
 
+func GetDialysisStrainerSummary(org_id int64) ([]string, error) {
+	var Irrigation []string
+	err := XTReadDB().Model(&models.DialysisPrescription{}).
+		Select("dialysis_strainer").
+		Where(" user_org_id = ? and status = 1", org_id).
+		Group("dialysis_strainer").
+		Scan(&Irrigation).Error
+	if err != nil {
+		return nil, err
+	}
+	return Irrigation, nil
+}
+
 type DialyzerResult struct {
 	Dialyzer string
 	Count    int
@@ -617,6 +630,15 @@ func GetDialysisIrrigationData(start_time int64, end_time int64, org_id int64) (
 	return
 }
 
+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).
+		Group("xt_dialysis_prescription.dialysis_strainer").
+		Scan(&dr).Error
+	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").
@@ -654,7 +676,7 @@ func GetPrescriptionByDialyzer(page int64, limit int64, orgid int64, dialyzer st
 
 	db := 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").Preload("QCPatients", "xt_patients.status = 1 and xt_patients.user_org_id = ?", orgid).Where("xt_dialysis_prescription.status = 1")
 	if len(dialyzer) > 0 {
-		db = db.Where("xt_dialysis_prescription.dialysis_dialyszers = ? or xt_dialysis_prescription.dialysis_irrigation = ?", dialyzer, dialyzer)
+		db = db.Where("xt_dialysis_prescription.dialysis_dialyszers = ? or xt_dialysis_prescription.dialysis_irrigation = ? or xt_dialysis_prescription.dialysis_strainer = ?", dialyzer, dialyzer, dialyzer)
 	}
 	if orgid > 0 {
 		db = db.Where("xt_dialysis_prescription.user_org_id = ?", orgid)