提交代码

service/statistis_qc_service.go

@@ -23,7 +23,7 @@ func GetNewDialysiTotal(startime int64, endtime int64, orgid int64, origin int64
 	var err error
 	if origin == 1 { //透析记录，上机为准
 		db := XTReadDB().Table("xt_dialysis_order as x").Joins("join xt_dialysis_prescription p on p.patient_id = x.patient_id and p.record_date = x.dialysis_date")
-		err = db.Select("count(x.id) as count").Where("x.dialysis_date >= ? and x.dialysis_date<=? and x.user_org_id = ? AND x.status = 1", startime, endtime, orgid).Scan(&counts).Error
+		err = db.Select("count(x.id) as count").Where("x.dialysis_date >= ? and x.dialysis_date<=? and x.user_org_id = ? AND x.status = 1 and x.stage = 2", startime, endtime, orgid).Scan(&counts).Error
 		return counts.Count, err
 
 	} else {
@@ -493,6 +493,7 @@ func GetNewDialysisCountModeTwo(starttime int64, endtime int64, orgid int64, ori
 		if orgid > 0 {
 			db = db.Where("o.user_org_id = ?", orgid)
 		}
+		db = db.Where("o.stage = 2")
 
 		err = db.Select("s.mode_id,count(s.mode_id) as count").Joins("join xt_dialysis_prescription as s on s.patient_id = o.patient_id and s.record_date = o.dialysis_date and s.status= 1 AND DATE_FORMAT(FROM_UNIXTIME(s.record_date), '%Y-%m-%d %H:%i:%s') >= ?  AND DATE_FORMAT(FROM_UNIXTIME(s.record_date), '%Y-%m-%d %H:%i:%s') <= ? AND  s.mode_id = ? ", startDate, endDate, mode_id).Group("s.mode_id").Scan(&counts).Error
 		return counts, err