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

陈昶聿

7 小时以前 784f151c787a10f0164d591b80decbff9f71c9e0

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

@@ -642,10 +642,9 @@
                                    && serviceSubtask1.getVisitCount() != null && serviceSubtask1.getVisitCount() == 1){
                                firstVisit = true;
                            }
                            if (endTime1.before(endTime) && serviceSubtask1.getServiceType().equals("2")
                            ) {
                                if(!firstVisit){
                                    //景宁的不需要将再入院的子任务停掉
                            //景宁的不需要将再入院的子任务停掉
                            if(!firstVisit){
                                if (endTime1.before(endTime) && serviceSubtask1.getServiceType().equals("2")) {
                                    //如果当前循环的子任务的出院时间在“准备新增的子任务”的出院时间之前，则将循环的子任务停掉
                                    serviceSubtask1.setSendstate(4L);
                                    if (StringUtils.isNotEmpty(serviceSubtask.getRemark()))
@@ -656,17 +655,17 @@
                                    serviceSubtask1.setUpdateTime(new Date());
                                    Boolean aBoolean = serviceSubtaskMapper.updateServiceSubtask(serviceSubtask1);
                                    if (aBoolean) i = 1;
                                } else {
                                    //相反,则将当有的数据停掉
                                    serviceSubtask.setResult("error");
                                    serviceSubtask.setSendstate(4L);
                                    if (StringUtils.isNotEmpty(serviceSubtask.getRemark()))
                                        serviceSubtask.setRemark(serviceSubtask.getRemark() + ",当前患者出院时间后有待执行的出院随访长期任务");
                                    else serviceSubtask.setRemark("当前患者出院时间后有待执行的出院随访长期任务");
                                    serviceSubtask.setCreateBy(serviceTask.getCreateBy());
                                    serviceSubtask.setCreateTime(new Date());
                                    i = serviceSubtaskMapper.insertServiceSubtask(serviceSubtask);
                                }
                            } else {
                                //相反,则将当有的数据停掉
                                serviceSubtask.setResult("error");
                                serviceSubtask.setSendstate(4L);
                                if (StringUtils.isNotEmpty(serviceSubtask.getRemark()))
                                    serviceSubtask.setRemark(serviceSubtask.getRemark() + ",当前患者出院时间后有待执行的出院随访长期任务");
                                else serviceSubtask.setRemark("当前患者出院时间后有待执行的出院随访长期任务");
                                serviceSubtask.setCreateBy(serviceTask.getCreateBy());
                                serviceSubtask.setCreateTime(new Date());
                                i = serviceSubtaskMapper.insertServiceSubtask(serviceSubtask);
                            }
                        } else if (type == 3) {
                            //type=3 表示疾病