diff --git a/src/main/java/com/docus/demo/service/SyncBasicFileImpl.java b/src/main/java/com/docus/demo/service/SyncBasicFileImpl.java index b2b8de3..818bf20 100644 --- a/src/main/java/com/docus/demo/service/SyncBasicFileImpl.java +++ b/src/main/java/com/docus/demo/service/SyncBasicFileImpl.java @@ -214,11 +214,12 @@ public class SyncBasicFileImpl implements ISyncBasicFileService { tbasics.add(tbasic); //查询是否存在更新,不存在新增 Tbasic tBasic = basicMapper.getTbasicPatientId(admissId); - log.info("tBasic:"+tBasic); + log.info("tBasic"+tBasic.toString()); + String tBasicPatientId = tBasic.getPatientId(); if (StringUtils.isNotBlank(tbasic.getPh())){ return CommonResult.success("存在盘号,保存成功"); } - if (StringUtils.isBlank(tBasic.getPatientId())) { + if (StringUtils.isBlank(tBasicPatientId)) { if (!basicMapper.addBasic(tbasics)) { basicMapper.insertOrUpdateTbasicSub(tbasicSubList); log.info("新增PatientId为:" + patientId + "的基础数据失败"); @@ -230,11 +231,11 @@ public class SyncBasicFileImpl implements ISyncBasicFileService { //存在时先删除基础数据图像数据,后新增 if (basicMapper.delTbasicByPatientId(admissId)) { //删除tbasic拓展表 - basicMapper.delTbasicSub(tBasic.getPatientId()); + basicMapper.delTbasicSub(tBasicPatientId); //薪资拓展表 basicMapper.insertOrUpdateTbasicSub(tbasicSubList); //删除路径图像 - List scanAssort = scanAssortMapper.getScanAssort(tBasic.getPatientId()); + List scanAssort = scanAssortMapper.getScanAssort(tBasicPatientId); if (!CollectionUtils.isEmpty(scanAssort)) { for (ScanAssort list : scanAssort) { File file = new File(list.getImagePath() + File.separatorChar + list.getScanPage()); @@ -246,7 +247,7 @@ public class SyncBasicFileImpl implements ISyncBasicFileService { } } //删除文件数据 - scanAssortMapper.delScanAssort(tBasic.getPatientId()); + scanAssortMapper.delScanAssort(tBasicPatientId); if (!basicMapper.addBasic(tbasics)) { log.info("新增PatientId为:" + patientId + "的基础数据失败"); return CommonResult.failed("新增PatientId为:" + patientId + "的基础数据失败");