From 9526971c403417c1c007804f24884c443b9e6cd7 Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期三, 04 九月 2024 00:34:40 +0800
Subject: [PATCH] 代码提交

---
 smartor/src/main/resources/mapper/smartor/PatArchiveMapper.xml |  157 +++++++++++++++++++++++++++++++++++-----------------
 1 files changed, 106 insertions(+), 51 deletions(-)

diff --git a/smartor/src/main/resources/mapper/smartor/PatArchiveMapper.xml b/smartor/src/main/resources/mapper/smartor/PatArchiveMapper.xml
index e8e8dc2..8018494 100644
--- a/smartor/src/main/resources/mapper/smartor/PatArchiveMapper.xml
+++ b/smartor/src/main/resources/mapper/smartor/PatArchiveMapper.xml
@@ -6,6 +6,12 @@
 
     <resultMap type="com.smartor.domain.PatArchive" id="PatArchiveResult">
         <result property="id" column="id"/>
+        <result property="patientno" column="patientno"/>
+        <result property="sourcefrom" column="sourcefrom"/>
+        <result property="patidHis" column="patid_his"/>
+        <result property="sdFlag" column="sd_flag"/>
+        <result property="pattype" column="pattype"/>
+        <result property="viptype" column="viptype"/>
         <result property="name" column="name"/>
         <result property="sex" column="sex"/>
         <result property="nation" column="nation"/>
@@ -35,11 +41,13 @@
         <result property="pattype" column="pattype"/>
         <result property="bedNo" column="bedno"/>
         <result property="inhosptime" column="inhosptime"/>
-        <result property="viptype" column="viptype"/>
     </resultMap>
 
     <sql id="selectPatArchiveVo">
         select id,
+               patientno,
+               patid_his,
+               sd_flag,
                name,
                sex,
                idcardno,
@@ -82,6 +90,9 @@
             <if test="uploadTime != null ">and upload_time = #{uploadTime}</if>
             <if test="viptype != null ">and viptype = #{viptype}</if>
             <if test="pattype != null ">and pattype = #{pattype}</if>
+            <if test="patientno != null ">and patientno = #{patientno}</if>
+            <if test="patidHis != null ">and patid_his = #{patidHis}</if>
+            <if test="sdFlag != null ">and sd_flag = #{sdFlag}</if>
         </where>
     </select>
 
@@ -89,6 +100,9 @@
     <select id="patInfoByContion" parameterType="com.smartor.domain.PatArchiveReq" resultMap="PatArchiveResult">
         select
         a.id,
+        a.patientno,
+        a.patid_his,
+        a.sd_flag,
         a.name,
         a.sex,
         c.tagname as tag,
@@ -120,62 +134,88 @@
         where id = #{id} and del_flag=0
     </select>
 
