代码修改

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

@@ -4180,6 +4180,7 @@ public class ImService {
                "op.medical_state as \"medicalState\"  ," +
                "bop.status as \"payStatus1\" ," +
                "op.patient_cancel_value as \"patientCancelValue\" ," +
                "op.plan_doctor as \"planDoctor\" ," +
                "op.patient_cancel_remark as \"patient_cancel_remark\"  " +
                "FROM wlyy_outpatient op LEFT JOIN wlyy_consult a  ON a.relation_code = op.id \n" +
                " LEFT join base_business_order_pay bop on bop.relation_code = op.id" +
@@ -4197,7 +4198,12 @@ public class ImService {
        }
        if (org.apache.commons.lang.StringUtils.isNotBlank(doctor)) {
            sql += " AND op.doctor='" + doctor + "' ";
            if("28".equals(type)){
                sql += " AND (op.doctor='" + doctor + "' or op.plan_doctor='"+doctor+"')";
            }else {
                sql += " AND op.doctor='" + doctor + "' ";
            }
        }
        if (org.apache.commons.lang.StringUtils.isNotBlank(patient)) {
            sql += " AND (op.consumer='" + patient + "' or op.patient ='" + patient + "')";

svr/svr-internet-hospital/src/main/java/com/yihu/jw/hospital/endpoint/prescription/PrescriptionEndpoint.java

@@ -590,7 +590,8 @@ public class PrescriptionEndpoint extends EnvelopRestEndpoint {
   /*     try {*/
            WlyyOutpatientDO wlyyOutpatientDO = prescriptionService.appointmentRevisit(outpatientJson, expressageJson, registerJson, chargeType);
            if (wlyyOutpatientDO != null && null == wlyyOutpatientDO.getId() && !wlyyOutpatientDO.getOutpatientType().equalsIgnoreCase("3")) {
            if (wlyyOutpatientDO != null && null == wlyyOutpatientDO.getId() && !wlyyOutpatientDO.getOutpatientType().equalsIgnoreCase("3")
                    && !wlyyOutpatientDO.getOutpatientType().equalsIgnoreCase("4")) {
                ObjEnvelop objEnvelop = new ObjEnvelop();
                String msg = "";
                if (1 == wlyyOutpatientDO.getRemindCount()) {
@@ -610,7 +611,6 @@ public class PrescriptionEndpoint extends EnvelopRestEndpoint {
                    hospitalSystemMessageService.sendImMessage(systemMessageDO);
                }
                //发送医生抢单消息
                if (StringUtils.isBlank(wlyyOutpatientDO.getDoctor())) {
                    hospitalSystemMessageService.sendImPichCheckMessage(wlyyOutpatientDO);