Merge branch 'dev' of huangxingmiao/wlyy2.0 into dev

business/im-service/src/main/java/com/yihu/jw/im/service/ImService.java

@@ -4507,31 +4507,21 @@ public class ImService {
        String pushSql = "";
        pushSql =
                "SELECT\n" +
                "a.patient_name\n" +
                "as \"pname\",\n" +
                "a.doctor_name\n" +
                "as \"dname\",\n" +
                "a.dept_name\n" +
                "as \"dept\",\n" +
                "a.outpatient_type\n" +
                "as \"type\",\n" +
                "a.create_time\n" +
                "as \"ctime\",\n" +
                "a.con_date\n" +
                "as \"rtime\",\n" +
                "a.end_time\n" +
                "as \"etime\",\n" +
                "a.description\n" +
                "as \"des\",\n" +
                "b. STATUS\n" +
                "as \"pay\",\n" +
                "a. STATUS\n" +
                "as \"STATUS\"\n" +
                "FROM\n" +
                " wlyy_outpatient a\n" +
                "LEFT JOIN wlyy_prescription b ON a.id = b.outpatient_id\n" +
                "WHERE\n" +
                " 1 = 1";
                        "\ta.patient_name AS \"pname\",\n" +
                        "\ta.doctor_name AS \"dname\",\n" +
                        "\ta.dept_name AS \"dept\",\n" +
                        "\ta.outpatient_type AS \"type\",\n" +
                        "\ta.create_time AS \"ctime\",\n" +
                        "\ta.con_date AS \"rtime\",\n" +
                        "\ta.end_time AS \"etime\",\n" +
                        "\ta.description AS \"des\",\n" +
                        "\tb. STATUS AS \"pay\",\n" +
                        "\ta. STATUS AS \"STATUS\"\n" +
                        "FROM\n" +
                        "\twlyy_outpatient a\n" +
                        "LEFT JOIN wlyy_prescription b ON a.id = b.outpatient_id\n" +
                        "WHERE\n" +
                        "\t1 = 1";
        List<Map<String, Object>> mapList = hibenateUtils.createSQLQuery(pushSql);