From 9527cb83f8df5e7fa9ee2bec57fd11697c41ec44 Mon Sep 17 00:00:00 2001
From: linjj <850658129@qq.com>
Date: Wed, 10 Jul 2024 14:59:51 +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

---
 .../com/docus/demo/mapper/mysql/BasicMapper.java    |  3 ++-
 .../com/docus/demo/service/SyncBasicFileImpl.java   | 13 ++++++++-----
 src/main/resources/application.yml                  |  2 +-
 src/main/resources/mapper/mysql/BasicMapper.xml     |  5 +++--
 4 files changed, 14 insertions(+), 9 deletions(-)

diff --git a/src/main/java/com/docus/demo/mapper/mysql/BasicMapper.java b/src/main/java/com/docus/demo/mapper/mysql/BasicMapper.java
index b822e6e..379ce39 100644
--- a/src/main/java/com/docus/demo/mapper/mysql/BasicMapper.java
+++ b/src/main/java/com/docus/demo/mapper/mysql/BasicMapper.java
@@ -37,7 +37,8 @@ public interface BasicMapper {
 
     void delTbasicSub(@Param("patientId")String patientId);
 
-    String getTbasicPatientId(@Param("admissId")String admissId);
+    Tbasic getTbasicPatientId(@Param("admissId")String admissId);
 
     Boolean delTbasicByPatientId(@Param("admissId")String admissId);
+
 }
diff --git a/src/main/java/com/docus/demo/service/SyncBasicFileImpl.java b/src/main/java/com/docus/demo/service/SyncBasicFileImpl.java
index d03b6b1..6eb65a9 100644
--- a/src/main/java/com/docus/demo/service/SyncBasicFileImpl.java
+++ b/src/main/java/com/docus/demo/service/SyncBasicFileImpl.java
@@ -213,8 +213,11 @@ public class SyncBasicFileImpl implements ISyncBasicFileService {
             List<TbasicSub> tbasicSubList = this.getTbasicSubList(fileUploadJpg);
             tbasics.add(tbasic);
             //查询是否存在更新，不存在新增
-            String basicPatientId = basicMapper.getTbasicPatientId(admissId);
-            if (StringUtils.isBlank(basicPatientId)) {
+            Tbasic tBasic = basicMapper.getTbasicPatientId(admissId);
+            if (StringUtils.isNotBlank(tbasic.getPh())){
+                return CommonResult.success("存在盘号,保存成功");
+            }
+            if (StringUtils.isBlank(tBasic.getPatientId())) {
                 if (!basicMapper.addBasic(tbasics)) {
                     basicMapper.insertOrUpdateTbasicSub(tbasicSubList);
                     log.info("新增PatientId为:" + patientId + "的基础数据失败");
@@ -226,11 +229,11 @@ public class SyncBasicFileImpl implements ISyncBasicFileService {
                 //存在时先删除基础数据图像数据，后新增
                 if (basicMapper.delTbasicByPatientId(admissId)) {
                     //删除tbasic拓展表
-                    basicMapper.delTbasicSub(basicPatientId);
+                    basicMapper.delTbasicSub(tBasic.getPatientId());
                     //薪资拓展表
                     basicMapper.insertOrUpdateTbasicSub(tbasicSubList);
                     //删除路径图像
-                    List<ScanAssort> scanAssort = scanAssortMapper.getScanAssort(basicPatientId);
+                    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());
@@ -242,7 +245,7 @@ public class SyncBasicFileImpl implements ISyncBasicFileService {
                         }
                     }
                     //删除文件数据
-                    scanAssortMapper.delScanAssort(basicPatientId);
+                    scanAssortMapper.delScanAssort(tBasic.getPatientId());
                     if (!basicMapper.addBasic(tbasics)) {
                         log.info("新增PatientId为:" + patientId + "的基础数据失败");
                         return CommonResult.failed("新增PatientId为:" + patientId + "的基础数据失败");
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index c237989..828a347 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -95,4 +95,4 @@ spring:
 
 
 #文件保存路径
-savePath: Z:\jiashi\lianzhong
\ No newline at end of file
+savePath: F:\jiashi\lianzhong
\ No newline at end of file
diff --git a/src/main/resources/mapper/mysql/BasicMapper.xml b/src/main/resources/mapper/mysql/BasicMapper.xml
index f73d64a..ab759fa 100644
--- a/src/main/resources/mapper/mysql/BasicMapper.xml
+++ b/src/main/resources/mapper/mysql/BasicMapper.xml
@@ -164,8 +164,9 @@
         </if>
         limit #{pageStart} ,#{pageEnd}
     </select>
-    <select id="getTbasicPatientId" resultType="java.lang.String">
-        select patient_id from docus_medicalrecord.t_basic where  admiss_id=#{admissId}
+    <select id="getTbasicPatientId" resultType="com.docus.demo.entity.Tbasic">
+        select  patient_id,ph from docus_medicalrecord.t_basic where  admiss_id=#{admissId}
     </select>
 
+
 </mapper>
\ No newline at end of file