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

svr/svr-internet-hospital-job/src/main/java/com/yihu/jw/service/channel/PrescriptionStatusUpdateService.java

@@ -375,10 +375,11 @@ public class PrescriptionStatusUpdateService {
                    //更改门诊状态
                    wlyyOutpatientDO.setStatus("-1");
                    String description = null;
                    wlyyOutpatientDO.setDoctorCancelRemark("6");
                    wlyyOutpatientDO.setDoctorCancelType(cancelValue);
                    wlyyOutpatientDO.setDoctorCancelValue(cancelRemark);
                    wlyyOutpatientDO.setDoctorCancelRemark(cancelRemark);
                    wlyyOutpatientDO.setDoctorCancelType("6");
                    wlyyOutpatientDO.setDoctorCancelValue(cancelValue);
                    wlyyOutpatientDO.setEndTime(new Date());
                    wlyyOutpatientDO.setOperator("system");
                    description = cancelValue;
                    //系统消息
                    SystemMessageDO messageDO = new SystemMessageDO();
@@ -523,10 +524,11 @@ public class PrescriptionStatusUpdateService {
            //更改门诊状态
            wlyyOutpatientDO.setStatus("-1");
            String description = null;
            wlyyOutpatientDO.setDoctorCancelRemark("6");
            wlyyOutpatientDO.setDoctorCancelType(cancelValue);
            wlyyOutpatientDO.setDoctorCancelValue(cancelRemark);
            wlyyOutpatientDO.setDoctorCancelRemark(cancelRemark);
            wlyyOutpatientDO.setDoctorCancelType("6");
            wlyyOutpatientDO.setDoctorCancelValue(cancelValue);
            wlyyOutpatientDO.setEndTime(new Date());
            wlyyOutpatientDO.setOperator("system");
            description = cancelValue;
            //系统消息
            SystemMessageDO messageDO = new SystemMessageDO();
@@ -626,10 +628,11 @@ public class PrescriptionStatusUpdateService {
                    //更改门诊状态
                    wlyyOutpatientDO.setStatus("-1");
                    String description = null;
                    wlyyOutpatientDO.setDoctorCancelRemark("6");
                    wlyyOutpatientDO.setDoctorCancelType(cancelValue);
                    wlyyOutpatientDO.setDoctorCancelValue(cancelRemark);
                    wlyyOutpatientDO.setDoctorCancelRemark(cancelRemark);
                    wlyyOutpatientDO.setDoctorCancelType("6");
                    wlyyOutpatientDO.setDoctorCancelValue(cancelValue);
                    wlyyOutpatientDO.setEndTime(new Date());
                    wlyyOutpatientDO.setOperator("system");
                    description = cancelValue;
                    //系统消息
                    SystemMessageDO messageDO = new SystemMessageDO();