提交代码

controllers/statistics_api_controller.go

@@ -1337,18 +1337,23 @@ func (c *StatisticsApiController) GetDialyzer() {
 	}
 	var respDatas []respData
 	for _, item := range dialyzers {
-		var respData respData
-		respData.Name = item.Dialyzer
-		respData.Count = item.Count
-		respData.Percentage = float64(item.Count) / float64(total) * 100
-		respDatas = append(respDatas, respData)
+		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)
+		}
 	}
 	for _, item := range DialysisIrrigation {
-		var respData respData
-		respData.Name = item.Dialyzer
-		respData.Count = item.Count
-		respData.Percentage = float64(item.Count) / float64(total) * 100
-		respDatas = append(respDatas, respData)
+		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,

service/statistis_qc_service.go

@@ -543,10 +543,10 @@ func GetAnticoagulantData(start_time int64, end_time int64, org_id int64) (map[s
 		Count         int
 	}
 
-	err := XTReadDB().Model(&models.DialysisPrescription{}).
-		Select("anticoagulant, COUNT(*) as count").
-		Where("status = 1 and record_date >= ? and record_date <= ? and user_org_id = ?", start_time, end_time, org_id).
-		Group("anticoagulant").
+	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.anticoagulant, COUNT(*) as count").
+		Where("xt_dialysis_prescription.status = 1 and xt_dialysis_prescription.record_date >= ? and xt_dialysis_prescription.record_date <= ? and xt_dialysis_prescription.user_org_id = ?", start_time, end_time, org_id).
+		Group("xt_dialysis_prescription.anticoagulant").
 		Scan(&results).Error
 	if err != nil {
 		return nil, err
@@ -564,8 +564,8 @@ func GetAnticoagulantData(start_time int64, end_time int64, org_id int64) (map[s
 	return anticoagulantData, nil
 }
 func GetAnticoagulantTotal(start_time int64, end_time int64, org_id int64) (total int64, err error) {
-	err = XTReadDB().Model(&models.DialysisPrescription{}).
-		Where("record_date >= ? and record_date <= ? and user_org_id = ? and status = 1", start_time, end_time, org_id).
+	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").
+		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).
 		Count(&total).Error
 
 	return
@@ -603,18 +603,18 @@ 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("dialysis_dialyszers 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_dialyszers").
+		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).
+		Group("xt_dialysis_prescription.dialysis_dialyszers").
 		Scan(&dr).Error
 	return
 }
 
 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("dialysis_irrigation as dialysis_irrigation, 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").
+		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).
+		Group("xt_dialysis_prescription.dialysis_irrigation").
 		Scan(&dr).Error
 	return
 }
@@ -630,21 +630,21 @@ func GetIrrigationData(start_time int64, end_time int64, org_id int64) (dr []Dia
 
 func GetDialyzerTotal(start_time int64, end_time int64, org_id int64) (total int64, 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").
-		Where("status = 1 and record_date >= ? and record_date <= ? and user_org_id = ?", start_time, end_time, org_id).
+		Where("xt_dialysis_prescription.status = 1 and xt_dialysis_prescription.record_date >= ? and xt_dialysis_prescription.record_date <= ? and xt_dialysis_prescription.user_org_id = ?", start_time, end_time, org_id).
 		Count(&total).Error
 	return
 }
 
 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{}).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", "status = 1 and user_org_id = ?", orgid).Where("status = 1")
+	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 xt_dialysis_order.status = 1").Preload("QCPatients", "xt_patients.status = 1 and xt_patients.user_org_id = ?", orgid).Where("xt_dialysis_prescription.status = 1")
 	if anticoagulant > 0 {
-		db = db.Where("anticoagulant = ?", anticoagulant)
+		db = db.Where("xt_dialysis_prescription.anticoagulant = ?", anticoagulant)
 	}
 	if orgid > 0 {
-		db = db.Where("user_org_id = ?", orgid)
+		db = db.Where("xt_dialysis_prescription.user_org_id = ?", orgid)
 	}
-	db = db.Where("record_date >= ? and record_date <= ?", start_time, end_time)
+	db = db.Where("xt_dialysis_prescription.record_date >= ? and xt_dialysis_prescription.record_date <= ?", start_time, end_time)
 
 	offset := (page - 1) * limit
 
@@ -654,14 +654,14 @@ func GetPrescriptionByAnticoagulant(page int64, limit int64, orgid int64, antico
 
 func GetPrescriptionByDialyzer(page int64, limit int64, orgid int64, dialyzer string, start_time int64, end_time int64) (solution []*models.DialysisPrescription, total int64, err error) {
 
-	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", "status = 1 and user_org_id = ?", orgid).Where("status = 1")
+	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("dialysis_dialyszers = ? or dialysis_irrigation = ?", dialyzer, dialyzer)
+		db = db.Where("xt_dialysis_prescription.dialysis_dialyszers = ? or xt_dialysis_prescription.dialysis_irrigation = ?", dialyzer, dialyzer)
 	}
 	if orgid > 0 {
-		db = db.Where("user_org_id = ?", orgid)
+		db = db.Where("xt_dialysis_prescription.user_org_id = ?", orgid)
 	}
-	db = db.Where("record_date >= ? and record_date <= ? and status = 1", start_time, end_time)
+	db = db.Where("xt_dialysis_prescription.record_date >= ? and xt_dialysis_prescription.record_date <= ? and xt_dialysis_prescription.status = 1", start_time, end_time)
 
 	offset := (page - 1) * limit