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

@@ -3863,7 +3863,11 @@ public class PrescriptionService extends BaseJpaService<WlyyPrescriptionDO, Pres
                    statuss += " ";
                }*/
                String odry = "";
                String orderCategory ="";
                String orderCategory = "";
                String odte = "";
                String status ="";
                String pay = "";
                if (m.get("orderCategory")==null){
                    odry = null;
                }else {
@@ -3871,27 +3875,31 @@ public class PrescriptionService extends BaseJpaService<WlyyPrescriptionDO, Pres
                    if (orderCategory.equals("1")) {
                        odry += "专家咨询";
                    }else if (orderCategory.equals("2")) {
                        odry += "图文诊室";
                        odry += "复诊";
                    }else if (orderCategory.equals("3")) {
                        odry += "视频诊室";
                    }else if (orderCategory.equals("4")) {
                        odry += "处方";
                        odte += "处方";
                    }else if (orderCategory.equals("5")) {
                        if (m.get("orderType") != null) {
                            String ort = m.get("orderType").toString();
                            if (ort.equalsIgnoreCase("10")) {
                                odry += "就诊卡号充值";
                            }else if(ort.equalsIgnoreCase("11")) {
                                odry += "门诊卡号充值";
                            }
                        }
                        odry += "就诊卡充值";
                        odte += "就诊卡充值";
                    }else {
                        odry += " ";
                    }
                }
                String status ="";
                if(m.get("orderType") == null) {
                    odte = null;
                }else{
                    String orderType =  m.get("orderType").toString();
                    if (orderType.equalsIgnoreCase("1")) {
                        odte += "图文";
                    }else if (orderType.equalsIgnoreCase("3")) {
                        odte += "视频";
                    }
                }
                if (m.get("status") == null) {
                    status = null;
                }else {
@@ -3915,18 +3923,8 @@ public class PrescriptionService extends BaseJpaService<WlyyPrescriptionDO, Pres
                    }
                }
                String odte = "";
                if(m.get("orderType") == null) {
                    odte = null;
                }else{
                    String orderType =  m.get("orderType").toString();
                    if (orderType.equalsIgnoreCase("1")) {
                        odte += "图文咨询";
                    }else if (orderType.equalsIgnoreCase("3")) {
                        odte += "视频咨询";
                    }
                }
                String pay = "";
                if (m.get("payPrice") == null) {
                    pay = null;
                }else{
@@ -3940,7 +3938,6 @@ public class PrescriptionService extends BaseJpaService<WlyyPrescriptionDO, Pres
                    time = m.get("payTime").toString();
                }
                addCell(ws, i, 0, m.get("id")!=null?m.get("id").toString():n);
                addCell(ws, i, 1, time!=null?time:n);
                addCell(ws, i, 2, (String) m.get("orderNo")!=null?(String) m.get("orderNo"):n);

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

@@ -4508,7 +4508,7 @@ public class ImService {
        pushSql =
                "SELECT\n" +
                        "\ta.patient_name AS \"pname\",\n" +
                        "\ta.doctor_name AS \"dname\",\n" +
                        "\ta.consumer_name AS \"dname\",\n" +
                        "\ta.dept_name AS \"dept\",\n" +
                        "\ta.outpatient_type AS \"type\",\n" +
                        "\ta.create_time AS \"ctime\",\n" +
@@ -4523,7 +4523,7 @@ public class ImService {
                        "WHERE\n" +
                        "\t1 = 1";
        if (org.apache.commons.lang3.StringUtils.isNotBlank(status.toString())) {
        if (status != null) {
            pushSql += " AND a. STATUS in(" + status + ") ";
        }
        if (org.apache.commons.lang3.StringUtils.isNotBlank(type)) {