代码提交

liusheng

12 小时以前 c62e26954e41360fc6a2efc874815aa84f8b0073

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

@@ -156,6 +156,10 @@
        return serviceSubtaskMapper.selectServiceSubtaskList(serviceSubtaskVO);
    }

    public List<ServiceSubtask> selectServiceSubtaskListAgain(ServiceSubtaskVO serviceSubtaskVO) {
        return serviceSubtaskMapper.selectServiceSubtaskListAgain(serviceSubtaskVO);
    }

    @Override
    public ServiceTaskVO queryTaskByCondition(ServiceSubtask serviceSubtask) {
        //定义患者与单一任务关联表集合
@@ -284,11 +288,13 @@
        Integer fssb = 0;
        Integer yfs = 0;
        Integer blq = 0;
        Integer dsf = 0;
        for (ServiceSubtask serviceSubtask : selectServiceSubtaskList) {
            if (serviceSubtask.getSendstate() == 4L) wzx = wzx + 1;
            else if (serviceSubtask.getSendstate() != 4L) ysf = ysf + 1;
            if (serviceSubtask.getSendstate() == 5L) fssb = fssb + 1;
            if (serviceSubtask.getSendstate() >= 3L || serviceSubtask.getSendstate() == 1L) yfs = yfs + 1;
            if (serviceSubtask.getSendstate() == 2L) dsf = dsf + 1;
            if (serviceSubtask.getSendstate() == 1L) blq = blq + 1;
            if (serviceSubtask.getExcep().equals("1")) yc = yc + 1;
        }
@@ -298,6 +304,7 @@
        map.put("fssb", fssb);
        map.put("yfs", yfs);
        map.put("blq", blq);
        map.put("dsf", dsf);

        return map;
    }
@@ -337,7 +344,7 @@
            serviceSubtask1.setIsVisitAgain(2);
            serviceSubtaskMapper.updateServiceSubtask(serviceSubtask1);
            return "无需再次随访，任务被标记不在执行";
        } else if (patArchive.getNotrequiredFlag().equals("1")) {
        } else if (StringUtils.isNotEmpty(patArchive.getNotrequiredFlag()) && patArchive.getNotrequiredFlag().equals("1")) {
            serviceSubtask1.setIsVisitAgain(2);
            serviceSubtaskMapper.updateServiceSubtask(serviceSubtask1);
            return "无需再次随访，患者被标记不需要被服务";
@@ -488,6 +495,7 @@
                    ServiceTaskdept serviceTaskdept = new ServiceTaskdept();
                    serviceTaskdept.setTaskId(serviceTask.getTaskid());
                    serviceTaskdept.setTaskName(serviceTask.getTaskName());
                    serviceTaskdept.setOrgid(serviceTask.getOrgid());
                    serviceTaskdept.setLongtask(0L);
                    if (serviceTaskVO.getLongTask() == 1) serviceTaskdept.setLongtask(1L);
                    if (StringUtils.isNotEmpty(serviceTaskVO.getDeptcode())) {