smartor代码库
已修改2个文件
46 ■■■■■ 文件已修改
ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/ServiceTaskController.java 8 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
smartor/src/main/java/com/smartor/service/impl/ServiceExternalServiceImpl.java 38 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 
 ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/ServiceTaskController.java


@@ -29,6 +29,7 @@


import java.util.Collections;


import java.util.List;


import java.util.Map;


import java.util.Optional;


import java.util.stream.Collectors;




/**


@@ -77,15 +78,16 @@


        serviceSubtaskVO.setStartOutHospTime(serviceTask.getStartOutHospTime());


        serviceSubtaskVO.setEndOutHospTime(serviceTask.getEndOutHospTime());


        // 批量查询所有子任务


        Map<Long, List<ServiceSubtask>> subtaskMap = iServiceSubtaskService


        Map<String, List<ServiceSubtask>> subtaskMap = iServiceSubtaskService


                .selectServiceSubtaskList(serviceSubtaskVO)


                .stream()


                .collect(Collectors.groupingBy(ServiceSubtask::getTaskid));


                .filter(subtask -> subtask.getTaskid() != null)  // 添加过滤


                .collect(Collectors.groupingBy(subtask -> Optional.ofNullable(subtask.getLeavehospitaldistrictcode()).orElse("Unknown")));






        if (CollectionUtils.isNotEmpty(serviceTaskVOS)) {


            for (ServiceTaskVO taskVO : serviceTaskVOS) {


                List<ServiceSubtask> subtasks = subtaskMap.getOrDefault(taskVO.getTaskid(), Collections.emptyList());


                List<ServiceSubtask> subtasks = subtaskMap.getOrDefault(taskVO.getTaskid().toString(), Collections.emptyList());




                if (CollectionUtils.isNotEmpty(subtasks)) {


                    //已发送（子任务中的 sendstate=1为被领取）




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


@@ -89,6 +89,8 @@


        }


        SysDept sysDept = new SysDept();


        sysDept.setOrgid(externalDept.getZuZhiJGID());


        //丽水无院区，默认值是 1


        sysDept.setCampusid("1");


        sysDept.setHisDeptId(externalDept.getKeShiID());


        sysDept.setHisParentId(externalDept.getFuKeSID());


        //通过his的父科室ID去找到科室ID,填充parentId


@@ -137,6 +139,8 @@


        SysUser sysUser = new SysUser();


        sysUser.setUserName(externalUserInfo.getYongHuDLM());


        sysUser.setOrgid(externalUserInfo.getZuZhiJGID());


        //丽水无院区，默认值是 1


        sysUser.setCampusid("1");


        //根据userName判断一下，是不是之前有新增


        SysUser sysUser1 = null;


        List<SysUser> sysUserList = sysUserMapper.selectUserList(sysUser);


@@ -214,6 +218,8 @@


        baseOrganization.setUpdateTime(externalOrganInfo.getUpdateTime());


        baseOrganization.setUpdateBy(externalOrganInfo.getUpdateBy());


        baseOrganization.setOrgid(externalOrganInfo.getZuZhiJGID());


        //丽水无院区，默认值是 1


        baseOrganization.setCampusid("1");


        if (StringUtils.isNotEmpty(externalOrganInfo.getShiJianDM()) && externalOrganInfo.getShiJianDM().equals("1")) {


            int i = baseOrganizationMapper.insertBaseOrganization(baseOrganization);


            log.info("ServiceExternalServiceImpl---addOrganInfo是否新增成功：{}", i);


@@ -494,6 +500,8 @@


        if (CollectionUtils.isNotEmpty(patMedInhospList)) {


            patMedInhosp1.setUpdateTime(new Date());


            patMedInhosp1.setOrgid(ObjectUtils.isNotEmpty(BingRenXX) && ObjectUtils.isNotEmpty(BingRenXX.get("ZuZhiJGID")) ? BingRenXX.get("ZuZhiJGID").toString() : null);


            //丽水无院区，默认值是 1


            patMedInhosp1.setCampusid("1");


            if (CollectionUtils.isNotEmpty(noLongTask) && noLongTask.contains(patMedInhosp1.getOrgid())) {


                //不需要长期任务随访


                patMedInhosp1.setFuflag("1");


@@ -507,6 +515,8 @@


                patMedInhosp1.setLeavehospitaldistrictname(ObjectUtils.isNotEmpty(BingRenXX.get("DangQianBQMC")) ? BingRenXX.get("DangQianBQMC").toString() : null);


                patMedInhosp1.setLeavehospitaldistrictcode(ObjectUtils.isNotEmpty(BingRenXX.get("DangQianBQID")) ? BingRenXX.get("DangQianBQID").toString() : null);


                patMedInhosp1.setOrgid(ObjectUtils.isNotEmpty(BingRenXX.get("ZuZhiJGID")) ? BingRenXX.get("ZuZhiJGID").toString() : null);


                //丽水无院区，默认值是 1


                patMedInhosp1.setCampusid("1");


                patMedInhosp1.setPatno(ObjectUtils.isNotEmpty(BingRenXX.get("BingRenID")) ? BingRenXX.get("BingRenID").toString() : null);


                patMedInhosp1.setInhospno(ObjectUtils.isNotEmpty(BingRenXX.get("BingAnHao")) ? BingRenXX.get("BingAnHao").toString() : null);


                patMedInhosp1.setSerialnum(ObjectUtils.isNotEmpty(BingRenXX.get("JiuZhenYWID")) ? BingRenXX.get("JiuZhenYWID").toString() : null);


@@ -650,6 +660,8 @@


                patMedInhosp1.setLeavehospitaldistrictname(ObjectUtils.isNotEmpty(BingRenXX.get("DangQianBQMC")) ? BingRenXX.get("DangQianBQMC").toString() : null);


                patMedInhosp1.setLeavehospitaldistrictcode(ObjectUtils.isNotEmpty(BingRenXX.get("DangQianBQID")) ? BingRenXX.get("DangQianBQID").toString() : null);


                patMedInhosp1.setOrgid(ObjectUtils.isNotEmpty(BingRenXX.get("ZuZhiJGID")) ? BingRenXX.get("ZuZhiJGID").toString() : null);


                //丽水无院区，默认值是 1


                patMedInhosp1.setCampusid("1");


                patMedInhosp1.setPatno(ObjectUtils.isNotEmpty(BingRenXX.get("BingRenID")) ? BingRenXX.get("BingRenID").toString() : null);


                patMedInhosp1.setInhospno(ObjectUtils.isNotEmpty(BingRenXX.get("BingAnHao")) ? BingRenXX.get("BingAnHao").toString() : null);


                patMedInhosp1.setSerialnum(ObjectUtils.isNotEmpty(BingRenXX.get("JiuZhenYWID")) ? BingRenXX.get("JiuZhenYWID").toString() : null);


@@ -854,6 +866,8 @@


                patMedInhosp1.setLeavehospitaldistrictname(ObjectUtils.isNotEmpty(BingRenXX.get("DangQianBQMC")) ? BingRenXX.get("DangQianBQMC").toString() : null);


                patMedInhosp1.setLeavehospitaldistrictcode(ObjectUtils.isNotEmpty(BingRenXX.get("DangQianBQID")) ? BingRenXX.get("DangQianBQID").toString() : null);


                patMedInhosp1.setOrgid(ObjectUtils.isNotEmpty(BingRenXX.get("ZuZhiJGID")) ? BingRenXX.get("ZuZhiJGID").toString() : null);


                //丽水无院区，默认值是 1


                patMedInhosp1.setCampusid("1");


                patMedInhosp1.setPatno(ObjectUtils.isNotEmpty(BingRenXX.get("BingRenID")) ? BingRenXX.get("BingRenID").toString() : null);


                patMedInhosp1.setInhospno(ObjectUtils.isNotEmpty(BingRenXX.get("BingAnHao")) ? BingRenXX.get("BingAnHao").toString() : null);


                patMedInhosp1.setSerialnum(ObjectUtils.isNotEmpty(BingRenXX.get("JiuZhenYWID")) ? BingRenXX.get("JiuZhenYWID").toString() : null);


@@ -938,6 +952,8 @@


        patMedOuthosp.setDeptcode(externalJZInfo.getJiuZhenKSID());


        patMedOuthosp.setAdmitdate(externalJZInfo.getJiuZhenRQ());


        patMedOuthosp.setOrgid(FaSongJGID);


        //丽水无院区，默认值是 1


        patMedOuthosp.setCampusid("1");


        patMedOuthosp.setHospitalname(FaSongJGMC);


        patMedOuthosp.setIdcardno(patArchive.getIdcardno());




@@ -1061,6 +1077,8 @@


        icd10.setIcdcode(externalDiseaseInfo.getIcD10());


        icd10.setDelFlag("0");


        icd10.setOrgid(FaSongJGID);


        //丽水无院区，默认值是 1


        icd10.setCampusid("1");


        //通过icdCode查询一下，是否存在


        List<Icd10> icd10s = icd10Mapper.selectIcd10List(icd10);


        icd10.setHisIcdid(externalDiseaseInfo.getJiBingID());


@@ -1087,6 +1105,8 @@


        ExternalWardArea externalWardArea = BeanUtil.mapToBean(bqxx, ExternalWardArea.class, true);


        SysDept sysDept = new SysDept();


        sysDept.setOrgid(externalWardArea.getZuZhiJGID());


        //丽水无院区，默认值是 1


        sysDept.setCampusid("1");


        sysDept.setHisDeptId(externalWardArea.getBingQuID());




        sysDept.setDeptName(externalWardArea.getBingQuMC());


@@ -1194,6 +1214,8 @@


            patMedOperation.setPatno(externalInHospPatientInfo.getBingRenID());


            patMedOperation.setPatname(externalInHospPatientInfo.getXingMing());


            patMedOperation.setOrgid(externalInHospPatientInfo.getZuZhiJGID());


            //丽水无院区，默认值是 1


            patMedOperation.setCampusid("1");


            patMedOperation.setSerialnum(externalInHospPatientInfo.getJiuZhenYWID());


            patMedOperation.setInhospno(externalInHospPatientInfo.getBingAnHao());


            patMedOperation.setHospitalname(externalInHospPatientInfo.getZuZhiJGMC());


@@ -1257,6 +1279,8 @@


                patMedOperationItem.setOpposition(externalOperationDetail.getShouShuBW());


                patMedOperationItem.setDelFlag("0");


                patMedOperationItem.setOrgid(patMedOperation.getOrgid());


                //丽水无院区，默认值是 1


                patMedOperationItem.setCampusid("1");


                if (externalOperationDetail.getZhuShouSBZ().equals("1") && addMianTableFalg == true) {


                    patMedOperation.setOpcode(externalOperationDetail.getShouShuMCID());


                    patMedOperation.setOpdesc(externalOperationDetail.getShouShuMC());


@@ -1291,6 +1315,8 @@


        if (StringUtils.isEmpty(externalInHospPatientInfo.getZhengJianHM()))


            patArchive.setIdcardno(externalInHospPatientInfo.getJiuZhenKH());


        patArchive.setOrgid(externalInHospPatientInfo.getZuZhiJGID());


        //丽水无院区，默认值是 1


        patArchive.setCampusid("1");


        List<PatArchive> patArchives = null;


        if (ObjectUtils.isNotEmpty(patArchive.getIdcardno()))


            patArchives = patArchiveMapper.selectPatArchiveList(patArchive);


@@ -1353,6 +1379,8 @@


                patArchivecontact.setPatid(patArchive.getId());


                patArchivecontact.setContactname(external.getLianXiRXM());


                patArchivecontact.setOrgid(patArchive.getOrgid());


                //丽水无院区，默认值是 1


                patArchivecontact.setCampusid("1");


                List<PatArchivecontact> patArchivecontacts = patArchivecontactMapper.selectPatArchivecontactList(patArchivecontact);


                patArchivecontact.setContactway(external.getLianXiRDH());


                patArchivecontact.setRelation(external.getGuanXiMC());


@@ -1388,6 +1416,8 @@


            //这里是床位名称还是床位编号？？？？


            patMedInhosp.setBedNo(externalInHospPatientInfo.getDangQianCWMC());


            patMedInhosp.setOrgid(externalInHospPatientInfo.getZuZhiJGID());


            //丽水无院区，默认值是 1


            patMedInhosp.setCampusid("1");


            patMedInhosp.setHospitaldistrictid(externalInHospPatientInfo.getDangQianBQID());


            patMedInhosp.setGuid(externalInHospPatientInfo.getZuZhiJGID());


            patMedInhosp.setInhospstate("0");


@@ -1504,6 +1534,8 @@


            patMedInspection.setProjecttype(0);


        }


        patMedInspection.setOrgid(externalInHospPatientInfo.getZuZhiJGID());


        //丽水无院区，默认值是 1


        patMedInspection.setCampusid("1");


        patMedInspection.setInhospno(externalInHospPatientInfo.getBingAnHao());


        patMedInspection.setPatidHis(externalInHospPatientInfo.getBingRenID());


        patMedInspection.setPatname(externalInHospPatientInfo.getXingMing());


@@ -1586,6 +1618,8 @@


        if (CollectionUtils.isNotEmpty(patMedInspections)) {


            patMedInspection.setUpdateDate(new Date());


            patMedInspection.setOrgid(ObjectUtils.isNotEmpty(xiaoXiTou) && ObjectUtils.isNotEmpty(xiaoXiTou.get("FaSongJGID")) ? xiaoXiTou.get("FaSongJGID").toString() : null);


            //丽水无院区，默认值是 1


            patMedInspection.setCampusid("1");


            //   更新操作


            int i = patMedInspectionMapper.updatePatMedInspection(patMedInspection);


            if (i != 1) return false;


@@ -1611,6 +1645,8 @@


        PatMedInspection patMedInspection = new PatMedInspection();


        PatMedInspectionItem patMedInspectionItem = new PatMedInspectionItem();


        patMedInspection.setOrgid(BingRenXX.get("ZuZhiJGID").toString());


        //丽水无院区，默认值是 1


        patMedInspection.setCampusid("1");


        patMedInspection.setInhospno(BingRenXX.get("BingAnHao").toString());


        patMedInspection.setPatidHis(BingRenXX.get("BingRenID").toString());


        patMedInspection.setPatname(BingRenXX.get("XingMing").toString());


@@ -1626,6 +1662,8 @@


        }


        //检查检验报告数据处理


        patMedInspectionItem.setOrgid(BingRenXX.get("ZuZhiJGID").toString());


        //丽水无院区，默认值是 1


        patMedInspectionItem.setCampusid("1");


        List<PatMedInspectionItem> patMedInspectionItems = patMedInspectionItemMapper.selectPatMedInspectionItemList(patMedInspectionItem);


        if (ObjectUtils.isNotEmpty(JianChaBG)) {


            patMedInspectionItem.setInspectionName(JianChaBG.get("JianChaHao").toString());