From 67fd6d57e8576771ad3a31c34de1d4cf597f8cea Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AE=87=E5=AE=99=E7=9A=AE=E7=9A=AE=E5=A8=83?=
 <2964346877@qq.com>
Date: Mon, 3 Jun 2024 10:02:23 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E5=A2=9E=E5=8A=A0=E7=A6=BB?=
 =?UTF-8?q?=E9=99=A2=E6=96=B9=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/docus/server/collection/dto/TBasicDto.java   | 1 +
 .../com/docus/server/collection/entity/TBasicExtend.java  | 3 +++
 .../server/collection/service/impl/TBasicServiceImpl.java | 8 ++++++++
 .../collection/webservice/impl/BasicServiceImpl.java      | 7 +++++++
 src/main/resources/mapper/TBasicMapper.xml                | 4 ++--
 5 files changed, 21 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/docus/server/collection/dto/TBasicDto.java b/src/main/java/com/docus/server/collection/dto/TBasicDto.java
index fa1c85f..316c42b 100644
--- a/src/main/java/com/docus/server/collection/dto/TBasicDto.java
+++ b/src/main/java/com/docus/server/collection/dto/TBasicDto.java
@@ -40,5 +40,6 @@ public class TBasicDto {
     //入院状态 1更新 2删除
     private String statu;
     private Integer isOther;
+    private String leaveMethod;
 
 }
diff --git a/src/main/java/com/docus/server/collection/entity/TBasicExtend.java b/src/main/java/com/docus/server/collection/entity/TBasicExtend.java
index aaea48d..303e58b 100644
--- a/src/main/java/com/docus/server/collection/entity/TBasicExtend.java
+++ b/src/main/java/com/docus/server/collection/entity/TBasicExtend.java
@@ -39,4 +39,7 @@ public class TBasicExtend implements Serializable {
 
     @ApiModelProperty(value = "责任护士 对应护士节点")
     private String dutyNurse;
+
+    @ApiModelProperty(value = "离院方式")
+    private Integer leaveMethod;
 }
diff --git a/src/main/java/com/docus/server/collection/service/impl/TBasicServiceImpl.java b/src/main/java/com/docus/server/collection/service/impl/TBasicServiceImpl.java
index 9f50b17..6b95cdd 100644
--- a/src/main/java/com/docus/server/collection/service/impl/TBasicServiceImpl.java
+++ b/src/main/java/com/docus/server/collection/service/impl/TBasicServiceImpl.java
@@ -1,6 +1,7 @@
 package com.docus.server.collection.service.impl;
 
 import cn.hutool.core.util.NumberUtil;
+import cn.hutool.core.util.ObjectUtil;
 import com.docus.core.util.DateUtil;
 import com.docus.core.util.Func;
 import com.docus.infrastructure.core.exception.BaseException;
@@ -101,6 +102,11 @@ public class TBasicServiceImpl implements ITBasicService {
         if ("死亡".equals(isDeadStr)) {
             isDead = 1;
         }
+        String leaveMethodStr = tBasicDto.getLeaveMethod();
+        Integer leaveMethod = null;
+        if (ObjectUtil.isNotEmpty(leaveMethodStr)&&NumberUtil.isInteger(leaveMethodStr)) {
+            leaveMethod=Integer.parseInt(leaveMethodStr);
+        }
 
         //组装数据
         TBasic tBasic = new TBasic();
@@ -140,6 +146,8 @@ public class TBasicServiceImpl implements ITBasicService {
         tBasicExtend.setWardCode(tBasicDto.getWardCode());
         tBasicExtend.setWardName(tBasicDto.getWardName());
         tBasicExtend.setSdryIndex(sdryIndex == null ? null : sdryIndex.replace("z", "").replace("m", ""));
+        tBasicExtend.setLeaveMethod(leaveMethod);
+
         //持久化
         tBasicMapper.insert(tBasic);
         tBasicMapper.insertExtend(tBasicExtend);
diff --git a/src/main/java/com/docus/server/collection/webservice/impl/BasicServiceImpl.java b/src/main/java/com/docus/server/collection/webservice/impl/BasicServiceImpl.java
index 72323e8..a2c1240 100644
--- a/src/main/java/com/docus/server/collection/webservice/impl/BasicServiceImpl.java
+++ b/src/main/java/com/docus/server/collection/webservice/impl/BasicServiceImpl.java
@@ -303,6 +303,12 @@ public class BasicServiceImpl implements BasicService {
         if(Func.isNotEmpty(sdryIndexNode)){
             sdryIndex=sdryIndexNode.getNodeValue();
         }
+        //顺德人医第三方索引
+        String leaveMethod=null;
+        Node leaveMethodNode = xml.getNode("/PRPA_HIP0032/controlActProcess/subject/encounterEvent/component[@displayName='出院诊断']/section/lhWay/@code");
+        if(Func.isNotEmpty(leaveMethodNode)){
+            leaveMethod=leaveMethodNode.getNodeValue();
+        }
 
         //设置dto
         TBasicDto dto=new TBasicDto();
@@ -331,6 +337,7 @@ public class BasicServiceImpl implements BasicService {
         dto.setWardName(wardName);
         dto.setSdryIndex(sdryIndex);
         dto.setIsOther(0);
+        dto.setLeaveMethod(leaveMethod);
         return dto;
     }
 
diff --git a/src/main/resources/mapper/TBasicMapper.xml b/src/main/resources/mapper/TBasicMapper.xml
index bdef8f5..78d6c30 100644
--- a/src/main/resources/mapper/TBasicMapper.xml
+++ b/src/main/resources/mapper/TBasicMapper.xml
@@ -97,9 +97,9 @@
     </insert>
     <insert id="insertExtend">
         INSERT INTO `docus_medicalrecord`.`t_basic_extend`
-        (`patient_id`,`ward_code`,`ward_name`,`sdry_index`)
+        (`patient_id`,`ward_code`,`ward_name`,`sdry_index`,`leave_method`)
         VALUES
-        (#{tBasicExtend.patientId},#{tBasicExtend.wardCode},#{tBasicExtend.wardName},#{tBasicExtend.sdryIndex})
+        (#{tBasicExtend.patientId},#{tBasicExtend.wardCode},#{tBasicExtend.wardName},#{tBasicExtend.sdryIndex},#{tBasicExtend.leaveMethod})
     </insert>
     <insert id="saveNisRemoveFilesCount">
         INSERT INTO `docus_medicalrecord`.`t_basic_extend`