【丽水】出院随访查询，统计没有同步excep

陈昶聿

2 天以前 f282cbb3b22ab8c0cf3d5b9e58ab18af381e4d22

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

@@ -315,7 +315,10 @@
        List<ServiceSubtaskRes> serviceSubtaskResList = new ArrayList<>();
        for (ServiceSubtask serviceSubtask : selectServiceSubtaskList) {
            ServiceSubtaskRes serviceSubtaskRes = DtoConversionUtils.sourceToTarget(serviceSubtask, ServiceSubtaskRes.class);
            serviceSubtaskRes.setContinueContent(JSONObject.parseObject(serviceSubtask.getContinueContent()));
            if(ObjectUtils.isNotEmpty(serviceSubtask.getContinueContent())){
                serviceSubtaskRes.setContinueContent(serviceSubtask.getContinueContent());
            }
            serviceSubtaskResList.add(serviceSubtaskRes);
        }
        return serviceSubtaskResList;
    }
@@ -617,7 +620,8 @@
                            serviceTaskdept.setDeptCode(deptCode);
                            serviceTaskdept.setDeptType("1");
                            serviceTaskdept.setServiceType(serviceTaskVO.getServiceType());
                            serviceTaskdeptService.insertServiceTaskdept(serviceTaskdept);
                            //先通过任务ID、部门code,判断ServiceTaskdept是否存在，不存在则新增，存在则修改
                            serviceTaskdeptService.insertOrUpdateServiceTaskdept(serviceTaskdept);
                        }
                    }
                    if (StringUtils.isNotEmpty(serviceTaskVO.getLeavehospitaldistrictcode())) {
@@ -626,7 +630,8 @@
                            serviceTaskdept.setDeptCode(districtcode);
                            serviceTaskdept.setDeptType("2");
                            serviceTaskdept.setServiceType(serviceTaskVO.getServiceType());
                            serviceTaskdeptService.insertServiceTaskdept(serviceTaskdept);
                            //先通过任务ID、部门code,判断ServiceTaskdept是否存在，不存在则新增，存在则修改
                            serviceTaskdeptService.insertOrUpdateServiceTaskdept(serviceTaskdept);
                        }
                    }
                }
@@ -759,15 +764,8 @@
                            serviceTaskdept.setDeptCode(deptCode);
                            serviceTaskdept.setDeptType("1");
                            serviceTaskdept.setServiceType(serviceTaskVO.getServiceType());
                            ServiceTaskdept st = new ServiceTaskdept();
                            st.setDeptCode(deptCode);
                            st.setTaskId(serviceTask.getTaskid());
                            List<ServiceTaskdept> serviceTaskdepts = serviceTaskdeptService.selectServiceTaskdeptList(st);
                            if (CollectionUtils.isEmpty(serviceTaskdepts)) {
                                serviceTaskdeptService.insertServiceTaskdept(serviceTaskdept);
                            } else {
                                serviceTaskdeptService.updateServiceTaskdept(serviceTaskdept);
                            }
                            //先通过任务ID、部门code,判断ServiceTaskdept是否存在，不存在则新增，存在则修改
                            serviceTaskdeptService.insertOrUpdateServiceTaskdept(serviceTaskdept);
                        }
                    }
                    if (StringUtils.isNotEmpty(serviceTaskVO.getLeavehospitaldistrictcode())) {
@@ -782,15 +780,7 @@
                            serviceTaskdept.setDeptType("2");
                            serviceTaskdept.setServiceType(serviceTaskVO.getServiceType());
                            //先通过任务ID、部门code,判断ServiceTaskdept是否存在，不存在则新增，存在则修改
                            ServiceTaskdept st = new ServiceTaskdept();
                            st.setDeptCode(districtcode);
                            st.setTaskId(serviceTask.getTaskid());
                            List<ServiceTaskdept> serviceTaskdepts = serviceTaskdeptService.selectServiceTaskdeptList(st);
                            if (CollectionUtils.isEmpty(serviceTaskdepts)) {
                                serviceTaskdeptService.insertServiceTaskdept(serviceTaskdept);
                            } else {
                                serviceTaskdeptService.updateServiceTaskdept(serviceTaskdept);
                            }
                            serviceTaskdeptService.insertOrUpdateServiceTaskdept(serviceTaskdept);
                        }
                    }
                } else if (serviceTaskVO.getAppltype().equals("3")) {