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/resources/mapper/smartor/PatArchiveMapper.xml | 252 ++++++++++++++++++++++++++------------------------
1 files changed, 132 insertions(+), 120 deletions(-)
diff --git a/smartor/src/main/resources/mapper/smartor/PatArchiveMapper.xml b/smartor/src/main/resources/mapper/smartor/PatArchiveMapper.xml
index 0fb3300..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,
@@ -997,96 +1008,96 @@
) as tmp
</select>
- <select id="selectPatArchiveInfoByOuthospQC" parameterType="com.smartor.domain.PatArchiveReq"
- resultMap="PatArchiveOthreInfoResult">
+<!-- <select id="selectPatArchiveInfoByOuthospQC" parameterType="com.smartor.domain.PatArchiveReq"-->
+<!-- resultMap="PatArchiveOthreInfoResult">-->
- select
- a.idcardno,
- a.id,
- a.age_unit,
- a.age_unit2,
- a.patid_his,
- a.sd_flag,
- a.campusid,
- a.patientno,
- a.notrequired_flag,
- a.notrequiredreason,
- d.deptname,
- d.deptcode,
- d.drcode,
- d.drname,
- a.name,
- a.sex,
- a.nation,
- a.native_place,
- a.place_of_residence,
- a.birthplace,
- a.birthdate,
- a.age,
- a.age2,
- a.viptype,
- a.sourcefrom,
- a.archivetime,
- a.archiveby,
- a.telcode,
- a.relativetelcode,
- a.idcardtype,
- a.orgid,
- a.openid,
- a.del_flag,
- a.update_by,
- a.update_time,
- a.create_by,
- a.create_time,
- a.isupload,
- a.upload_time,
- a.filter_drname,
- a.filter_drcode,
- a.pattype
- from pat_med_outhosp d JOIN pat_archive a ON a.id = d.patid
- where 1=1
- and d.del_flag != 1
- AND a.del_flag != 1
- and d.orgid = #{orgid}
- <if test="pid != null and pid != ''">and a.id = #{pid}</if>
- <if test="campusid != null and campusid != ''">and a.campusid = #{campusid}</if>
- <if test="name != null and name != ''">and a.name like concat('%', #{name}, '%')</if>
- <if test="idcardno != null and idcardno != ''">and a.idcardno = #{idcardno}</if>
- <if test="telcode != null and telcode != ''">and a.telcode = #{telcode}</if>
- <if test="hospitaldistrictname != null and hospitaldistrictname != ''">
- AND d.hospitaldistrictname LIKE concat('%',#{hospitaldistrictname}, '%')
- </if>
- <if test="notrequiredFlag != null and notrequiredFlag != ''">and a.notrequired_flag = #{notrequiredFlag}
- </if>
- <if test="leavediagname != null and leavediagname != ''">
- AND d.diagname LIKE concat('%',#{leavediagname}, '%')
- </if>
- <if test="hospitalname != null and hospitalname != ''">
- AND d.hospitalname = #{hospitalname}
- </if>
- <if test="visitno != null and visitno != ''">
- AND d.outhospno = #{visitno}
- </if>
- <if test="deptname != null and deptname != ''">
- and d.deptname LIKE concat('%', #{deptname}, '%')
- </if>
- <if test="drname != null and drname != ''">
- AND d.drname LIKE concat('%',#{drname}, '%')
- </if>
- <if test="drcode != null">
- AND d.drcode = #{drcode}
- </if>
- <if test="pids != null">
- AND a.id NOT IN
- <foreach collection="pids" item="pid" open="(" separator="," close=")">
- #{pid}
- </foreach>
- </if>
- <if test="isFilter == true">
- AND NOT exists ( SELECT 1 FROM pat_filterlist f where d.patid=f.patid)
- </if>
- <if test="pageSize != null and pageNum != null">limit ${pageSize} OFFSET ${pageNum}</if>
- </select>
+<!-- select-->
+<!-- a.idcardno,-->
+<!-- a.id,-->
+<!-- a.age_unit,-->
+<!-- a.age_unit2,-->
+<!-- a.patid_his,-->
+<!-- a.sd_flag,-->
+<!-- a.campusid,-->
+<!-- a.patientno,-->
+<!-- a.notrequired_flag,-->
+<!-- a.notrequiredreason,-->
+<!-- d.deptname,-->
+<!-- d.deptcode,-->
+<!-- d.drcode,-->
+<!-- d.drname,-->
+<!-- a.name,-->
+<!-- a.sex,-->
+<!-- a.nation,-->
+<!-- a.native_place,-->
+<!-- a.place_of_residence,-->
+<!-- a.birthplace,-->
+<!-- a.birthdate,-->
+<!-- a.age,-->
+<!-- a.age2,-->
+<!-- a.viptype,-->
+<!-- a.sourcefrom,-->
+<!-- a.archivetime,-->
+<!-- a.archiveby,-->
+<!-- a.telcode,-->
+<!-- a.relativetelcode,-->
+<!-- a.idcardtype,-->
+<!-- a.orgid,-->
+<!-- a.openid,-->
+<!-- a.del_flag,-->
+<!-- a.update_by,-->
+<!-- a.update_time,-->
+<!-- a.create_by,-->
+<!-- a.create_time,-->
+<!-- a.isupload,-->
+<!-- a.upload_time,-->
+<!-- a.filter_drname,-->
+<!-- a.filter_drcode,-->
+<!-- a.pattype-->
+<!-- from pat_med_outhosp d JOIN pat_archive a ON a.id = d.patid-->
+<!-- where 1=1-->
+<!-- and d.del_flag != 1-->
+<!-- AND a.del_flag != 1-->
+<!-- and d.orgid = #{orgid}-->
+<!-- <if test="pid != null and pid != ''">and a.id = #{pid}</if>-->
+<!-- <if test="campusid != null and campusid != ''">and a.campusid = #{campusid}</if>-->
+<!-- <if test="name != null and name != ''">and a.name like concat('%', #{name}, '%')</if>-->
+<!-- <if test="idcardno != null and idcardno != ''">and a.idcardno = #{idcardno}</if>-->
+<!-- <if test="telcode != null and telcode != ''">and a.telcode = #{telcode}</if>-->
+<!-- <if test="hospitaldistrictname != null and hospitaldistrictname != ''">-->
+<!-- AND d.hospitaldistrictname LIKE concat('%',#{hospitaldistrictname}, '%')-->
+<!-- </if>-->
+<!-- <if test="notrequiredFlag != null and notrequiredFlag != ''">and a.notrequired_flag = #{notrequiredFlag}-->
+<!-- </if>-->
+<!-- <if test="leavediagname != null and leavediagname != ''">-->
+<!-- AND d.diagname LIKE concat('%',#{leavediagname}, '%')-->
+<!-- </if>-->
+<!-- <if test="hospitalname != null and hospitalname != ''">-->
+<!-- AND d.hospitalname = #{hospitalname}-->
+<!-- </if>-->
+<!-- <if test="visitno != null and visitno != ''">-->
+<!-- AND d.outhospno = #{visitno}-->
+<!-- </if>-->
+<!-- <if test="deptname != null and deptname != ''">-->
+<!-- and d.deptname LIKE concat('%', #{deptname}, '%')-->
+<!-- </if>-->
+<!-- <if test="drname != null and drname != ''">-->
+<!-- AND d.drname LIKE concat('%',#{drname}, '%')-->
+<!-- </if>-->
+<!-- <if test="drcode != null">-->
+<!-- AND d.drcode = #{drcode}-->
+<!-- </if>-->
+<!-- <if test="pids != null">-->
+<!-- AND a.id NOT IN-->
+<!-- <foreach collection="pids" item="pid" open="(" separator="," close=")">-->
+<!-- #{pid}-->
+<!-- </foreach>-->
+<!-- </if>-->
+<!-- <if test="isFilter == true">-->
+<!-- AND NOT exists ( SELECT 1 FROM pat_filterlist f where d.patid=f.patid)-->
+<!-- </if>-->
+<!-- <if test="pageSize != null and pageNum != null">limit ${pageSize} OFFSET ${pageNum}</if>-->
+<!-- </select>-->
<select id="selectPatArchiveInfoByPhysicalQC" parameterType="com.smartor.domain.PatArchiveReq"
resultMap="PatArchiveOthreInfoResult">
@@ -1122,6 +1133,7 @@
a.archivetime,
a.archiveby,
a.telcode,
+ a.telshortcode,
a.relativetelcode,
a.idcardtype,
a.orgid,
@@ -1240,37 +1252,37 @@
</select>
<!-- 闂ㄨ瘖鎮ｈ�呮�绘暟缁熻锛堝幓閲嶏級 -->
- <select id="countPatArchiveInfoByOuthospQC" parameterType="com.smartor.domain.PatArchiveReq" resultType="long">
- SELECT COUNT(DISTINCT a.id)
- FROM pat_med_outhosp d
- JOIN pat_archive a ON a.id = d.patid
- WHERE 1=1
- AND d.del_flag != 1
- AND a.del_flag != 1
- AND d.orgid = #{orgid}
- <if test="pid != null and pid != ''">AND a.id = #{pid}</if>
- <if test="campusid != null and campusid != ''">AND a.campusid = #{campusid}</if>
- <if test="name != null and name != ''">AND a.name like concat('%', #{name}, '%')</if>
- <if test="idcardno != null and idcardno != ''">AND a.idcardno = #{idcardno}</if>
- <if test="telcode != null and telcode != ''">AND a.telcode = #{telcode}</if>
- <if test="hospitaldistrictname != null and hospitaldistrictname != ''">AND d.hospitaldistrictname LIKE concat('%',#{hospitaldistrictname}, '%')</if>
- <if test="notrequiredFlag != null and notrequiredFlag != ''">AND a.notrequired_flag = #{notrequiredFlag}</if>
- <if test="leavediagname != null and leavediagname != ''">AND d.diagname LIKE concat('%',#{leavediagname}, '%')</if>
- <if test="hospitalname != null and hospitalname != ''">AND d.hospitalname = #{hospitalname}</if>
- <if test="visitno != null and visitno != ''">AND d.outhospno = #{visitno}</if>
- <if test="deptname != null and deptname != ''">AND d.deptname LIKE concat('%', #{deptname}, '%')</if>
- <if test="drname != null and drname != ''">AND d.drname LIKE concat('%',#{drname}, '%')</if>
- <if test="drcode != null">AND d.drcode = #{drcode}</if>
- <if test="pids != null">
- AND a.id NOT IN
- <foreach collection="pids" item="pid" open="(" separator="," close=")">
- #{pid}
- </foreach>
- </if>
- <if test="isFilter == true">
- AND NOT exists ( SELECT 1 FROM pat_filterlist f where d.patid=f.patid)
- </if>
- </select>
+<!-- <select id="countPatArchiveInfoByOuthospQC" parameterType="com.smartor.domain.PatArchiveReq" resultType="long">-->
+<!-- SELECT COUNT(DISTINCT a.id)-->
+<!-- FROM pat_med_outhosp d-->
+<!-- JOIN pat_archive a ON a.id = d.patid-->
+<!-- WHERE 1=1-->
+<!-- AND d.del_flag != 1-->
+<!-- AND a.del_flag != 1-->
+<!-- AND d.orgid = #{orgid}-->
+<!-- <if test="pid != null and pid != ''">AND a.id = #{pid}</if>-->
+<!-- <if test="campusid != null and campusid != ''">AND a.campusid = #{campusid}</if>-->
+<!-- <if test="name != null and name != ''">AND a.name like concat('%', #{name}, '%')</if>-->
+<!-- <if test="idcardno != null and idcardno != ''">AND a.idcardno = #{idcardno}</if>-->
+<!-- <if test="telcode != null and telcode != ''">AND a.telcode = #{telcode}</if>-->
+<!-- <if test="hospitaldistrictname != null and hospitaldistrictname != ''">AND d.hospitaldistrictname LIKE concat('%',#{hospitaldistrictname}, '%')</if>-->
+<!-- <if test="notrequiredFlag != null and notrequiredFlag != ''">AND a.notrequired_flag = #{notrequiredFlag}</if>-->
+<!-- <if test="leavediagname != null and leavediagname != ''">AND d.diagname LIKE concat('%',#{leavediagname}, '%')</if>-->
+<!-- <if test="hospitalname != null and hospitalname != ''">AND d.hospitalname = #{hospitalname}</if>-->
+<!-- <if test="visitno != null and visitno != ''">AND d.outhospno = #{visitno}</if>-->
+<!-- <if test="deptname != null and deptname != ''">AND d.deptname LIKE concat('%', #{deptname}, '%')</if>-->
+<!-- <if test="drname != null and drname != ''">AND d.drname LIKE concat('%',#{drname}, '%')</if>-->
+<!-- <if test="drcode != null">AND d.drcode = #{drcode}</if>-->
+<!-- <if test="pids != null">-->
+<!-- AND a.id NOT IN-->
+<!-- <foreach collection="pids" item="pid" open="(" separator="," close=")">-->
+<!-- #{pid}-->
+<!-- </foreach>-->
+<!-- </if>-->
+<!-- <if test="isFilter == true">-->
+<!-- AND NOT exists ( SELECT 1 FROM pat_filterlist f where d.patid=f.patid)-->
+<!-- </if>-->
+<!-- </select>-->
<!-- 浣撴鎮ｈ�呮�绘暟缁熻锛堝幓閲嶏級 -->
<select id="countPatArchiveInfoByPhysicalQC" parameterType="com.smartor.domain.PatArchiveReq" resultType="long">
--
Gitblit v1.9.3