代码提交

liusheng

2 天以前 f2ec675bfae05d139285675fc219d0005e3d009d

代码提交

 ruoyi-admin/src/main/java/com/ruoyi/web/component/RedisMqReceiver.java

@@ -395,9 +395,9 @@
                                    serviceSubtaskMapper.updateServiceSubtask(ss);
                                    continue;
                                }
                                log.error("---------mq丽水短信发送入参address：{},  sendMagParam:{},  orgid:{}-------", map.get("address"), sendMagParam, serviceSubtask.getOrgid());
                                log.info("---------mq丽水短信发送入参address：{},  sendMagParam:{},  orgid:{}-------", map.get("address"), sendMagParam, serviceSubtask.getOrgid());
                                String dxCode = getDXCode(map.get("address"), sendMagParam.getPhone(), sendMagParam.getContent(), map.get("sendPersonId"), map.get("sendPersonName"), MsgLSEnum.getHeaderByCode(serviceSubtask.getOrgid()), token);
                                log.error("---------丽水短信发送结果：{}-------", dxCode);
                                log.info("---------丽水短信发送结果：{}-------", dxCode);
                                ObjectMapper objectMapper = new ObjectMapper();
                                Map<String, Object> textParam = objectMapper.readValue(dxCode, Map.class);
                                String code = textParam.get("Code").toString();

 ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/ServiceTaskController.java

@@ -214,7 +214,7 @@
            log.error("getScriptInfoByCondition报错了：{}", e.getMessage());
        }

        log.error("tid和pid的值为：{},{}", tid, pid);
        log.info("tid和pid的值为：{},{}", tid, pid);
        if (StringUtils.isEmpty(serviceTaskScriptQues.getPatfrom())) serviceTaskScriptQues.setPatfrom("0");
        return success(serviceTaskService.getScriptInfoByCondition(tid, pid, true, serviceTaskScriptQues.getPatfrom()));
    }

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

@@ -80,7 +80,7 @@
    @Transactional(rollbackFor = Exception.class)
    @Override
    public Boolean addDeptInfo(Map dataMap) {
        log.error("ServiceExternalServiceImpl---addDeptInfo的新增的值为：{}", dataMap);
        log.info("ServiceExternalServiceImpl---addDeptInfo的新增的值为：{}", dataMap);
        Map yeWuXX = (Map) dataMap.get("YeWuXX");
        Map<String, Object> keShiXX = (Map<String, Object>) yeWuXX.get("KeShiXX");
        ExternalDept externalDept = BeanUtil.mapToBean(keShiXX, ExternalDept.class, true);
@@ -117,10 +117,10 @@
        }
        if (StringUtils.isNotEmpty(externalDept.getShiJianDM()) && externalDept.getShiJianDM().equals("1")) {
            int i = sysDeptMapper.insertDept(sysDept);
            log.error("ServiceExternalServiceImpl---addDeptInfo是否新增成功：{}", i);
            log.info("ServiceExternalServiceImpl---addDeptInfo是否新增成功：{}", i);
        } else {
            int i = sysDeptMapper.updateDept(sysDept);
            log.error("ServiceExternalServiceImpl---addDeptInfo是否修改成功：{}", i);
            log.info("ServiceExternalServiceImpl---addDeptInfo是否修改成功：{}", i);
        }
        return true;
    }
@@ -135,8 +135,12 @@
            throw new BaseException("externalUserInfo是空的，没有数据！！！");
        }
        SysUser sysUser = new SysUser();
        sysUser.setGuid(externalUserInfo.getZuZhiJGID());
        sysUser.setUserName(externalUserInfo.getYongHuDLM());
        sysUser.setOrgid(externalUserInfo.getZuZhiJGID());
        //根据userName判断一下，是不是之前有新增
        SysUser sysUser1 = sysUserMapper.selectUserByUserName(externalUserInfo.getYongHuDLM());

        sysUser.setGuid(externalUserInfo.getZuZhiJGID());
        sysUser.setNickName(externalUserInfo.getYongHuXM());
        sysUser.setUserType("");
        sysUser.setDeptId(null);
