陈昶聿
11 小时以前 fe65881855686cd33a81e864cefd0307bcdeac78
smartor/src/main/java/com/smartor/service/impl/PatMedInhospServiceImpl.java
@@ -643,17 +643,20 @@
                                firstVisit = true;
                            }
                            if (endTime1.before(endTime) && serviceSubtask1.getServiceType().equals("2")
                                && !firstVisit) {
                                //如果当前循环的子任务的出院时间在“准备新增的子任务”的出院时间之前,则将循环的子任务停掉
                                serviceSubtask1.setSendstate(4L);
                                if (StringUtils.isNotEmpty(serviceSubtask.getRemark()))
                                    serviceSubtask.setRemark(serviceSubtask.getRemark() + ",科室/病区患者再入院");
                                else serviceSubtask.setRemark("科室/病区患者再入院");
                                serviceSubtask1.setResult("error");
                                serviceSubtask1.setUpdateBy(serviceTask.getUpdateBy());
                                serviceSubtask1.setUpdateTime(new Date());
                                Boolean aBoolean = serviceSubtaskMapper.updateServiceSubtask(serviceSubtask1);
                                if (aBoolean) i = 1;
                            ) {
                                if(!firstVisit){
                                    //景宁的不需要将再入院的子任务停掉
                                    //如果当前循环的子任务的出院时间在“准备新增的子任务”的出院时间之前,则将循环的子任务停掉
                                    serviceSubtask1.setSendstate(4L);
                                    if (StringUtils.isNotEmpty(serviceSubtask.getRemark()))
                                        serviceSubtask.setRemark(serviceSubtask.getRemark() + ",科室/病区患者再入院");
                                    else serviceSubtask.setRemark("科室/病区患者再入院");
                                    serviceSubtask1.setResult("error");
                                    serviceSubtask1.setUpdateBy(serviceTask.getUpdateBy());
                                    serviceSubtask1.setUpdateTime(new Date());
                                    Boolean aBoolean = serviceSubtaskMapper.updateServiceSubtask(serviceSubtask1);
                                    if (aBoolean) i = 1;
                                }
                            } else {
                                //相反,则将当有的数据停掉
                                serviceSubtask.setResult("error");