From cc479e6a056785103996cc7ea67dbd5faa3e800e Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期一, 19 十月 2026 18:07:22 +0800
Subject: [PATCH] 数据采集模块

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

diff --git a/smartor/src/main/resources/mapper/smartor/PatArchiveMapper.xml b/smartor/src/main/resources/mapper/smartor/PatArchiveMapper.xml
index 903ceaa..63cfe9d 100644
--- a/smartor/src/main/resources/mapper/smartor/PatArchiveMapper.xml
+++ b/smartor/src/main/resources/mapper/smartor/PatArchiveMapper.xml
@@ -4,7 +4,7 @@
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.smartor.mapper.PatArchiveMapper">
 
-    <resultMap type="com.smartor.domain.PatArchive" id="PatArchiveResult">
+    <resultMap type="com.ruoyi.common.core.domain.entity.PatArchive" id="PatArchiveResult">
         <result property="id" column="id"/>
         <result property="patientno" column="patientno"/>
         <result property="sourcefrom" column="sourcefrom"/>
@@ -181,10 +181,11 @@
         from pat_archive
     </sql>
 
-    <select id="selectPatArchiveList" parameterType="com.smartor.domain.PatArchive" resultMap="PatArchiveResult">
+    <select id="selectPatArchiveList" parameterType="com.ruoyi.common.core.domain.entity.PatArchive" resultMap="PatArchiveResult">
         <include refid="selectPatArchiveVo"/>
         where 1=1
             and del_flag = 0
+            <if test="orgid != null and orgid != ''"> and orgid = #{orgid}</if>
             <if test="name != null  and name != ''">and name like concat('%', #{name}, '%')</if>
             <if test="idcardno != null  and idcardno != ''">and idcardno = #{idcardno}</if>
             <if test="sourcefrom != null ">and sourcefrom = #{sourcefrom}</if>
@@ -291,7 +292,7 @@
         </foreach>
     </select>
 
-    <insert id="insertPatArchiveSingle" parameterType="com.smartor.domain.PatArchive" useGeneratedKeys="true"
+    <insert id="insertPatArchiveSingle" parameterType="com.ruoyi.common.core.domain.entity.PatArchive" useGeneratedKeys="true"
             keyProperty="id">
         insert into pat_archive
         <trim prefix="(" suffix=")" suffixOverrides=",">
@@ -413,7 +414,7 @@
         </foreach>
     </insert>
 
-    <update id="updatePatArchive" parameterType="com.smartor.domain.PatArchive">
+    <update id="updatePatArchive" parameterType="com.ruoyi.common.core.domain.entity.PatArchive">
         update pat_archive
         <trim prefix="SET" suffixOverrides=",">
             <if test="name != null">name = #{name},</if>
@@ -612,7 +613,10 @@
             and d.orgid = #{orgid}
             <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="pid != null  and pid != ''">and a.id = #{id}</if>
+            <!-- 鍘熶负 `and a.id = #{id}`锛歅atArchiveReq 涓婃病鏈� id锛堝彧鏈� pid锛夛紝
+                 鏉′欢鍒ょ殑鏄� pid 鍗村彇 id 鈥斺�� 杩欐潯鏌ヨ锛堟寜浣忛櫌璁板綍鏌ユ。妗堬級涓�鎵ц灏辨姏
+                 ReflectionException: no getter for 'id'銆傚崰浣嶇鎸� pid 鍙栥�� -->
+            <if test="pid != null  and pid != ''">and a.id = #{pid}</if>
             <if test="campusid != null  and campusid != ''">and a.campusid = #{campusid}</if>
             <if test="telcode != null  and telcode != ''">and a.telcode = #{telcode}</if>
             <if test="notrequiredFlag != null  and notrequiredFlag != ''">and a.notrequired_flag = #{notrequiredFlag}
@@ -937,7 +941,8 @@
             and d.orgid = #{orgid}
             <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="pid != null  and pid != ''">and a.id = #{id}</if>
+            <!-- 鍚屼笂锛圦C 鐗堣鍙ワ級锛氬崰浣嶇 id -> pid銆� -->
+            <if test="pid != null  and pid != ''">and a.id = #{pid}</if>
             <if test="telcode != null  and telcode != ''">and a.telcode = #{telcode}</if>
             <if test="notrequiredFlag != null  and notrequiredFlag != ''">and a.notrequired_flag = #{notrequiredFlag}
             </if>
@@ -1204,11 +1209,6 @@
         WHERE 1=1
             AND d.del_flag != 1
             AND d.orgid = #{orgid}
-            <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="pid != null  and pid != ''">AND a.id = #{id}</if>
-            <if test="telcode != null  and telcode != ''">AND a.telcode = #{telcode}</if>
-            <if test="notrequiredFlag != null  and notrequiredFlag != ''">AND a.notrequired_flag = #{notrequiredFlag}</if>
             <if test="hospitalname != null and hospitalname != ''">AND d.hospitalname = #{hospitalname}</if>
             <if test="hospitaldistrictname != null and hospitaldistrictname != ''">AND d.hospitaldistrictname LIKE concat('%',#{hospitaldistrictname}, '%')</if>
             <if test="leaveicd10code != null and leaveicd10code != ''">AND d.leaveicd10code LIKE concat('%',#{leaveicd10code}, '%')</if>

--
Gitblit v1.9.3