@@ -153,17 +157,17 @@
        sysUser.setCreateTime(externalUserInfo.getChuangJianSJ());
        sysUser.setUpdateTime(externalUserInfo.getXiuGaiSJ());
        sysUser.setUpdateBy(externalUserInfo.getXiuGaiRXM());
        sysUser.setOrgid(externalUserInfo.getZuZhiJGID());

        if (StringUtils.isNotEmpty(externalUserInfo.getShiJianDM()) && externalUserInfo.getShiJianDM().equals("3")) {
            sysUser.setStatus("1");
        }
        sysUser.setBirthday(externalUserInfo.getChuShengRQ());
        if (StringUtils.isNotEmpty(externalUserInfo.getShiJianDM()) && externalUserInfo.getShiJianDM().equals("1")) {
        if (ObjectUtils.isEmpty(sysUser1)) {
            int i = sysUserMapper.insertUser(sysUser);
            log.error("ServiceExternalServiceImpl---addDeptInfo是否新增成功：{}", i);
            log.info("ServiceExternalServiceImpl---addDeptInfo是否新增成功：{}", i);
        } else {
            int i = sysUserMapper.updateUser(sysUser);
            log.error("ServiceExternalServiceImpl---addDeptInfo是否修改成功：{}", i);
            log.info("ServiceExternalServiceImpl---addDeptInfo是否修改成功：{}", i);
        }
        return true;
    }