-    <insert id="insertPatArchive">
-        <!--        insert into pat_archive-->
-        <!--        <trim prefix="(" suffix=")" suffixOverrides=",">-->
-        <!--            name,-->
-        <!--            sex,-->
-        <!--            iccardno-->
-        <!--&lt;!&ndash;            <if test="birthdate != null">birthdate,</if>&ndash;&gt;-->
-        <!--&lt;!&ndash;            <if test="age != null">age,</if>&ndash;&gt;-->
-        <!--&lt;!&ndash;            <if test="sourcefrom != null">sourcefrom,</if>&ndash;&gt;-->
-        <!--&lt;!&ndash;            <if test="archivetime != null">archivetime,</if>&ndash;&gt;-->
-        <!--&lt;!&ndash;            <if test="archiveby != null">archiveby,</if>&ndash;&gt;-->
-        <!--&lt;!&ndash;            <if test="telcode != null">telcode,</if>&ndash;&gt;-->
-        <!--&lt;!&ndash;            <if test="relativetelcode != null">relativetelcode,</if>&ndash;&gt;-->
-        <!--&lt;!&ndash;            <if test="iccardtype != null">iccardtype,</if>&ndash;&gt;-->
-        <!--&lt;!&ndash;            <if test="orgid != null">orgid,</if>&ndash;&gt;-->
-        <!--&lt;!&ndash;            <if test="openid != null">openid,</if>&ndash;&gt;-->
-        <!--&lt;!&ndash;            <if test="delFlag != null and delFlag != ''">del_flag,</if>&ndash;&gt;-->
-        <!--&lt;!&ndash;            <if test="updateBy != null">update_by,</if>&ndash;&gt;-->
-        <!--&lt;!&ndash;            <if test="updateTime != null">update_time,</if>&ndash;&gt;-->
-        <!--&lt;!&ndash;            <if test="createBy != null">create_by,</if>&ndash;&gt;-->
-        <!--&lt;!&ndash;            <if test="createTime != null">create_time,</if>&ndash;&gt;-->
-        <!--&lt;!&ndash;            <if test="isupload != null">isupload,</if>&ndash;&gt;-->
-        <!--&lt;!&ndash;            <if test="uploadTime != null">upload_time,</if>&ndash;&gt;-->
-        <!--        </trim>-->
-        <!--        <trim prefix="values (" suffix=")" suffixOverrides=",">-->
-        <!--            <foreach item="item" index="index" collection="list" separator=",">-->
-        <!--                <if test="name != null">#{item.name},</if>-->
-        <!--                <if test="sex != null">#{item.sex},</if>-->
-        <!--                <if test="iccardno != null">#{item.iccardno},</if>-->
-        <!--&lt;!&ndash;                <if test="birthdate != null">#{birthdate},</if>&ndash;&gt;-->
-        <!--&lt;!&ndash;                <if test="age != null">#{item.age},</if>&ndash;&gt;-->
-        <!--&lt;!&ndash;                <if test="sourcefrom != null">#{item.sourcefrom},</if>&ndash;&gt;-->
-        <!--&lt;!&ndash;                <if test="archivetime != null">#{item.archivetime},</if>&ndash;&gt;-->
-        <!--&lt;!&ndash;                <if test="archiveby != null">#{item.archiveby},</if>&ndash;&gt;-->
-        <!--&lt;!&ndash;                <if test="telcode != null">#{item.telcode},</if>&ndash;&gt;-->
-        <!--&lt;!&ndash;                <if test="relativetelcode != null">#{item.relativetelcode},</if>&ndash;&gt;-->
-        <!--&lt;!&ndash;                <if test="iccardtype != null">#{item.iccardtype},</if>&ndash;&gt;-->
-        <!--&lt;!&ndash;                <if test="orgid != null">#{item.orgid},</if>&ndash;&gt;-->
-        <!--&lt;!&ndash;                <if test="openid != null">#{item.openid},</if>&ndash;&gt;-->
-        <!--&lt;!&ndash;                <if test="delFlag != null and delFlag != ''">#{item.delFlag},</if>&ndash;&gt;-->
-        <!--&lt;!&ndash;                <if test="updateBy != null">#{item.updateBy},</if>&ndash;&gt;-->
-        <!--&lt;!&ndash;                <if test="updateTime != null">#{item.updateTime},</if>&ndash;&gt;-->
-        <!--&lt;!&ndash;                <if test="createBy != null">#{item.createBy},</if>&ndash;&gt;-->
-        <!--&lt;!&ndash;                <if test="createTime != null">#{item.createTime},</if>&ndash;&gt;-->
-        <!--&lt;!&ndash;                <if test="isupload != null">#{item.isupload},</if>&ndash;&gt;-->
-        <!--&lt;!&ndash;                <if test="uploadTime != null">#{item.uploadTime},</if>&ndash;&gt;-->
-        <!--            </foreach>-->
-        <!--        </trim>-->
+    <insert id="insertPatArchiveSingle" parameterType="com.smartor.domain.PatArchive" useGeneratedKeys="true"
+            keyProperty="id">
+        insert into pat_archive
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="patientno != null">patientno,</if>
+            <if test="patidHis != null">patid_his,</if>
+            <if test="sdFlag != null">sd_flag,</if>
+            <if test="pattype != null">pattype,</if>
+            <if test="viptype != null">viptype,</if>
+            <if test="name != null">name,</if>
+            <if test="sex != null">sex,</if>
+            <if test="nation != null">nation,</if>
+            <if test="nativePlace != null">native_place,</if>
+            <if test="placeOfResidence != null">place_of_residence,</if>
+            <if test="birthplace != null">birthplace,</if>
+            <if test="idcardno != null">idcardno,</if>
+            <if test="dduserid != null">dduserid,</if>
+            <if test="pid != null">pid,</if>
+            <if test="guid != null">guid,</if>
+            <if test="birthdate != null">birthdate,</if>
+            <if test="age != null">age,</if>
+            <if test="sourcefrom != null">sourcefrom,</if>
+            <if test="archivetime != null">archivetime,</if>
+            <if test="archiveby != null">archiveby,</if>
+            <if test="telcode != null">telcode,</if>
+            <if test="relativetelcode != null">relativetelcode,</if>
+            <if test="idcardtype != null">idcardtype,</if>
+            <if test="orgid != null">orgid,</if>
+            <if test="openid != null">openid,</if>
+            <if test="delFlag != null and delFlag != ''">del_flag,</if>
+            <if test="updateBy != null">update_by,</if>
+            <if test="updateTime != null">update_time,</if>
+            <if test="createBy != null">create_by,</if>
+            <if test="createTime != null">create_time,</if>
+            <if test="isupload != null">isupload,</if>
+            <if test="uploadTime != null">upload_time,</if>
+        </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="patientno != null">#{patientno},</if>
+            <if test="patidHis != null">#{patidHis},</if>
+            <if test="sdFlag != null">#{sdFlag},</if>
+            <if test="pattype != null">#{pattype},</if>
+            <if test="viptype != null">#{>viptype},</if>
+            <if test="name != null">#{name},</if>
+            <if test="sex != null">#{sex},</if>
+            <if test="nation != null">#{nation},</if>
+            <if test="nativePlace != null">#{nativePlace},</if>
+            <if test="placeOfResidence != null">#{placeOfResidence},</if>
+            <if test="birthplace != null">#{birthplace},</if>
+            <if test="idcardno != null">#{idcardno},</if>
+            <if test="dduserid != null">#{dduserid},</if>
+            <if test="pid != null">#{pid},</if>
+            <if test="guid != null">#{guid},</if>
+            <if test="birthdate != null">#{birthdate},</if>
+            <if test="age != null">#{age},</if>
+            <if test="sourcefrom != null">#{sourcefrom},</if>
+            <if test="archivetime != null">#{archivetime},</if>
+            <if test="archiveby != null">#{archiveby},</if>
+            <if test="telcode != null">#{telcode},</if>
+            <if test="relativetelcode != null">#{relativetelcode},</if>
+            <if test="idcardtype != null">#{idcardtype},</if>
+            <if test="orgid != null">#{orgid},</if>
+            <if test="openid != null">#{openid},</if>
+            <if test="delFlag != null and delFlag != ''">#{delFlag},</if>
+            <if test="updateBy != null">#{updateBy},</if>
+            <if test="updateTime != null">#{updateTime},</if>
+            <if test="createBy != null">#{createBy},</if>
+            <if test="createTime != null">#{createTime},</if>
+            <if test="isupload != null">#{isupload},</if>
+            <if test="uploadTime != null">#{uploadTime},</if>
+        </trim>
+    </insert>
 
