From 63fe18b839c3bcb9c639707fbd9787844c3a122b Mon Sep 17 00:00:00 2001
From: zhangheng <3226558941@qq.com>
Date: Wed, 26 Mar 2025 09:44:50 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E5=AF=BC=E5=85=A5=E5=90=8D?=
 =?UTF-8?q?=E7=A7=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../PatientInfoImportMain.java                |  9 ++++++++-
 .../PatientInfoImportMainMapper.xml           | 19 ++++++++++++++++++-
 2 files changed, 26 insertions(+), 2 deletions(-)

diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/domain/patientinfoimportmain/PatientInfoImportMain.java b/postdischarge-manage/src/main/java/com/xinelu/manage/domain/patientinfoimportmain/PatientInfoImportMain.java
index bd374c8d..41ff0ab2 100644
--- a/postdischarge-manage/src/main/java/com/xinelu/manage/domain/patientinfoimportmain/PatientInfoImportMain.java
+++ b/postdischarge-manage/src/main/java/com/xinelu/manage/domain/patientinfoimportmain/PatientInfoImportMain.java
@@ -79,6 +79,13 @@ public class PatientInfoImportMain extends BaseEntity {
     @Excel(name = "患者导入情况")
     private String importStatus;
 
+    /**
+     * 导入批次名称
+     */
+    @ApiModelProperty(value = "导入批次名称")
+    @Excel(name = "导入批次名称")
+    private String importName;
+
     @Override
     public String toString() {
         return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE)
@@ -93,4 +100,4 @@ public class PatientInfoImportMain extends BaseEntity {
                 .append("followupCount", getFollowupCount())
                 .toString();
     }
-}
+}
\ No newline at end of file
diff --git a/postdischarge-manage/src/main/resources/mapper/manage/patientinfoimportmain/PatientInfoImportMainMapper.xml b/postdischarge-manage/src/main/resources/mapper/manage/patientinfoimportmain/PatientInfoImportMainMapper.xml
index ba83917e..f0266de4 100644
--- a/postdischarge-manage/src/main/resources/mapper/manage/patientinfoimportmain/PatientInfoImportMainMapper.xml
+++ b/postdischarge-manage/src/main/resources/mapper/manage/patientinfoimportmain/PatientInfoImportMainMapper.xml
@@ -15,6 +15,7 @@
         <result property="followupStatus" column="followup_status"/>
         <result property="followupCount" column="followup_count"/>
         <result property="importStatus" column="import_status"/>
+        <result property="importName" column="import_status"/>
     </resultMap>
     <resultMap type="com.xinelu.manage.vo.patientinfoimportmain.PatientInfoImportMainVO" id="PatientInfoImportVOResult">
         <result property="id" column="id"/>
@@ -29,7 +30,7 @@
         <result property="importStatus" column="import_status"/>
     </resultMap>
     <sql id="selectPatientInfoImportMainVo">
-        select id, sn, create_time, create_by, hospital_agency_id, hospital_agency_name, file_name, followup_status, followup_count, import_status from patient_info_import_main
+        select id, sn, create_time, create_by, hospital_agency_id, hospital_agency_name, file_name, followup_status, followup_count, import_status ,import_name from patient_info_import_main
     </sql>
 
     <select id="selectPatientInfoImportMainList" parameterType="PatientInfoImportMain" resultMap="PatientInfoImportMainResult">
@@ -56,6 +57,9 @@
             <if test="importStatus != null ">
                 and import_status = #{importStatus}
             </if>
+            <if test="importName != null ">
+                and import_name like concat('%', #{importName}, '%')
+            </if>
         </where>
     </select>
     <select id="GetPatientInfoImport" resultType="com.xinelu.manage.vo.patientinfoimportmain.PatientInfoImportMainVO"
@@ -78,6 +82,9 @@
             <if test="campusAgencyId != null ">
                 and p.hospital_agency_id = #{campusAgencyId}
             </if>
+            <if test="importName != null ">
+                and import_name like concat('%', #{importName}, '%')
+            </if>
             <!-- 数据范围过滤 -->
             ${params.dataScope}
         </where>
@@ -113,6 +120,8 @@
             </if>
             <if test="importStatus != null">import_status,
             </if>
+            <if test="importName != null">import_name,
+            </if>
         </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="sn != null">#{sn},
@@ -133,6 +142,8 @@
             </if>
             <if test="importStatus != null">#{importStatus},
             </if>
+            <if test="importName != null">#{importName},
+            </if>
         </trim>
     </insert>
 
@@ -166,6 +177,9 @@
             <if test="importStatus != null">import_status =
                 #{importStatus},
             </if>
+            <if test="importName != null">import_name =
+                #{importName},
+            </if>
         </trim>
         where id = #{id}
     </update>
@@ -210,6 +224,9 @@
             <if test="importStatus != null">import_status =
                 #{importStatus},
             </if>
+            <if test="importName != null">import_name =
+                #{importName},
+            </if>
         </trim>
         where sn = #{sn}
     </update>