陈少旭 9 mēnešus atpakaļ
vecāks
revīzija
32493c2c7b
1 mainītis faili ar 2 papildinājumiem un 2 dzēšanām
  1. 2 2
      service/his_charge_service.go

+ 2 - 2
service/his_charge_service.go Parādīt failu

1088
 	}
1088
 	}
1089
 	db = db.Joins("left JOIN `his_order` oo on oo.`number` = o.`batch_number` and oo.user_org_id = ?", org_id)
1089
 	db = db.Joins("left JOIN `his_order` oo on oo.`number` = o.`batch_number` and oo.user_org_id = ?", org_id)
1090
 
1090
 
1091
-	err = db.Where(" oi.user_org_id = ?  AND o.record_date >= ? AND o.record_date <= ? AND oi.status = 1", org_id, start_time, end_time).Scan(&patients).Error
1091
+	err = db.Where(" oi.user_org_id = ?  AND o.record_date >= ? AND o.record_date <= ? AND oi.status = 1", org_id, start_time, end_time).Group("oi.id").Scan(&patients).Error
1092
 
1092
 
1093
 	return
1093
 	return
1094
 }
1094
 }
1115
 	}
1115
 	}
1116
 	db = db.Joins("left JOIN `his_order` oo on oo.`number` = o.`batch_number` and oo.user_org_id = ?", org_id)
1116
 	db = db.Joins("left JOIN `his_order` oo on oo.`number` = o.`batch_number` and oo.user_org_id = ?", org_id)
1117
 
1117
 
1118
-	err = db.Where(" oi.user_org_id = ?  AND o.record_date >= ? AND o.record_date <= ? AND oi.status = 1", org_id, start_time, end_time).Scan(&patients).Error
1118
+	err = db.Where(" oi.user_org_id = ?  AND o.record_date >= ? AND o.record_date <= ? AND oi.status = 1", org_id, start_time, end_time).Group("oi.id").Scan(&patients).Error
1119
 	return
1119
 	return
1120
 }
1120
 }