From 35c4bf0535cd2260f2a9e2a2845588db39ac8ba0 Mon Sep 17 00:00:00 2001
From: 陈昶聿 <chychen@nbjetron.com>
Date: 星期一, 30 三月 2026 15:59:59 +0800
Subject: [PATCH] 【丽水】数据导入新增短号
---
smartor/src/main/java/com/smartor/domain/PatArchive.java | 7 +++++++
smartor/src/main/java/com/smartor/domain/PatArchiveOthreInfo.java | 7 +++++++
smartor/src/main/java/com/smartor/domain/ExternalInHospPatientInfo.java | 3 +++
smartor/src/main/resources/mapper/smartor/PatArchiveMapper.xml | 12 ++++++++++++
smartor/src/main/java/com/smartor/service/impl/ServiceExternalServiceImpl.java | 14 ++++++++++++++
5 files changed, 43 insertions(+), 0 deletions(-)
diff --git a/smartor/src/main/java/com/smartor/domain/ExternalInHospPatientInfo.java b/smartor/src/main/java/com/smartor/domain/ExternalInHospPatientInfo.java
index 805a65b..9449226 100644
--- a/smartor/src/main/java/com/smartor/domain/ExternalInHospPatientInfo.java
+++ b/smartor/src/main/java/com/smartor/domain/ExternalInHospPatientInfo.java
@@ -188,4 +188,7 @@
@ApiModelProperty(value = "缁忕鍖荤敓濮撳悕")
private String JingGuanYSXM;
+ @ApiModelProperty(value = "鐭彿淇℃伅")
+ private String DuanHaoXX;
+
}
diff --git a/smartor/src/main/java/com/smartor/domain/PatArchive.java b/smartor/src/main/java/com/smartor/domain/PatArchive.java
index 7cb6c29..e409c21 100644
--- a/smartor/src/main/java/com/smartor/domain/PatArchive.java
+++ b/smartor/src/main/java/com/smartor/domain/PatArchive.java
@@ -204,6 +204,13 @@
@Excel(name = " 鎵嬫満鍙风爜 ")
private String telcode;
+ /**
+ * 鎵嬫満鐭彿
+ */
+ @ApiModelProperty("鎵嬫満鐭彿")
+ @Excel(name = " 鎵嬫満鐭彿 ")
+ private String telshortcode;
+
/**
* 浜插睘鍙风爜
diff --git a/smartor/src/main/java/com/smartor/domain/PatArchiveOthreInfo.java b/smartor/src/main/java/com/smartor/domain/PatArchiveOthreInfo.java
index 25ac419..d5320b3 100644
--- a/smartor/src/main/java/com/smartor/domain/PatArchiveOthreInfo.java
+++ b/smartor/src/main/java/com/smartor/domain/PatArchiveOthreInfo.java
@@ -250,6 +250,13 @@
@Excel(name = " 鎵嬫満鍙风爜 ")
private String telcode;
+ /**
+ * 鎵嬫満鐭彿
+ */
+ @ApiModelProperty("鎵嬫満鐭彿")
+ @Excel(name = " 鎵嬫満鐭彿 ")
+ private String telshortcode;
+
/**
* 浜插睘鍙风爜
diff --git a/smartor/src/main/java/com/smartor/service/impl/ServiceExternalServiceImpl.java b/smartor/src/main/java/com/smartor/service/impl/ServiceExternalServiceImpl.java
index 66c5a2e..7a53d20 100644
--- a/smartor/src/main/java/com/smartor/service/impl/ServiceExternalServiceImpl.java
+++ b/smartor/src/main/java/com/smartor/service/impl/ServiceExternalServiceImpl.java
@@ -548,6 +548,17 @@
}
if (CollectionUtils.isNotEmpty(epai)) externalInHospPatientAddrInfo = epai2.get(0);
if (CollectionUtils.isNotEmpty(epli)) externalInHospPatientLiaisonInfo = epli2.get(0);
+ List<HashMap<String, Object>> bingRenKZXXList = ObjectUtils.isNotEmpty(yeWuXX) ? (List<HashMap<String, Object>>) yeWuXX.get("BingRenKZXXList") : null;
+ if (CollectionUtils.isNotEmpty(bingRenKZXXList)) {
+ for(HashMap<String, Object> bingRenKZXX : bingRenKZXXList){
+ String XiangMuDM = ObjectUtils.isNotEmpty(bingRenKZXX.get("XiangMuDM")) ? bingRenKZXX.get("XiangMuDM").toString() : null;
+ if(StringUtils.isNotEmpty(XiangMuDM) && XiangMuDM.equals("DuanHaoXX")){
+ externalInHospPatientInfo.setDuanHaoXX(ObjectUtils.isNotEmpty(bingRenKZXX.get("XiangMuZMC")) ? bingRenKZXX.get("XiangMuZMC").toString() : null);
+ break;
+ }
+ }
+ }
+
//鏂板鎮ｈ�呭熀鏈俊鎭柊澧炴垨淇敼
PatArchive patArchive = addPatArchive(externalInHospPatientInfo, externalInHospPatientAddrInfo, externalInHospPatientLiaisonInfo);
@@ -1487,6 +1498,9 @@
patArchive.setTelcode(externalInHospPatientInfo.getLianXiDH());
if (StringUtils.isEmpty(patArchive.getTelcode()))
patArchive.setTelcode(externalInHospPatientInfo.getLianXiRDH());
+ //澧炲姞鐭彿淇℃伅
+ if (StringUtils.isNotEmpty(externalInHospPatientInfo.getDuanHaoXX()))
+ patArchive.setTelshortcode(externalInHospPatientInfo.getDuanHaoXX());
patArchive.setRelativetelcode(externalInHospPatientInfo.getLianXiRDH());
patArchive.setGuid(externalInHospPatientInfo.getZuZhiJGID());
patArchive.setInhospno(externalInHospPatientInfo.getBingAnHao());
diff --git a/smartor/src/main/resources/mapper/smartor/PatArchiveMapper.xml b/smartor/src/main/resources/mapper/smartor/PatArchiveMapper.xml
index 0882e3f..22b3f4a 100644
--- a/smartor/src/main/resources/mapper/smartor/PatArchiveMapper.xml
+++ b/smartor/src/main/resources/mapper/smartor/PatArchiveMapper.xml
@@ -28,6 +28,7 @@
<result property="archivetime" column="archivetime"/>
<result property="archiveby" column="archiveby"/>
<result property="telcode" column="telcode"/>
+ <result property="telshortcode" column="telshortcode"/>
<result property="relativetelcode" column="relativetelcode"/>
<result property="idcardtype" column="idcardtype"/>
<result property="orgid" column="orgid"/>
@@ -90,6 +91,7 @@
<result property="archivetime" column="archivetime"/>
<result property="archiveby" column="archiveby"/>
<result property="telcode" column="telcode"/>
+ <result property="telshortcode" column="telshortcode"/>
<result property="relativetelcode" column="relativetelcode"/>
<result property="idcardtype" column="idcardtype"/>
<result property="orgid" column="orgid"/>
@@ -153,6 +155,7 @@
archivetime,
archiveby,
telcode,
+ telshortcode,
relativetelcode,
idcardtype,
orgid,
@@ -306,6 +309,7 @@
<if test="archivetime != null">archivetime,</if>
<if test="archiveby != null">archiveby,</if>
<if test="telcode != null">telcode,</if>
+ <if test="telshortcode != null">telshortcode,</if>
<if test="relativetelcode != null">relativetelcode,</if>
<if test="idcardtype != null">idcardtype,</if>
<if test="orgid != null">orgid,</if>
@@ -356,6 +360,7 @@
<if test="archivetime != null">#{archivetime},</if>
<if test="archiveby != null">#{archiveby},</if>
<if test="telcode != null">#{telcode},</if>
+ <if test="telshortcode != null">#{telshortcode},</if>
<if test="relativetelcode != null">#{relativetelcode},</if>
<if test="idcardtype != null">#{idcardtype},</if>
<if test="orgid != null">#{orgid},</if>
@@ -415,6 +420,7 @@
<if test="archivetime != null">archivetime = #{archivetime},</if>
<if test="archiveby != null">archiveby = #{archiveby},</if>
<if test="telcode != null">telcode = #{telcode},</if>
+ <if test="telshortcode != null">telshortcode = #{telshortcode},</if>
<if test="relativetelcode != null">relativetelcode = #{relativetelcode},</if>
<if test="idcardtype != null">idcardtype = #{idcardtype},</if>
<if test="orgid != null">orgid = #{orgid},</if>
@@ -491,6 +497,7 @@
a.archivetime,
a.archiveby,
a.telcode,
+ a.telshortcode,
a.relativetelcode,
a.idcardtype,
a.orgid,
@@ -564,6 +571,7 @@
a.archivetime,
a.archiveby,
a.telcode,
+ a.telshortcode,
a.relativetelcode,
a.idcardtype,
a.orgid,
@@ -702,6 +710,7 @@
a.archivetime,
a.archiveby,
a.telcode,
+ a.telshortcode,
a.relativetelcode,
a.idcardtype,
a.orgid,
@@ -795,6 +804,7 @@
a.archivetime,
a.archiveby,
a.telcode,
+ a.telshortcode,
a.relativetelcode,
a.idcardtype,
a.orgid,
@@ -887,6 +897,7 @@
a.archivetime,
a.archiveby,
a.telcode,
+ a.telshortcode,
a.relativetelcode,
a.idcardtype,
a.orgid,
@@ -1122,6 +1133,7 @@
a.archivetime,
a.archiveby,
a.telcode,
+ a.telshortcode,
a.relativetelcode,
a.idcardtype,
a.orgid,
--
Gitblit v1.9.3