From d75ccfe88974cc15e9ae504e5d85a1a099b7ee7c Mon Sep 17 00:00:00 2001
From: "aoli.qu" <408346101@qq.com>
Date: Mon, 30 Oct 2023 00:07:21 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E6=94=BF=E6=B2=BB=E9=9D=A2?=
 =?UTF-8?q?=E8=B2=8C=E7=AD=89=E9=9C=80=E6=B1=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/org/web/hospital/domain/BcHospitalRecord.java     | 8 +++++++-
 .../org/web/hospital/mapper/BcHospitalRecordMapper.java   | 8 ++++++--
 .../java/com/org/web/person/domain/BcPersonService.java   | 5 +++++
 .../com/org/web/person/mapper/BcPersonServiceMapper.java  | 2 +-
 src/main/java/com/org/web/room/domain/BcRoomBed.java      | 2 +-
 5 files changed, 20 insertions(+), 5 deletions(-)

diff --git a/src/main/java/com/org/web/hospital/domain/BcHospitalRecord.java b/src/main/java/com/org/web/hospital/domain/BcHospitalRecord.java
index bf64ec6..b5ec7b2 100644
--- a/src/main/java/com/org/web/hospital/domain/BcHospitalRecord.java
+++ b/src/main/java/com/org/web/hospital/domain/BcHospitalRecord.java
@@ -79,6 +79,12 @@ public class BcHospitalRecord extends BaseEntity {
     @TableField(exist = false)
     private Integer type;
 
+    /**
+     * 退房时间类型 1-全部 2-今年
+     */
+    @TableField(exist = false)
+    private Integer returnType;
+
     /**
      * 人员名称
      */
@@ -90,7 +96,7 @@ public class BcHospitalRecord extends BaseEntity {
     @TableField(exist = false)
     private String roomName;
     /**
-     * 床位名称
+     * 床位号
      */
     @TableField(exist = false)
     private String bedName;
diff --git a/src/main/java/com/org/web/hospital/mapper/BcHospitalRecordMapper.java b/src/main/java/com/org/web/hospital/mapper/BcHospitalRecordMapper.java
index 156ee7d..65f1449 100644
--- a/src/main/java/com/org/web/hospital/mapper/BcHospitalRecordMapper.java
+++ b/src/main/java/com/org/web/hospital/mapper/BcHospitalRecordMapper.java
@@ -41,8 +41,12 @@ public interface BcHospitalRecordMapper extends BaseMapper<BcHospitalRecord> {
             "               and a.check_out_time is null " +
             "           </when> " +
             "           <when test=\"type == 2\"> " +
-//            "                and a.check_out_time is not null " +
-            "                and 1 = 1 " +
+            "                and a.check_out_time is not null " +
+
+            "               <if test = 'returnType != null and returnType == 2'>" +
+            "                   and year(a.check_out_time) = year(curdate()) " +
+            "               </if>" +
+
             "           </when> " +
             "       </choose> " +
             "  </if> " +
diff --git a/src/main/java/com/org/web/person/domain/BcPersonService.java b/src/main/java/com/org/web/person/domain/BcPersonService.java
index dbc4fea..5b72585 100644
--- a/src/main/java/com/org/web/person/domain/BcPersonService.java
+++ b/src/main/java/com/org/web/person/domain/BcPersonService.java
@@ -101,6 +101,11 @@ public class BcPersonService extends BaseEntity {
      */
     private String certificate;
 
+    /**
+     * 政治面貌 数据字典0060
+     */
+    private Integer politicalOutlook;
+
     /**
      * 账号名称
      */
diff --git a/src/main/java/com/org/web/person/mapper/BcPersonServiceMapper.java b/src/main/java/com/org/web/person/mapper/BcPersonServiceMapper.java
index 50406e9..c922ef5 100644
--- a/src/main/java/com/org/web/person/mapper/BcPersonServiceMapper.java
+++ b/src/main/java/com/org/web/person/mapper/BcPersonServiceMapper.java
@@ -27,7 +27,7 @@ public interface BcPersonServiceMapper extends BaseMapper<BcPersonService> {
             "  and phone like concat('%', #{phone}, '%') " +
             " </if> " +
 
-            " order by create_time desc " +
+            " order by create_time  " +
             "</script>")
     List<BcPersonService> queryList(BcPersonService person);
 
diff --git a/src/main/java/com/org/web/room/domain/BcRoomBed.java b/src/main/java/com/org/web/room/domain/BcRoomBed.java
index 42fd084..344a656 100644
--- a/src/main/java/com/org/web/room/domain/BcRoomBed.java
+++ b/src/main/java/com/org/web/room/domain/BcRoomBed.java
@@ -20,7 +20,7 @@ public class BcRoomBed extends BaseEntity {
     private Long id;
 
     /**
-     * 床位名称
+     * 床位号
      */
     private String name;