陈昶聿
5 天以前 55d724ddd52b2acb6e7ee2d291e04e4b6d96ad19
smartor/src/main/java/com/smartor/service/impl/PatMedOuthospServiceImpl.java
@@ -482,14 +482,16 @@
    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());
        serviceSubtask.setDrname(patMedOuthosp.getDrname());
        serviceSubtask.setDeptcode(patMedOuthosp.getDeptcode());
        serviceSubtask.setLeaveldeptcode(patMedOuthosp.getDeptcode());
        serviceSubtask.setInhospid(patMedOuthosp.getId());
        serviceSubtask.setHospno(patMedOuthosp.getOuthospno());
        serviceSubtask.setDeptname(patMedOuthosp.getDeptname());
        serviceSubtask.setLeaveldeptname(patMedOuthosp.getDeptname());
        serviceSubtask.setTemplateid(serviceTask.getTemplateid());
        serviceSubtask.setTemplatename(serviceTask.getTemplatename());
        serviceSubtask.setPatid(patArchive.getId());
@@ -658,7 +660,7 @@
                patMedOuthosp.getOrgid().equals("47255004333112711A1001") && !CollectionUtils.isEmpty(inhospids)){
            serviceSubtaskEntity0.setInhospids(inhospids);
        }else {
            serviceSubtaskEntity0.setDeptcode(deptcode);
            serviceSubtaskEntity0.setLeaveldeptcode(deptcode);
        }
        serviceSubtaskEntity0.setSort(0);
@@ -681,7 +683,7 @@
                serviceSubtask1.setVisitDeptCode(serviceSubtask0.getVisitDeptCode());
                serviceSubtask1.setVisitDeptName(serviceSubtask0.getVisitDeptName());
                //新任务科室是当前出院科室
                serviceSubtask1.setDeptcode(patMedOuthosp.getDeptcode());
                serviceSubtask1.setLeaveldeptcode(patMedOuthosp.getDeptcode());
                serviceSubtask1.setCreateTime(new Date());
                serviceSubtask1.setUpdateTime(new Date());
                serviceSubtask1.setFinishtime(null);
@@ -697,7 +699,7 @@
//            serviceSubtaskEntity0.setOrgid(patMedOuthosp.getOrgid());
//            serviceSubtaskEntity.setSendstates(new ArrayList<>(Arrays.asList(6L)));
//            serviceSubtaskEntity.setPatid(patid);
//            serviceSubtaskEntity.setDeptcode(deptcode);
//            serviceSubtaskEntity.setLeaveldeptcode(deptcode);
//            serviceSubtaskEntity.setSort(0);
//            List<ServiceSubtask> serviceSubtaskList = serviceSubtaskMapper.selectServiceSubtaskList(serviceSubtaskEntity);
//            if(!CollectionUtils.isEmpty(serviceSubtaskList)){