ruoyi-admin/src/main/java/com/ruoyi/web/component/RedisMqReceiver.java

@@ -852,7 +852,7 @@
                        //人工发送超时
                        if(ObjectUtils.isNotEmpty(preachform) && preachform.equals("1") && failSendstate.equals("7")){
                            serviceSubtask.setSendstate(7L);
                            serviceSubtask.setRemark("setFailPreachForm方法 当前的preachform已经是最后一个了, 人工发送超时");
                            serviceSubtask.setRemark("人工发送超时");
                        }
                        serviceSubtaskMapper.updateServiceSubtask(serviceSubtask);
                        return true;

 ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/RyTask.java

@@ -1002,7 +1002,7 @@
                    //人工发送超时
                    if(ObjectUtils.isNotEmpty(serviceSubtask.getCurrentPreachform()) && serviceSubtask.getCurrentPreachform().equals("1")){
                        serviceSubtask.setSendstate(7L);
                        serviceSubtask.setRemark("getSendPreachform方法 检查是否所有sendstate不等于9, 人工发送超时");
                        serviceSubtask.setRemark("人工发送超时");
                    }
                    serviceSubtaskMapper.updateServiceSubtask(serviceSubtask);
                    //修改发送状态
@@ -1227,14 +1227,14 @@
                if(ObjectUtils.isNotEmpty(preachform) && preachform.equals("1")){
                    serviceSubtask.setCurrentPreachform(preachform);
                    serviceSubtask.setSendstate(7L);
                    serviceSubtask.setRemark("setSuccessPreachForm方法，人工发送超时");
                    serviceSubtask.setRemark("人工发送超时");
                    serviceSubtaskMapper.updateServiceSubtask(serviceSubtask);
                    return true;
                }else {
                    if (failSendstate.equals("4") || failSendstate.equals("5")) {
                        serviceSubtask.setCurrentPreachform(preachform);
                        serviceSubtask.setSendstate(5L);
                        serviceSubtask.setRemark("setSuccessPreachForm方法，当前的preachform已经是最后一个了，全部执行失败");
                        //serviceSubtask.setRemark("setSuccessPreachForm方法，当前的preachform已经是最后一个了，全部执行失败");
                        serviceSubtaskMapper.updateServiceSubtask(serviceSubtask);
                        return true;
                    }

 smartor/src/main/java/com/smartor/service/impl/PatMedInhospServiceImpl.java

@@ -996,7 +996,7 @@
        serviceSubtask.setLongSendTime(newDate);
        serviceSubtask.setVisitTime(newDate);

        if (patMedInhosp1.getFudate() != null) serviceSubtask.setVisitTime(patMedInhosp1.getFudate());
//        if (patMedInhosp1.getFudate() != null && !patMedInhosp1.getOrgid().equals("47255004333112711A1001")) serviceSubtask.setVisitTime(patMedInhosp1.getFudate());
        //如果是通知的话，需要提前几天将通过短信发出去（具体几天，这个可以配置在sys_conf表中）
        if ("3".equals(serviceTask.getType())) {
            serviceSubtask.setVisitTime(minusDay(newDate, StringUtils.isNotEmpty(config) ? Integer.parseInt(config) : 0));

 smartor/src/main/java/com/smartor/service/impl/ServiceSubtaskServiceImpl.java

@@ -836,9 +836,9 @@

                } else if (serviceTaskVO.getAppltype().equals("4")) {
                    ServiceTaskoper serviceTaskoper = new ServiceTaskoper();
                    if (StringUtils.isEmpty(serviceTaskVO.getOpcode())) {
                        throw new BaseException("手术编码为空");
                    }
//                    if (StringUtils.isEmpty(serviceTaskVO.getOpcode())) {
//                        throw new BaseException("手术编码为空");
//                    }
//                serviceTaskoper.setOpcode(serviceTaskVO.getOpcode());
                    serviceTaskoper.setOpdesc(serviceTaskVO.getOpdesc());
                    serviceTaskoper.setOplevelcode(serviceTaskVO.getOplevelcode());