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