|
@ -3523,7 +3523,7 @@ public class StatisticsService {
|
|
|
statusSql = " AND o.status = "+status+"";
|
|
|
}
|
|
|
|
|
|
String sql = "SELECT p.name,o.`status`,o.id AS orderId,DATE_FORMAT( o.create_time, '%Y-%m-%d %H:%i:%s' ) AS create_time, " +
|
|
|
String sql = "SELECT p.name,o.`status`,o.id AS orderId,DATE_FORMAT( o.create_time, '%Y-%m-%d %H:%i:%s' ) AS create_time,p.id patientId, " +
|
|
|
" GROUP_CONCAT( DISTINCT d.NAME SEPARATOR ',' ) AS doctorName, " +
|
|
|
" GROUP_CONCAT( DISTINCT d.mobile SEPARATOR ',' ) AS dmobile, " +
|
|
|
" p.mobile AS pmobile, p.address AS address,t.`name` AS orgName, " +
|
|
@ -3542,7 +3542,7 @@ public class StatisticsService {
|
|
|
statusSql+nameSql+idcardSql+orgCodeSql+
|
|
|
" AND o.org_code NOT IN ( SELECT DISTINCT dict_code FROM wlyy_hospital_sys_dict WHERE dict_name = 'jkzl_org' AND dict_code IS NOT NULL ) GROUP BY o.id " +
|
|
|
" UNION ALL " +
|
|
|
" SELECT p.name,o.`status`,o.id AS orderId,DATE_FORMAT( o.create_time, '%Y-%m-%d %H:%i:%s' ) AS create_time, " +
|
|
|
" SELECT p.name,o.`status`,o.id AS orderId,DATE_FORMAT( o.create_time, '%Y-%m-%d %H:%i:%s' ) AS create_time,p.id patientId, " +
|
|
|
" GROUP_CONCAT( DISTINCT d.NAME SEPARATOR ',' ) AS doctorName, " +
|
|
|
" GROUP_CONCAT( DISTINCT d.mobile SEPARATOR ',' ) AS dmobile, " +
|
|
|
" p.mobile AS pmobile,p.address AS address,t.`name` AS orgName, " +
|