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

business/base-service/src/main/java/com/yihu/jw/hospital/prescription/service/PrescriptionService.java

@@ -3312,48 +3312,24 @@ public class PrescriptionService extends BaseJpaService<WlyyPrescriptionDO, Pres
        } else {
            sql = sql + "date_format(p.pay_time,'%Y-%m-%d %H:%i:%S' )  AS \"payTime\",";
        }
        sql = sql + "CASE p.create_time\n" +
                "WHEN NULL THEN\n" +
                "\t' '\n" +
                "ELSE\n" +
                "\tp.create_time\n" +
                "END time,\n" +
                " CASE e. NAME\n" +
                "WHEN NULL THEN\n" +
                "\t' '\n" +
                "ELSE\n" +
                "\te. NAME\n" +
                "END NAME,\n" +
                " CASE p.pay_time\n" +
                "WHEN NULL THEN\n" +
                "\t' '\n" +
                "ELSE\n" +
                "\tp.pay_time\n" +
                "END pay_time,\n" +
                " CASE p.real_order\n" +
                "WHEN NULL THEN\n" +
                "\t' '\n" +
                "ELSE\n" +
                "\tp.real_order\n" +
                "END realOrder,\n" +
                " CASE o.patient_name\n" +
                "WHEN NULL THEN\n" +
                "\t' '\n" +
                "ELSE\n" +
                "\to.patient_name\n" +
                "END patientName,\n" +
                " CASE i.drug_name\n" +
                "WHEN NULL THEN\n" +
                "\t' '\n" +
                "ELSE\n" +
                "\ti.drug_name\n" +
                "END infoName,\n" +
        sql = sql + "p.create_time\n" +
                "as time,\n" +
                "e. NAME\n" +
                "as NAME,\n" +
                "p.pay_time\n" +
                "as pay_time,\n" +
                "p.real_order\n" +
                "as realOrder,\n" +
                "o.patient_name\n" +
                "as patientName,\n" +
                "i.drug_name\n" +
                "as infoName,\n" +
                " CASE p.create_time\n" +
                "WHEN NULL THEN\n" +
                "\t'否'\n" +
                "ELSE\n" +
                "\t'是'\n" +
                "END create_time,\n" +
                "END \"create_time\",\n" +
                " CASE e.oneself_pickup_flg\n" +
                "WHEN 1 THEN\n" +
                "\t'自取'\n" +
@@ -3361,7 +3337,7 @@ public class PrescriptionService extends BaseJpaService<WlyyPrescriptionDO, Pres
                "\t'快递配送'\n" +
                "ELSE\n" +
                "\t' '\n" +
                "END oneself_pickup_flg,\n" +
                "END \"oneself_pickup_flg\",\n" +
                " CASE p. STATUS\n" +
                "WHEN - 4 THEN\n" +
                "\t'已作废'\n" +

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

@@ -4511,19 +4511,19 @@ public class ImService {
                "\t' '\n" +
                "ELSE\n" +
                "\ta.patient_name\n" +
                "END pname,\n" +
                "END \"pname\",\n" +
                " CASE a.doctor_name\n" +
                "WHEN NULL THEN\n" +
                "\t' '\n" +
                "ELSE\n" +
                "\ta.doctor_name\n" +
                "END dname,\n" +
                "END \"dname\",\n" +
                " CASE a.dept_name\n" +
                "WHEN NULL THEN\n" +
                "\t' '\n" +
                "ELSE\n" +
                "\ta.dept_name\n" +
                "END dept,\n" +
                "END \"dept\",\n" +
                " CASE a.outpatient_type\n" +
                "WHEN 1 THEN\n" +
                "\t'在线复诊'\n" +
@@ -4533,37 +4533,37 @@ public class ImService {
                "\t'专家咨询'\n" +
                "ELSE\n" +
                "\t' '\n" +
                "END type,\n" +
                "END \"type\",\n" +
                " CASE a.create_time\n" +
                "WHEN NULL THEN\n" +
                "\t' '\n" +
                "ELSE\n" +
                "\ta.create_time\n" +
                "END ctime,\n" +
                "END \"ctime\",\n" +
                " CASE a.con_date\n" +
                "WHEN NULL THEN\n" +
                "\t' '\n" +
                "ELSE\n" +
                "\ta.con_date\n" +
                "END rtime,\n" +
                "END \"rtime\",\n" +
                " CASE a.end_time\n" +
                "WHEN NULL THEN\n" +
                "\t' '\n" +
                "ELSE\n" +
                "\ta.end_time\n" +
                "END etime,\n" +
                "END \"etime\",\n" +
                " CASE a.description\n" +
                "WHEN NULL THEN\n" +
                "\t' '\n" +
                "ELSE\n" +
                "\ta.description\n" +
                "END des,\n" +
                "END \"des\",\n" +
                " CASE b. STATUS\n" +
                "WHEN b. STATUS >= 20 THEN\n" +
                "\t'是'\n" +
                "ELSE\n" +
                "\t'否'\n" +
                "END pay,\n" +
                "END \"pay\",\n" +
                " CASE a. STATUS\n" +
                "WHEN '0' THEN\n" +
                "\t'全部'\n" +
@@ -4575,7 +4575,7 @@ public class ImService {
                "\t'结束'\n" +
                "ELSE\n" +
                "\t'取消'\n" +
                "END STATUS\n" +
                "END \"STATUS\"\n" +
                "FROM\n" +
                "\twlyy_outpatient a\n" +
                "LEFT JOIN wlyy_prescription b ON a.patient_name = b.patient_name\n" +