陈昶聿
2 天以前 6b34bef8ed4676dc10d452d8ebdb9eb977a671cf
smartor/src/main/java/com/smartor/service/impl/ServiceExternalServiceImpl.java
@@ -154,6 +154,9 @@
        sysUser.setCampusid("1");
        //根据userName判断一下,是不是之前有新增
        SysUser sysUser1 = null;
        if(StringUtils.isEmpty(sysUser.getUserName()) || StringUtils.isEmpty(sysUser.getOrgid())){
            return false;
        }
        List<SysUser> sysUserList = sysUserMapper.selectUserList(sysUser);
        if (CollectionUtils.isNotEmpty(sysUserList)) {
            sysUser1 = sysUserList.get(0);
@@ -548,6 +551,17 @@
        }
        if (CollectionUtils.isNotEmpty(epai)) externalInHospPatientAddrInfo = epai2.get(0);
        if (CollectionUtils.isNotEmpty(epli)) externalInHospPatientLiaisonInfo = epli2.get(0);
        List<HashMap<String, Object>> bingRenKZXXList = ObjectUtils.isNotEmpty(yeWuXX) ? (List<HashMap<String, Object>>) yeWuXX.get("BingRenKZXXList") : null;
        if (CollectionUtils.isNotEmpty(bingRenKZXXList)) {
            for(HashMap<String, Object> bingRenKZXX : bingRenKZXXList){
                String XiangMuDM = ObjectUtils.isNotEmpty(bingRenKZXX.get("XiangMuDM")) ? bingRenKZXX.get("XiangMuDM").toString() : null;
                if(StringUtils.isNotEmpty(XiangMuDM) && XiangMuDM.equals("DuanHaoXX")){
                    externalInHospPatientInfo.setDuanHaoXX(ObjectUtils.isNotEmpty(bingRenKZXX.get("XiangMuZMC")) ? bingRenKZXX.get("XiangMuZMC").toString() : null);
                    break;
                }
            }
        }
        //新增患者基本信息新增或修改
        PatArchive patArchive = addPatArchive(externalInHospPatientInfo, externalInHospPatientAddrInfo, externalInHospPatientLiaisonInfo);
@@ -1487,6 +1501,9 @@
        patArchive.setTelcode(externalInHospPatientInfo.getLianXiDH());
        if (StringUtils.isEmpty(patArchive.getTelcode()))
            patArchive.setTelcode(externalInHospPatientInfo.getLianXiRDH());
        //增加短号信息
        if (StringUtils.isNotEmpty(externalInHospPatientInfo.getDuanHaoXX()))
            patArchive.setTelshortcode(externalInHospPatientInfo.getDuanHaoXX());
        patArchive.setRelativetelcode(externalInHospPatientInfo.getLianXiRDH());
        patArchive.setGuid(externalInHospPatientInfo.getZuZhiJGID());
        patArchive.setInhospno(externalInHospPatientInfo.getBingAnHao());