新增政治面貌等需求

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;

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> " +

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;
+
     /**
      * 账号名称
      */

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);
 

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;