【景宁】景宁 出院首次（7天）随访一定要做

陈昶聿

7 小时以前 eb09fd02770127a349526447e879fcadfa387ee9

【景宁】景宁 出院首次（7天）随访一定要做

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

@@ -550,6 +550,7 @@
    //将患者放到subtask中
    private void writeInSubTask(Long taskid, Boolean check, PatMedInhosp patMedInhosp1, PatArchive patArchive, Integer type, String config) {
        String longTaskReason = patMedInhosp1.getLongTaskReason();
        String orgId = patMedInhosp1.getOrgid();
        if (StringUtils.isEmpty(longTaskReason)) longTaskReason = "";
        ServiceTask st = new ServiceTask();
        st.setTaskid(taskid);
@@ -634,7 +635,15 @@
                                if (aBoolean) i = 1;
                                continue;
                            }
                            if (endTime1.before(endTime) && serviceSubtask1.getServiceType().equals("2")) {
                            //再入院逻辑
                            //景宁 出院首次（7天）随访一定要做
                            boolean firstVisit = false;
                            if (orgId.equals("47255004333112711A1001")
                                    && serviceSubtask1.getVisitCount() != null && serviceSubtask1.getVisitCount() == 1){
                                firstVisit = true;
                            }
                            if (endTime1.before(endTime) && serviceSubtask1.getServiceType().equals("2")
                                && !firstVisit) {
                                //如果当前循环的子任务的出院时间在“准备新增的子任务”的出院时间之前，则将循环的子任务停掉
                                serviceSubtask1.setSendstate(4L);
                                if (StringUtils.isNotEmpty(serviceSubtask.getRemark()))