@@ -171,7 +175,7 @@

    @Override
    public Boolean addOrganInfo(Map dataMap) {
        log.error("ServiceExternalServiceImpl---addOrganInfo的新增的值为：{}", dataMap);
        log.info("ServiceExternalServiceImpl---addOrganInfo的新增的值为：{}", dataMap);
        Map yeWuXX = (Map) dataMap.get("YeWuXX");
        Map<String, Object> ZuZhiJGXX = (Map<String, Object>) yeWuXX.get("ZuZhiJGXX");
        ExternalOrganInfo externalOrganInfo = BeanUtil.mapToBean(ZuZhiJGXX, ExternalOrganInfo.class, true);
@@ -188,17 +192,17 @@
        baseOrganization.setOrgid(externalOrganInfo.getZuZhiJGID());
        if (StringUtils.isNotEmpty(externalOrganInfo.getShiJianDM()) && externalOrganInfo.getShiJianDM().equals("1")) {
            int i = baseOrganizationMapper.insertBaseOrganization(baseOrganization);
            log.error("ServiceExternalServiceImpl---addOrganInfo是否新增成功：{}", i);
            log.info("ServiceExternalServiceImpl---addOrganInfo是否新增成功：{}", i);
        } else {
            int i = baseOrganizationMapper.updateBaseOrganization(baseOrganization);
            log.error("ServiceExternalServiceImpl---addOrganInfo是否修改成功：{}", i);
            log.info("ServiceExternalServiceImpl---addOrganInfo是否修改成功：{}", i);
        }
        return true;
    }

    @Override
    public Boolean addCheckupReport(Map dataMap) {
        log.error("ServiceExternalServiceImpl---addCheckupReport的新增的值为：{}", dataMap);
        log.info("ServiceExternalServiceImpl---addCheckupReport的新增的值为：{}", dataMap);
        Map yeWuXX = (Map) dataMap.get("YeWuXX");
        Map<String, Object> ZuZhiJGXX = (Map<String, Object>) yeWuXX.get("ZuZhiJGXX");
        return false;
@@ -206,7 +210,7 @@

    @Override
    public Boolean addInHospInfo(Map dataMap) {
        log.error("ServiceExternalServiceImpl---addInHospInfo的新增的值为：{}", dataMap);
        log.info("ServiceExternalServiceImpl---addInHospInfo的新增的值为：{}", dataMap);
        Map yeWuXX = (Map) dataMap.get("YeWuXX");
        List<HashMap<String, Object>> epai = ObjectUtils.isNotEmpty(yeWuXX) ? (List<HashMap<String, Object>>) yeWuXX.get("DiZhiXXList") : null;
        List<HashMap<String, Object>> epli = ObjectUtils.isNotEmpty(yeWuXX) ? (List<HashMap<String, Object>>) yeWuXX.get("LianXiRList") : null;
@@ -265,7 +269,7 @@

    @Override
    public Boolean addInDeptInfo(Map dataMap) {
        log.error("ServiceExternalServiceImpl---addInDeptInfo的新增的值为：{}", dataMap);
        log.info("ServiceExternalServiceImpl---addInDeptInfo的新增的值为：{}", dataMap);
        Map yeWuXX = (Map) dataMap.get("YeWuXX");
        Map<String, Object> BingRenXX = ObjectUtils.isNotEmpty(yeWuXX) ? (Map<String, Object>) yeWuXX.get("BingRenXX") : null;
        Map<String, Object> RuKeXX = ObjectUtils.isNotEmpty(yeWuXX) ? (Map<String, Object>) yeWuXX.get("RuKeXX") : null;
@@ -315,7 +319,7 @@

    @Override
    public Boolean cancelInHospInfo(Map dataMap) {
        log.error("ServiceExternalServiceImpl---cancelInHospInfo的新增的值为：{}", dataMap);
        log.info("ServiceExternalServiceImpl---cancelInHospInfo的新增的值为：{}", dataMap);
        Map yeWuXX = (Map) dataMap.get("YeWuXX");
        Map<String, Object> BingRenXX = ObjectUtils.isNotEmpty(yeWuXX) ? (Map<String, Object>) yeWuXX.get("BingRenXX") : null;
        ExternalInHospPatientInfo externalInHospPatientInfo = BeanUtil.mapToBean(BingRenXX, ExternalInHospPatientInfo.class, true);
@@ -345,7 +349,7 @@

    @Override
    public Boolean addOutHospInfo(Map dataMap) {
        log.error("ServiceExternalServiceImpl---addOutHospInfo的新增的值为：{}", dataMap);
        log.info("ServiceExternalServiceImpl---addOutHospInfo的新增的值为：{}", dataMap);
        Map yeWuXX = (Map) dataMap.get("YeWuXX");
        Map<String, Object> BingRenXX = ObjectUtils.isNotEmpty(yeWuXX) ? (Map<String, Object>) yeWuXX.get("BingRenXX") : null;
        Map<String, Object> ChuYuanJL = ObjectUtils.isNotEmpty(yeWuXX) ? (Map<String, Object>) yeWuXX.get("ChuYuanJL") : null;
@@ -488,7 +492,7 @@

    @Override
    public Boolean addOutHospJLInfo(Map dataMap) {
        log.error("ServiceExternalServiceImpl---addOutHospJLInfo的新增的值为：{}", dataMap);
        log.info("ServiceExternalServiceImpl---addOutHospJLInfo的新增的值为：{}", dataMap);
        Map yeWuXX = (Map) dataMap.get("YeWuXX");
        Map<String, Object> BingRenXX = ObjectUtils.isNotEmpty(yeWuXX) ? (Map<String, Object>) yeWuXX.get("BingRenXX") : null;
        Map<String, Object> ChuYuanJL = ObjectUtils.isNotEmpty(yeWuXX) ? (Map<String, Object>) yeWuXX.get("ChuYuanJL") : null;
@@ -621,7 +625,7 @@

    @Override
    public Boolean cancelOutHospInfo(Map dataMap) {
        log.error("ServiceExternalServiceImpl---cancelOutHospInfo的新增的值为：{}", dataMap);
        log.info("ServiceExternalServiceImpl---cancelOutHospInfo的新增的值为：{}", dataMap);
        Map yeWuXX = (Map) dataMap.get("YeWuXX");
        Map<String, Object> BingRenXX = ObjectUtils.isNotEmpty(yeWuXX) ? (Map<String, Object>) yeWuXX.get("BingRenXX") : null;
        ExternalInHospPatientInfo externalInHospPatientInfo = BeanUtil.mapToBean(BingRenXX, ExternalInHospPatientInfo.class, true);
@@ -661,7 +665,7 @@
            //去redis中，查询是否有subid，有的话移除cache-exist
            if (CollectionUtils.isNotEmpty(serviceSubtaskList)) {
                for (ServiceSubtask serviceSubtask : serviceSubtaskList) {
                    log.error("需要移除的subId为：{}", serviceSubtask.getId().toString());
                    log.info("需要移除的subId为：{}", serviceSubtask.getId().toString());
                    serviceSubtaskMapper.deleteServiceSubtaskById(serviceSubtask.getId());
                    redisCache.removeElementFromList("cache-exist", serviceSubtask.getId().toString());
                    redisCache.removeElementFromList("cache-0", serviceSubtask.getId().toString());
@@ -678,7 +682,7 @@

    @Override
    public Boolean addPreOutHospInfo(Map dataMap) {
        log.error("ServiceExternalServiceImpl---addPreOutHospInfo的新增的值为：{}", dataMap);
        log.info("ServiceExternalServiceImpl---addPreOutHospInfo的新增的值为：{}", dataMap);
        Map yeWuXX = (Map) dataMap.get("YeWuXX");
        Map<String, Object> BingRenXX = ObjectUtils.isNotEmpty(yeWuXX) ? (Map<String, Object>) yeWuXX.get("BingRenXX") : null;
        Map<String, Object> ChuYuanJL = ObjectUtils.isNotEmpty(yeWuXX) ? (Map<String, Object>) yeWuXX.get("ChuYuanJL") : null;
@@ -821,7 +825,7 @@

    @Override
    public Boolean addFinshJZInfo(Map dataMap) {
        log.error("ServiceExternalServiceImpl---addFinshJZInfo的新增的值为：{}", dataMap);
        log.info("ServiceExternalServiceImpl---addFinshJZInfo的新增的值为：{}", dataMap);
        Map yeWuXX = (Map) dataMap.get("YeWuXX");
        Map XiaoXiTou = (Map) dataMap.get("XiaoXiTou");
        String FaSongJGID = ObjectUtils.isNotEmpty(XiaoXiTou.get("FaSongJGID")) ? XiaoXiTou.get("FaSongJGID").toString() : null;
@@ -910,7 +914,7 @@

    @Override
    public Boolean addDiseaseInfo(Map dataMap) {
        log.error("ServiceExternalServiceImpl---addDiseaseInfo的新增的值为：{}", dataMap);
        log.info("ServiceExternalServiceImpl---addDiseaseInfo的新增的值为：{}", dataMap);
        Map yeWuXX = (Map) dataMap.get("YeWuXX");
        Map<String, Object> JiBing = ObjectUtils.isNotEmpty(yeWuXX) ? (Map<String, Object>) yeWuXX.get("JiBingMLXX") : null;
        ExternalDiseaseInfo externalDiseaseInfo = BeanUtil.mapToBean(JiBing, ExternalDiseaseInfo.class, true);
@@ -940,7 +944,7 @@

    @Override
    public Boolean addWardAreaInfo(Map dataMap) {
        log.error("ServiceExternalServiceImpl---addWardAreaInfo的新增的值为：{}", dataMap);
        log.info("ServiceExternalServiceImpl---addWardAreaInfo的新增的值为：{}", dataMap);
        Map yeWuXX = (Map) dataMap.get("YeWuXX");
        Map<String, Object> bqxx = ObjectUtils.isNotEmpty(yeWuXX) ? (Map<String, Object>) yeWuXX.get("BingQuXX") : null;
        ExternalWardArea externalWardArea = BeanUtil.mapToBean(bqxx, ExternalWardArea.class, true);
@@ -963,24 +967,24 @@
        if (StringUtils.isNotEmpty(externalWardArea.getShiJianDM()) && externalWardArea.getShiJianDM().equals("1")) {
            sysDept.setCreateTime(externalWardArea.getCreateTime());
            int i = sysDeptMapper.insertDept(sysDept);
            log.error("ServiceExternalServiceImpl---addWardAreaInfo是否新增成功：{}", i);
            log.info("ServiceExternalServiceImpl---addWardAreaInfo是否新增成功：{}", i);
        } else {
            int i = sysDeptMapper.updateDept(sysDept);
            log.error("ServiceExternalServiceImpl---addWardAreaInfo是否修改成功：{}", i);
            log.info("ServiceExternalServiceImpl---addWardAreaInfo是否修改成功：{}", i);
        }
        return true;
    }

    @Override
    public Boolean addMedicalTeam(Map dataMap) {
        log.error("ServiceExternalServiceImpl---addMedicalTeam的新增的值为：{}", dataMap);
        log.info("ServiceExternalServiceImpl---addMedicalTeam的新增的值为：{}", dataMap);

        return true;
    }

    @Override
    public Boolean addOperationInfo(Map dataMap) {
        log.error("ServiceExternalServiceImpl---addOperationInfo的新增的值为：{}", dataMap);
        log.info("ServiceExternalServiceImpl---addOperationInfo的新增的值为：{}", dataMap);

        Map yeWuXX = (Map) dataMap.get("YeWuXX");
        Map<String, Object> BingRenXX = ObjectUtils.isNotEmpty(yeWuXX) ? (Map<String, Object>) yeWuXX.get("BingRenXX") : null;
@@ -1080,7 +1084,7 @@
            patMedOperation.setCreateTime(new Date());
            patMedOperationMapper.insertPatMedOperation(patMedOperation);
        }
        log.error("-----patMedOperation的主键id为：{}", patMedOperation.getId());
        log.info("-----patMedOperation的主键id为：{}", patMedOperation.getId());

        if (ObjectUtils.isNotEmpty(ssxx)) {
            List<HashMap<String, Object>> ShouShuMXList = (List<HashMap<String, Object>>) ssxx.get("ShouShuMXList");
@@ -1292,7 +1296,7 @@
    //新增随访任务同步
    @Override
    public Boolean addTaskInfo(Map dataMap) {
        log.error("ServiceExternalServiceImpl---addTaskInfo的新增的值为：{}", dataMap);
        log.info("ServiceExternalServiceImpl---addTaskInfo的新增的值为：{}", dataMap);
        Map yeWuXX = (Map) dataMap.get("YeWuXX");
        Map<String, Object> bqxx = (Map<String, Object>) yeWuXX.get("BingQuXX");

@@ -1314,7 +1318,7 @@
    //检查申请服务
    @Override
    public Boolean addInspectService(Map dataMap) {
        log.error("ServiceExternalServiceImpl---addInspectService的新增的值为：{}", dataMap);
        log.info("ServiceExternalServiceImpl---addInspectService的新增的值为：{}", dataMap);
        Map xiaoXiTou = (Map) dataMap.get("XiaoXiTou");
        Map yeWuXX = (Map) dataMap.get("YeWuXX");
        Map<String, Object> BingRenXX = ObjectUtils.isNotEmpty(yeWuXX) ? (Map<String, Object>) yeWuXX.get("BingRenXX") : null;
@@ -1456,7 +1460,7 @@
    //检查详情添加
    @Override
    public Boolean addInspectBGService(Map dataMap) {
        log.error("ServiceExternalServiceImpl---addInspectBGService的新增的值为：{}", dataMap);
        log.info("ServiceExternalServiceImpl---addInspectBGService的新增的值为：{}", dataMap);
        Map xiaoXiTou = (Map) dataMap.get("XiaoXiTou");
        Map yeWuXX = (Map) dataMap.get("YeWuXX");
        Map<String, Object> BingRenXX = ObjectUtils.isNotEmpty(yeWuXX) ? (Map<String, Object>) yeWuXX.get("BingRenXX") : null;
@@ -1524,116 +1528,116 @@
    private Boolean getType(String type, Map dataMap) {
        switch (type) {
            case "BR_DA_DangAnJL":
                log.error("患者档案建立入参类型为：{}", type);
                log.info("患者档案建立入参类型为：{}", type);
                return true;
            case "BR_DA_DangAnXG":
                log.error("患者档案修改入参类型为：{}", type);
                log.info("患者档案修改入参类型为：{}", type);
                return true;
            case "JZ_MZ_ZhenDuanXXLR":
                log.error("患者诊断信息门诊录入入参类型为：{}", type);
                log.info("患者诊断信息门诊录入入参类型为：{}", type);
                return true;
            case "JZ_ZY_ZhenDuanXXLR":
                log.error("患者诊断信息住院录入入参类型为：{}", type);
                log.info("患者诊断信息住院录入入参类型为：{}", type);
                return true;
            case "YZ_MZ_YiZhuSQ":
                log.error("门诊医嘱申请入参类型为：{}", type);
                log.info("门诊医嘱申请入参类型为：{}", type);
                return true;
            case "YZ_ZY_YiZhuZX":
                log.error("住院医嘱执行入参类型为：{}", type);
                log.info("住院医嘱执行入参类型为：{}", type);
                return true;
            case "YZ_MZ_YiZhuXG":
                log.error("门诊医嘱修改入参类型为：{}", type);
                log.info("门诊医嘱修改入参类型为：{}", type);
                return true;
            case "YZ_MZ_YiZhuCX":
                log.error("门诊医嘱撤销入参类型为：{}", type);
                log.info("门诊医嘱撤销入参类型为：{}", type);
                return true;
            case "YZ_MZ_YiZhuCS":
                log.error("门诊医嘱删除入参类型为：{}", type);
                log.info("门诊医嘱删除入参类型为：{}", type);
                return true;
            case "JC_SQ_ShenQing":
                log.error("检查申请单入参类型为：{}", type);
                log.info("检查申请单入参类型为：{}", type);
                return addInspectService(dataMap);
            case "JC_SQ_XiuGai":
                log.error("检查申请信息更新入参类型为：{}", type);
                log.info("检查申请信息更新入参类型为：{}", type);
                return addInspectService(dataMap);
            case "JC_SQ_CheXiao":
                log.error("检查撤销入参类型为：{}", type);
                log.info("检查撤销入参类型为：{}", type);
                return true;
            case "JC_BG_BaoGao":
                log.error("检查报告入参类型为：{}", type);
                log.info("检查报告入参类型为：{}", type);
                return addInspectBGService(dataMap);
            case "JY_SQ_ShenQing":
                log.error("检验申请入参类型为：{}", type);
                log.info("检验申请入参类型为：{}", type);
                return addInspectService(dataMap);
            case "JY_SQ_CheXiao":
                log.error("检验撤销入参类型为：{}", type);
                log.info("检验撤销入参类型为：{}", type);
                return true;
            case "JY_SQ_XiuGai":
                log.error("检验修改入参类型为辅：{}", type);
                log.info("检验修改入参类型为辅：{}", type);
                return addInspectService(dataMap);
            case "JY_SQ_BiaoBenCJ":
                log.error("检验标本采集入参类型为：{}", type);
                log.info("检验标本采集入参类型为：{}", type);
                return true;
            case "JY_SQ_QuXiaoBBCJ":
                log.error("取消检验标本采集入参类型为：{}", type);
                log.info("取消检验标本采集入参类型为：{}", type);
                return true;
            case "SM_SQ_ShenQing":
                log.error("手术申请入参类型为：{}", type);
                log.info("手术申请入参类型为：{}", type);
                addOperationInfo(dataMap);
                return true;
            case "TJ_YW_BaoGaoXX":
                log.error("体检报告入参类型为：{}", type);
                log.info("体检报告入参类型为：{}", type);
                return true;
            case "TJ_YW_QuXiaoBG":
                log.error("取消体检报告入参类型为：{}", type);
                log.info("取消体检报告入参类型为：{}", type);
                return true;
            case "JG_ZZ_JiGou":
                log.error("组织机构入参类型为：{}", type);
                log.info("组织机构入参类型为：{}", type);
                return addOrganInfo(dataMap);
            case "JG_ZZ_KeShi":
                log.error("科室入参类型为：{}", type);
                log.info("科室入参类型为：{}", type);
                return addDeptInfo(dataMap);
            case "JG_YH_JiBenXX":
                log.error("用户信息入参类型为：{}", type);
                log.info("用户信息入参类型为：{}", type);
                return addUserInfo(dataMap);
            case "fu_task":
                log.error("fu_task服务入参类型为：{}", type);
                log.info("fu_task服务入参类型为：{}", type);
                return addTaskInfo(dataMap);
            case "GY_ZD_JiBingML":
                log.error("疾病入参类型为：{}", type);
                log.info("疾病入参类型为：{}", type);
                return addDiseaseInfo(dataMap);
            case "YP_ZD_YaoPinCDJG":
                log.error("药品产地价格入参类型为：{}", type);
                log.info("药品产地价格入参类型为：{}", type);
                return true;
            case "JZ_MZ_WanChengJZ":
                log.error("完成接诊入参类型为：{}", type);
                log.info("完成接诊入参类型为：{}", type);
                return addFinshJZInfo(dataMap);
            case "JZ_ZY_RuYuanDJ":
                log.error("入院登记入参类型为：{}", type);
                log.info("入院登记入参类型为：{}", type);
                return addInHospInfo(dataMap);
            case "JZ_ZY_QuXiaoRY":
                log.error("取消入院登记入参类型为：{}", type);
                log.info("取消入院登记入参类型为：{}", type);
                return cancelInHospInfo(dataMap);
            case "JZ_ZY_ChuYuan":
                log.error("患者出院入参类型为：{}", type);
                log.info("患者出院入参类型为：{}", type);
                return addOutHospInfo(dataMap);
            case "BL_JL_ChuYuanJL":
                log.error("患者出院记录入参类型为：{}", type);
                log.info("患者出院记录入参类型为：{}", type);
                return addOutHospJLInfo(dataMap);
            case "JZ_ZY_QuXiaoCY":
                log.error("取消出院入参类型为：{}", type);
                log.info("取消出院入参类型为：{}", type);
                return cancelOutHospInfo(dataMap);
            case "JZ_ZY_YuChuYuan":
                log.error("患者预出院入参类型为：{}", type);
                log.info("患者预出院入参类型为：{}", type);
                return addPreOutHospInfo(dataMap);
            case "JG_ZZ_BingQu":
                log.error("病区信息入参类型为：{}", type);
                log.info("病区信息入参类型为：{}", type);
                return addWardAreaInfo(dataMap);
            case "JG_ZZ_YiLiaoZYS":
                log.error("医疗组医生为：{}", type);
                log.info("医疗组医生为：{}", type);
                return addMedicalTeam(dataMap);
            case "JZ_ZY_RuKe":
                log.error("入科的数据为：{}", type);
                log.info("入科的数据为：{}", type);
                return addInDeptInfo(dataMap);
        }
        return true;

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

@@ -45,9 +45,9 @@
    @Override
    public List<ServiceThirdData> queryList(ServiceThirdData serviceThirdData) {

        log.error("------serviceThirdData的入参：{}", serviceThirdData);
        log.info("------serviceThirdData的入参：{}", serviceThirdData);
        List<ServiceThirdData> serviceThirdDataList = serviceThirdDataMapper.selectServiceThirdDataList(serviceThirdData);
        log.error("------serviceThirdDataList获取数据的数量：{}", serviceThirdDataList.size());
        log.info("------serviceThirdDataList获取数据的数量：{}", serviceThirdDataList.size());
        for (ServiceThirdData std : serviceThirdDataList) {
            PipeParser parser = new PipeParser();
            Message message = null;
@@ -86,7 +86,7 @@
                }

                HospitalRecord hospitalRecord = (HospitalRecord) objectList.get(0);
                log.error("hospitalRecord的值为：{}", hospitalRecord);
                log.info("hospitalRecord的值为：{}", hospitalRecord);
                //如果patientid为空，再存record就成脏数据了
                if (StringUtils.isNotBlank(hospitalUserinfo.getPatientID())) {
                    hospitalRecord.setMessageID(std.getId().toString());
@@ -99,9 +99,9 @@
                    serviceThirdData2.setRemark("PatientID为空");
                }
                serviceThirdData2.setUserInfoId(hospitalUserinfo.getID());
                log.error("serviceThirdData2的参数：{}", serviceThirdData2);
                log.info("serviceThirdData2的参数：{}", serviceThirdData2);
                int ii = serviceThirdDataMapper.updateIsDeal(serviceThirdData2);
                log.error("是否修改成功：{}", ii);
                log.info("是否修改成功：{}", ii);
            } catch (HL7Exception e) {
                e.printStackTrace();
            }

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

@@ -111,7 +111,7 @@
            }
            if (CollectionUtils.isNotEmpty(serviceSubtaskList)) {
                for (ServiceSubtask serviceSubtask : serviceSubtaskList) {
                    log.error("insertOrUpdateSvyTask需要移除的subId为：{}", serviceSubtask.getId().toString());
                    log.info("insertOrUpdateSvyTask需要移除的subId为：{}", serviceSubtask.getId().toString());
                    serviceSubtaskMapper.deleteServiceSubtaskById(serviceSubtask.getId());
                    redisCache.removeElementFromList("cache-exist", serviceSubtask.getId().toString());
                    redisCache.removeElementFromList("cache-0", serviceSubtask.getId().toString());