医保对接

service/common_service.go

@@ -986,11 +986,15 @@ func GetQuarterTotalCount(orgid int64, startime int64, endtime int64, lapseto in
 	if endtime > 0 {
 		db = db.Where("x.inspect_date <=?", endtime)
 	}
-	if lapseto > 0 {
-		db = db.Joins("inner join xt_patients as p On p.id = x.patient_id AND p.lapseto = ?", lapseto)
+	if lapseto > 0 && origin > 0 {
+		db = db.Joins("inner join xt_patients as p on p.id = x.patient_id AND p.lapseto = ? AND p.source = ?", lapseto, origin)
+	}
+	if lapseto > 0 && origin == 0 {
+		db = db.Joins("inner join xt_patients as p on p.id = x.patient_id AND p.lapseto = ?", lapseto)
 	}
-	if origin > 0 {
-		db = db.Joins("inner join xt_patients as p On p.id = x.patient_id AND p.source = ?", origin)
+
+	if lapseto == 0 && origin > 0 {
+		db = db.Joins("inner join xt_patients as p on p.id = x.patient_id AND p.source = ?", origin)
 	}
 	err = db.Group("x.item_id").Select("sum(case when x.inspect_date >=? and x.inspect_date<=? then 1 else 0 end) as total,sum(case when x.inspect_value+0>=q.min_range+0 and x.inspect_value +0 <= q.large_range+0 and x.inspect_date >=? and x.inspect_date <=? then 1 else 0 end) as count,x.item_id,q.sort", startime, endtime, startime, endtime).Joins("left join xt_inspection_reference as r on ( r.item_id = x.item_id AND r.org_id > 0) OR ( x.item_id = r.id AND r.org_id = 0 ) ").Joins("left join xt_quality_control_standard as q on q.inspection_minor = x.item_id").Scan(&inspection).Error
 	return inspection, err
@@ -1009,12 +1013,15 @@ func GetQuarterTotalCountTwo(orgid int64, startime int64, endtime int64, lapseto
 	if endtime > 0 {
 		db = db.Where("x.inspect_date <=?", endtime)
 	}
-
-	if lapseto > 0 {
-		db = db.Joins("inner join xt_patients as p On p.id = x.patient_id AND p.lapseto = ?", lapseto)
+	if lapseto > 0 && origin > 0 {
+		db = db.Joins("inner join xt_patients as p on p.id = x.patient_id AND p.lapseto = ? AND p.source = ?", lapseto, origin)
 	}
-	if origin > 0 {
-		db = db.Joins("inner join xt_patients as p On p.id = x.patient_id AND p.source = ?", origin)
+	if lapseto > 0 && origin == 0 {
+		db = db.Joins("inner join xt_patients as p on p.id = x.patient_id AND p.lapseto = ?", lapseto)
+	}
+
+	if lapseto == 0 && origin > 0 {
+		db = db.Joins("inner join xt_patients as p on p.id = x.patient_id AND p.source = ?", origin)
 	}
 	err = db.Group("x.item_id").Select("sum(case when x.inspect_date >=? and x.inspect_date<=? then 1 else 0 end) as total,sum(case when q.range_value = x.inspect_value and x.inspect_date >=? and x.inspect_date <=? then 1 else 0 end) as count,x.item_id,q.sort", startime, endtime, startime, endtime).Joins("left join xt_inspection_reference as r on ( r.item_id = x.item_id AND r.org_id > 0) OR ( x.item_id = r.id AND r.org_id = 0 ) ").Joins("left join xt_quality_control_standard as q on q.inspection_minor = x.item_id").Scan(&inspection).Error
 	return inspection, err
@@ -2842,10 +2849,14 @@ func GetSystolicBloodPressure(orgid int64, startime int64, endtime int64) (recor
 func GetSystolicBloodPressureTwo(orgid int64, startime int64, endtime int64, lapseto int64, origin int64) (record []*models.VmMonitoringRecord, total int64, err error) {
 
 	db := XTReadDB().Table("xt_monitoring_record as x")
-	if lapseto > 0 {
+	if lapseto > 0 && origin > 0 {
+		db = db.Joins("inner join xt_patients as p on p.id = x.patient_id AND p.lapseto = ? AND p.source = ?", lapseto, origin)
+	}
+	if lapseto > 0 && origin == 0 {
 		db = db.Joins("inner join xt_patients as p on p.id = x.patient_id AND p.lapseto = ?", lapseto)
 	}
-	if origin > 0 {
+
+	if lapseto == 0 && origin > 0 {
 		db = db.Joins("inner join xt_patients as p on p.id = x.patient_id AND p.source = ?", origin)
 	}
 	err = db.Select("x.id,x.systolic_blood_pressure").Where("x.user_org_id = ? and x.monitoring_date >=? and x.monitoring_date<=? and x.status = 1 and x.systolic_blood_pressure <> 0", orgid, startime, endtime).Group("x.monitoring_date,x.patient_id").Count(&total).Scan(&record).Error
@@ -2868,10 +2879,14 @@ func GetDiastolicBloodPressure(orgid int64, startime int64, endtime int64) (reco
 
 func GetDiastolicBloodPressureTwo(orgid int64, startime int64, endtime int64, lapseto int64, origin int64) (record []*models.VmMonitoringRecord, total int64, err error) {
 	db := XTReadDB().Table("xt_monitoring_record as x")
-	if lapseto > 0 {
+	if lapseto > 0 && origin > 0 {
+		db = db.Joins("inner join xt_patients as p on p.id = x.patient_id AND p.lapseto = ? AND p.source = ?", lapseto, origin)
+	}
+	if lapseto > 0 && origin == 0 {
 		db = db.Joins("inner join xt_patients as p on p.id = x.patient_id AND p.lapseto = ?", lapseto)
 	}
-	if origin > 0 {
+
+	if lapseto == 0 && origin > 0 {
 		db = db.Joins("inner join xt_patients as p on p.id = x.patient_id AND p.source = ?", origin)
 	}
 	err = db.Select("x.id,x.diastolic_blood_pressure").Where("x.user_org_id = ? and x.monitoring_date >=? and x.monitoring_date<=? and x.status = 1 and x.diastolic_blood_pressure <> 0", orgid, startime, endtime).Group("x.monitoring_date,x.patient_id").Count(&total).Scan(&record).Error