【市一】随访增加院区限制

陈昶聿

4 小时以前 5e09cd9bc9f370058460ca56222a0c82096a8c7d

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

@@ -482,6 +482,8 @@
    public ServiceSubtask boxedServiceSubtask(ServiceTask serviceTask, PatMedOuthosp patMedOuthosp, PatArchive patArchive) {
        ServiceSubtask serviceSubtask = DtoConversionUtils.sourceToTarget(serviceTask, ServiceSubtask.class);
        serviceSubtask.setTaskid(serviceTask.getTaskid());
        serviceSubtask.setOrgid(serviceTask.getOrgid());
        serviceSubtask.setCampusid(serviceTask.getCampusid());
        if (StringUtils.isNotEmpty(serviceTask.getLibtemplateid()))
            serviceSubtask.setLibtemplateid(Long.valueOf(serviceTask.getLibtemplateid()));
        serviceSubtask.setDrcode(patMedOuthosp.getDrcode());
@@ -546,7 +548,8 @@
        Integer num = 0;

        //景宁 存在相同诊断的门诊记录则新增再次随访,否则新增随访
        if(patMedOuthosp.getOrgid().equals("47255004333112711A1001")){
        if(ObjectUtils.isNotEmpty(patMedOuthosp.getOrgid()) &&
                patMedOuthosp.getOrgid().equals("47255004333112711A1001")){
            PatMedOuthosp patMedOuthospVo = new PatMedOuthosp();
            List<PatMedOuthosp> patMedOuthosps = new ArrayList<>();
            patMedOuthospVo.setOrgid(patMedOuthosp.getOrgid());
@@ -653,7 +656,8 @@
        serviceSubtaskEntity0.setSendstates(new ArrayList<>(Arrays.asList(1L, 2L, 3L, 7L)));
        serviceSubtaskEntity0.setPatid(patid);
        //景宁根据诊断再次随访
        if(patMedOuthosp.getOrgid().equals("47255004333112711A1001") && !CollectionUtils.isEmpty(inhospids)){
        if(ObjectUtils.isNotEmpty(patMedOuthosp.getOrgid()) &&
                patMedOuthosp.getOrgid().equals("47255004333112711A1001") && !CollectionUtils.isEmpty(inhospids)){
            serviceSubtaskEntity0.setInhospids(inhospids);
        }else {
            serviceSubtaskEntity0.setDeptcode(deptcode);