smartor/src/main/java/com/smartor/domain/PatMedInhosp.java

@@ -285,7 +285,7 @@
     * 科室长期任务，是否处理：0未处理   1处理
     */
    @ApiModelProperty(value = "长期任务，是否处理：0未处理   1处理成功    2处理失败 ")
    private String deptcheckFlag;
    private String  deptcheckFlag;
    /**
     * 病区长期任务，是否处理：0未处理   1处理
     */

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

@@ -259,7 +259,10 @@

            } catch (Exception e) {
                e.printStackTrace();
                log.error("人员处理出异常了：{}", e.getMessage());
                log.error("人员科室处理出异常了：{}", e.getMessage());
                patMedInhosp1.setDeptcheckFlag("2");
                patMedInhosp1.setLongTaskReason("人员科室处理异常：" + e.getMessage());
                patMedInhospMapper.updatePatMedInhosp(patMedInhosp1);
            }
        }

@@ -311,7 +314,10 @@

                } catch (Exception e) {
                    e.printStackTrace();
                    log.error("人员处理出异常了：{}", e.getMessage());
                    log.error("人员病区处理出异常了：{}", e.getMessage());
                    pmiBQ1.setWardcheckFlag("2");
                    pmiBQ1.setLongTaskReason("人员病区处理异常：" + e.getMessage());
                    patMedInhospMapper.updatePatMedInhosp(pmiBQ1);
                }
            }

@@ -363,7 +369,10 @@

                } catch (Exception e) {
                    e.printStackTrace();
                    log.error("人员处理出异常了：{}", e.getMessage());
                    log.error("人员疾病处理出异常了：{}", e.getMessage());
                    pmiJB.setDiagcheckFlag("2");
                    pmiJB.setLongTaskReason("人员疾病处理异常：" + e.getMessage());
                    patMedInhospMapper.updatePatMedInhosp(pmiJB);
                }
            }
        }

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

@@ -184,6 +184,10 @@
        List<ServiceSubtask> list = selectServiceSubtaskList(serviceSubtaskVO);

        ServiceTask serviceTask = serviceTaskService.selectServiceTaskByTaskid(serviceSubtask.getTaskid());
        if(ObjectUtils.isEmpty(serviceTask)){
            log.error("找不到对应的serviceTask, orgid：{}, taskid: {}", serviceSubtask.getOrgid(), serviceSubtask.getTaskid());
            return null;
        }
        if (CollectionUtils.isEmpty(list) || list.size() == 0) {
            ServiceTaskVO serviceTaskVO = DtoConversionUtils.sourceToTarget(serviceTask, ServiceTaskVO.class);
            ObjectMapper objectMapper = new ObjectMapper();

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

@@ -246,6 +246,9 @@
//        }
        //通过任务ID获取模板ID
        ServiceTask serviceTask = selectServiceTaskByTaskid(taskid);
        if (serviceTask == null) {
            throw new BaseException("任务不存在或已被删除，taskid: " + taskid);
        }
        List info = new ArrayList();
        if (serviceTask.getType().equals("1")) {
            //随访
@@ -300,6 +303,9 @@
    public Map<String, Object> getScriptByCondition(Long taskid, String zyserialnum, String mzserialnum, String tsserialnum) {
        //通过任务ID获取模板ID
        ServiceTask serviceTask = selectServiceTaskByTaskid(taskid);
        if (serviceTask == null) {
            throw new BaseException("任务不存在或已被删除，taskid: " + taskid);
        }
        //通过模板ID获取问题信息
        SvyTaskTemplateScript svyTaskTemplateScript = new SvyTaskTemplateScript();
        svyTaskTemplateScript.setTemplateID(Long.valueOf(serviceTask.getTemplateid()));