From 7c3e665fd333a0bda4f5db0400c929c62e53c2f3 Mon Sep 17 00:00:00 2001
From: linjj <850658129@qq.com>
Date: Wed, 10 Jul 2024 16:20:25 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B8=82=E4=B8=80=E5=90=8C=E6=AD=A5=E8=81=94?=
 =?UTF-8?q?=E4=BC=97=E6=95=B0=E6=8D=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../docus/demo/service/SyncBasicFileImpl.java    | 16 +++++++---------
 1 file changed, 7 insertions(+), 9 deletions(-)

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> scanAssort = scanAssortMapper.getScanAssort(tBasicPatientId);
+                    List<ScanAssort> 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 + "的基础数据失败");