Merge branch 'dev' of http://192.168.1.220:10080/Amoy2/wlyy2.0 into dev

svr/svr-cloud-care/src/main/java/com/yihu/jw/care/service/statistics/StatisticsService.java

@@ -3527,7 +3527,7 @@ public class StatisticsService {
                " 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, " +
                " '紧急预警' AS ewtype, 1 AS type,o.serve_address AS serviceAddress  " +
                " '紧急预警' AS ewtype, 1 AS type,o.serve_address AS serviceAddress,'20' as OrderType  " +
                " FROM " +
                " base_emergency_assistance_order o " +
                " LEFT JOIN base_patient p ON o.patient = p.id " +
@@ -3546,7 +3546,7 @@ public class StatisticsService {
                " 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, " +
                " o.serve_desc AS ewtype,2 AS type,o.serve_address AS serviceAddress  " +
                " o.serve_desc AS ewtype,2 AS type,o.serve_address AS serviceAddress,'22' as OrderType  " +
                "FROM " +
                " base_security_monitoring_order o " +
                " LEFT JOIN base_patient p ON o.patient = p.id " +