+    <insert id="insertPatArchive">
         insert into
         pat_archive(name,viptype,sex,idcardno,birthdate,place_of_residence,age,sourcefrom,archivetime,archiveby,telcode,relativetelcode,idcardtype,orgid,openid,dduserid,update_by,update_time
-        ,create_by,create_time,isupload,upload_time,pattype,nation,birthplace,native_place) values
+        ,create_by,create_time,isupload,upload_time,pattype,nation,birthplace,native_place,patientno,patid_his,sd_flag)
+        values
         <foreach item="item" index="index" collection="list" separator=",">
             (#{item.name},#{item.viptype},#{item.sex},#{item.idcardno},#{item.birthdate},#{item.placeOfResidence},#{item.age},#{item.sourcefrom},#{item.archivetime},#{item.archiveby}
             ,#{item.telcode},#{item.archiveby},#{item.idcardtype},#{item.orgid},#{item.openid},#{item.dduserid},#{item.updateBy},
-            #{item.updateTime},#{item.createBy},#{item.createTime},#{item.isupload},#{item.uploadTime},#{item.pattype},#{item.nation},#{item.birthplace},#{item.nativePlace}
+            #{item.updateTime},#{item.createBy},#{item.createTime},#{item.isupload},#{item.uploadTime},#{item.pattype},#{item.nation},#{item.birthplace},#{item.nativePlace},#{item.patientno},#{item.patidHis},#{item.sdFlag}
             )
         </foreach>
     </insert>
@@ -206,6 +246,9 @@
             <if test="isupload != null">isupload = #{isupload},</if>
             <if test="uploadTime != null">upload_time = #{uploadTime},</if>
             <if test="viptype != null">viptype = #{viptype},</if>
+            <if test="viptype != null">patientno = #{patientno},</if>
+            <if test="viptype != null">patid_his = #{patidHis},</if>
+            <if test="viptype != null">sd_flag = #{sdFlag},</if>
         </trim>
         where id = #{id}
     </update>
@@ -228,6 +271,9 @@
 
         SELECT
         a.id,
+        a.patid_his,
+        a.sd_flag,
+        a.patientno,
         a.NAME,
         a.sex,
         a.nation,
@@ -281,6 +327,9 @@
 
         select
         a.id,
+        a.patid_his,
+        a.sd_flag,
+        a.patientno,
         a.NAME,
         d.deptname,
         a.sex,
@@ -369,6 +418,9 @@
 
         select
         a.id,
+        a.patid_his,
+        a.sd_flag,
+        a.patientno,
         d.deptname,
         a.name,
         a.sex,
@@ -443,6 +495,9 @@
         select
         a.id,
         a.name,
+        a.patid_his,
+        a.sd_flag,
+        a.patientno,
         a.sex,
         d.deptname,
         a.nation,

--
Gitblit v1.9.3