From 21cdddd964cb8dc1f88860114b5f130c1c57cb6d Mon Sep 17 00:00:00 2001
From: haown <454902499@qq.com>
Date: Tue, 14 Nov 2023 10:22:21 +0800
Subject: [PATCH] =?UTF-8?q?update=3D=3D=3D>:=E6=9C=BA=E6=9E=84=E5=A2=9E?=
 =?UTF-8?q?=E5=8A=A0=E6=A0=87=E8=AF=86=E5=8C=BA=E5=88=86=E9=BD=90=E9=B2=81?=
 =?UTF-8?q?=E5=90=8D=E5=8C=BB=E6=9C=BA=E6=9E=84=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../domain/hospitalinfo/HospitalInfo.java     |  6 ++-
 .../hospitalinfo/HospitalInfoMapper.xml       | 46 ++++++++++++-------
 2 files changed, 35 insertions(+), 17 deletions(-)

diff --git a/xinelu-nurse-manage/src/main/java/com/xinelu/manage/domain/hospitalinfo/HospitalInfo.java b/xinelu-nurse-manage/src/main/java/com/xinelu/manage/domain/hospitalinfo/HospitalInfo.java
index fd4d15d..04154bd 100644
--- a/xinelu-nurse-manage/src/main/java/com/xinelu/manage/domain/hospitalinfo/HospitalInfo.java
+++ b/xinelu-nurse-manage/src/main/java/com/xinelu/manage/domain/hospitalinfo/HospitalInfo.java
@@ -91,6 +91,9 @@ public class HospitalInfo extends BaseDomain implements Serializable {
     @ApiModelProperty(value = "家医机构编号")
     private String orgCode;
 
+	@ApiModelProperty(value = "医院类别,1:家医机构，2：齐鲁名医机构")
+	private String category;
+
     @Override
     public String toString() {
         return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE)
@@ -101,11 +104,12 @@ public class HospitalInfo extends BaseDomain implements Serializable {
                 .append("phone", getPhone())
                 .append("hospitalIntroduce", getHospitalIntroduce())
                 .append("hospitalSort", getHospitalSort())
+	            .append("orgCode", getOrgCode())
+	            .append("category", getCategory())
                 .append("createBy", getCreateBy())
                 .append("createTime", getCreateTime())
                 .append("updateBy", getUpdateBy())
                 .append("updateTime", getUpdateTime())
-                .append("orgCode", getOrgCode())
                 .toString();
     }
 }
diff --git a/xinelu-nurse-manage/src/main/resources/mapper/manage/hospitalinfo/HospitalInfoMapper.xml b/xinelu-nurse-manage/src/main/resources/mapper/manage/hospitalinfo/HospitalInfoMapper.xml
index 3a9d51c..461239e 100644
--- a/xinelu-nurse-manage/src/main/resources/mapper/manage/hospitalinfo/HospitalInfoMapper.xml
+++ b/xinelu-nurse-manage/src/main/resources/mapper/manage/hospitalinfo/HospitalInfoMapper.xml
@@ -12,11 +12,12 @@
         <result property="phone" column="phone"/>
         <result property="hospitalIntroduce" column="hospital_introduce"/>
         <result property="hospitalSort" column="hospital_sort"/>
-        <result property="createBy" column="create_by"/>
-        <result property="createTime" column="create_time"/>
-        <result property="updateBy" column="update_by"/>
-        <result property="updateTime" column="update_time"/>
         <result property="orgCode" column="org_code"/>
+	    <result property="category" column="category"/>
+	    <result property="createBy" column="create_by"/>
+	    <result property="createTime" column="create_time"/>
+	    <result property="updateBy" column="update_by"/>
+	    <result property="updateTime" column="update_time"/>
     </resultMap>
 
     <sql id="selectHospitalInfoVo">
@@ -27,11 +28,12 @@
                phone,
                hospital_introduce,
                hospital_sort,
+               org_code,
+               category,
                create_by,
                create_time,
                update_by,
-               update_time,
-               org_code
+               update_time
         from hospital_info
     </sql>
 
@@ -56,9 +58,12 @@
             <if test="hospitalIntroduce != null  and hospitalIntroduce != ''">
                 and hospital_introduce = #{hospitalIntroduce}
             </if>
-            <if test="hospitalSort != null ">
+            <if test="hospitalSort != null">
                 and hospital_sort = #{hospitalSort}
             </if>
+	        <if test="category != null and category != ''">
+		        and category = #{category}
+	        </if>
         </where>
         ORDER BY id DESC
     </select>
@@ -85,6 +90,12 @@
             </if>
             <if test="hospitalSort != null">hospital_sort,
             </if>
+	        <if test="orgCode != null">
+		        org_code,
+	        </if>
+	        <if test="category != null">
+		        category,
+	        </if>
             <if test="createBy != null">create_by,
             </if>
             <if test="createTime != null">create_time,
@@ -93,9 +104,6 @@
             </if>
             <if test="updateTime != null">update_time,
             </if>
-            <if test="orgCode != null">
-                org_code,
-            </if>
         </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="hospitalName != null">#{hospitalName},
@@ -110,6 +118,12 @@
             </if>
             <if test="hospitalSort != null">#{hospitalSort},
             </if>
+	        <if test="orgCode != null">
+		        #{orgCode},
+	        </if>
+	        <if test="category != null">
+		        #{category},
+	        </if>
             <if test="createBy != null">#{createBy},
             </if>
             <if test="createTime != null">#{createTime},
@@ -118,9 +132,6 @@
             </if>
             <if test="updateTime != null">#{updateTime},
             </if>
-            <if test="orgCode != null">
-                #{orgCode},
-            </if>
         </trim>
     </insert>
 
@@ -145,6 +156,12 @@
             <if test="hospitalSort != null">hospital_sort =
                 #{hospitalSort},
             </if>
+	        <if test="orgCode != null">
+		        org_code = #{orgCode},
+	        </if>
+	        <if test="category != null">
+		        category = #{category},
+	        </if>
             <if test="createBy != null">create_by =
                 #{createBy},
             </if>
@@ -157,9 +174,6 @@
             <if test="updateTime != null">update_time =
                 #{updateTime},
             </if>
-            <if test="orgCode != null">
-                org_code = #{orgCode},
-            </if>
         </trim>
         where id = #{id}
     </update>