代码提交

liusheng

10 小时以前 8114cd50c016dd4de2c650fe006226defb4bbb8c

代码提交

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

@@ -638,12 +638,12 @@
                            //再入院逻辑
                            //景宁 出院首次（7天）随访一定要做
                            boolean firstVisit = false;
                            if (orgId.equals("47255004333112711A1001")
                                    && serviceSubtask1.getVisitCount() != null && serviceSubtask1.getVisitCount() == 1){
                            if (orgId.equals("47255004333112711A1001") && serviceSubtask1.getVisitCount() != null && serviceSubtask1.getVisitCount() == 1) {
                                firstVisit = true;
                            }
                            if (endTime1.before(endTime) && serviceSubtask1.getServiceType().equals("2")
                                && !firstVisit) {
                            if (!firstVisit) {
                                //景宁的不需要将之前的任务停掉，全生成
                                if (endTime1.before(endTime) && serviceSubtask1.getServiceType().equals("2")) {
                                //如果当前循环的子任务的出院时间在“准备新增的子任务”的出院时间之前，则将循环的子任务停掉
                                serviceSubtask1.setSendstate(4L);
                                if (StringUtils.isNotEmpty(serviceSubtask.getRemark()))
@@ -664,6 +664,7 @@
                                serviceSubtask.setCreateBy(serviceTask.getCreateBy());
                                serviceSubtask.setCreateTime(new Date());
                                i = serviceSubtaskMapper.insertServiceSubtask(serviceSubtask);
                                }
                            }
                        } else if (type == 3) {
                            //type=3 表示疾病
@@ -845,12 +846,10 @@
            serviceSubtask.setVisitTime(minusDay(newDate, StringUtils.isNotEmpty(config) ? Integer.parseInt(config) : 0));
            //如果该出院记录有随访时间，则用他自己的随访时间
            if (patMedInhosp1.getFudate() != null){
                serviceSubtask.setVisitTime(minusDay(patMedInhosp1.getFudate(),
                        StringUtils.isNotEmpty(config) ? Integer.parseInt(config) : 0));
                serviceSubtask.setVisitTime(minusDay(patMedInhosp1.getFudate(), StringUtils.isNotEmpty(config) ? Integer.parseInt(config) : 0));
            }else{
                //判断是不是景宁
                if (patMedInhosp1.getOrgid().equals("47255004333112711A1001"))
                {
                if (patMedInhosp1.getOrgid().equals("47255004333112711A1001")) {
                    serviceSubtask.setVisitTime(null);
                    //不执行
                    serviceSubtask.setSendstate(4L);