.

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

@@ -266,33 +266,34 @@ public class WlyygcStatisticsService {
        if (size == null) {
            size = 10;
        }
        String jjsql ="SELECT" +
                " ord.patient_name AS `name`," +
                "'紧急呼叫' AS serveDesc" +
                " FROM" +
                " base_emergency_assistance_order ord" +
                " INNER JOIN base_doctor p ON ord.doctor = p.id" +
                " INNER JOIN base_patient pat ON pat.id = ord.patient ";
        String jjsql = "SELECT DISTINCT " +
                "ord.patient_name," +
                "'紧急呼叫' AS serveDesc " +
                "FROM base_emergency_assistance_order ord ";
        String afsql = "SELECT DISTINCT " +
                "ord.patient_name AS name," +
                "ord.serve_desc as serveDesc" +
                " FROM" +
                " base_team_member btm ," +
        String afsql ="SELECT DISTINCT " +
                "ord.patient_name AS NAME," +
                "ord.serve_desc AS serveDesc " +
                "FROM " +
                "base_security_monitoring_order ord " +
                " INNER JOIN base_doctor p ON ord.doctor = p.id" +
                " INNER JOIN base_patient pat ON pat.id = ord.patient" +
                " WHERE btm.doctor_code = ord.doctor ";
                "INNER JOIN base_service_package_sign_record br ON ord.patient = CONVERT (br.patient USING utf8) COLLATE utf8_unicode_ci," +
                " base_service_package_record r " +
                "WHERE " +
                "r.patient = ord.patient ";
        if ("1".equals(code)) {
            jjsql += "WHERE ord.team_code = '8a92aba97a9f6f49017ae4fdbdmqteam'";
            afsql += "AND btm.team_code ='8a92aba97a9f6f49017ae4fdbdmqteam'";
                                             //808080eb78f276d40178f3373c8c000b
            jjsql += "WHERE ord.team_code ='8a92aba97a9f6f49017ae4fdbdmqteam'";
            afsql += "AND r.team_code ='8a92aba97a9f6f49017ae4fdbdmqteam'";
        }else {
            return jsonObject;
        }
        jjsql += " ORDER BY  ord.patient_name desc limit " + (page - 1) + "," + size;
        afsql += " ORDER BY  ord.patient_name desc limit " + (page - 1) + "," + size;
        jjsql += " ORDER BY ord.patient_name DESC limit " + (page - 1) + "," + size;
        afsql += " ORDER BY ord.patient_name DESC limit " + (page - 1) + "," + size;
        List<Map<String, Object>> jj = jdbcTemplate.queryForList(jjsql);
        List<Map<String, Object>> af = jdbcTemplate.queryForList(afsql);
        jsonObject.put("Security", af);