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

陈昶聿

13 小时以前 fe65881855686cd33a81e864cefd0307bcdeac78

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

@@ -636,8 +636,16 @@
                                continue;
                            }
                            //再入院逻辑
                            //景宁 出院首次（7天）随访一定要做
                            boolean firstVisit = false;
                            if (orgId.equals("47255004333112711A1001")
                                    && serviceSubtask1.getVisitCount() != null && serviceSubtask1.getVisitCount() == 1){
                                firstVisit = true;
                            }
                            if (endTime1.before(endTime) && serviceSubtask1.getServiceType().equals("2")
                            ) {
                                if(!firstVisit){
                                    //景宁的不需要将再入院的子任务停掉
                                //如果当前循环的子任务的出院时间在“准备新增的子任务”的出院时间之前，则将循环的子任务停掉
                                serviceSubtask1.setSendstate(4L);
                                if (StringUtils.isNotEmpty(serviceSubtask.getRemark()))
@@ -648,6 +656,7 @@
                                serviceSubtask1.setUpdateTime(new Date());
                                Boolean aBoolean = serviceSubtaskMapper.updateServiceSubtask(serviceSubtask1);
                                if (aBoolean) i = 1;
                                }
                            } else {
                                //相反,则将当有的数据停掉
                                serviceSubtask.setResult("error");