Merge branch 'dev/20200716_1.3.9' into debug

# Conflicts:
#	src/main/java/com/diagbot/vo/QcResultShortPageVO.java

doc/017.20200716v1.3.8/qc_inti_check.sql

@@ -128,7 +128,7 @@ WHERE  userId IS NULL
  UPDATE sys_user_pageset a SET a.name = "病历核查状态" WHERE a.user_id <> -1 AND val ="checkStatus";
 
 -- 新增权限
-INSERT INTO `sys_menu`(`id`, `is_deleted`, `gmt_create`, `gmt_modified`, `creator`, `modifier`, `name`, `parent_id`, `code`, `show_status`, `maintain_status`, `order_no`, `remark`) VALUES (38, 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '31天再入院人数', 17, 'YH-ZKK-31TZRYRS', 1, 1, 14, '用户-质控科-31天再入院人数');
+INSERT INTO `sys_menu`(`id`, `is_deleted`, `gmt_create`, `gmt_modified`, `creator`, `modifier`, `name`, `parent_id`, `code`, `show_status`, `maintain_status`, `order_no`, `remark`) VALUES (38, 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '31日再入院病人数', 17, 'YH-ZKK-31TZRYRS', 1, 1, 14, '用户-质控科-31日再入院病人数');
 INSERT INTO `sys_role_menu`(`is_deleted`, `gmt_create`, `gmt_modified`, `creator`, `modifier`, `role_id`, `menu_id`, `remark`) VALUES ('N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', -1, 38, '用户-质控科-31天再入院人数');
 
 update sys_menu set name ='时效性相关统计' where id=37;

src/main/java/com/diagbot/dto/BehospitalInfoDTO.java

@@ -122,6 +122,8 @@ public class BehospitalInfoDTO implements Serializable {
     private Integer mrStatus;
     private String chName;
     private String mrName;
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
     private Date chTime;
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
     private Date mrTime;
 }

src/main/java/com/diagbot/vo/ReBeHosPageVO.java

@@ -32,4 +32,8 @@ public class ReBeHosPageVO extends Page {
      * 病人姓名
      */
     private String name;
+    /**
+     * 是否归档（0：未归档，1：已归档）
+     */
+    private String isPlacefile = "1";
 }

src/main/resources/mapper/BehospitalInfoMapper.xml

@@ -6426,7 +6426,9 @@
         med_behospital_info a
         WHERE
         a.is_deleted = 'N'
-        AND a.is_placefile = 1
+        <if test="reBeHosPageVO.isPlacefile != null and reBeHosPageVO.isPlacefile != ''">
+            and a.is_placefile = #{reBeHosPageVO.isPlacefile}
+        </if>
         AND a.qc_type_id != 0
         AND IFNULL( a.diagnose, '' )!= ''
         AND IFNULL( a.file_code, '' )!= ''
@@ -6454,7 +6456,9 @@
         med_behospital_info tt2
         WHERE
         tt2.is_deleted = 'N'
-        AND tt2.is_placefile = 1
+        <if test="reBeHosPageVO.isPlacefile != null and reBeHosPageVO.isPlacefile != ''">
+            and tt2.is_placefile = #{reBeHosPageVO.isPlacefile}
+        </if>
         AND tt2.qc_type_id != 0
         AND tt1.file_code = tt2.file_code
         AND tt1.diagnose = tt2.diagnose
@@ -6515,7 +6519,9 @@
         med_behospital_info a
         WHERE
         a.is_deleted = 'N'
-        AND a.is_placefile = 1
+        <if test="reBeHosPageVO.isPlacefile != null and reBeHosPageVO.isPlacefile != ''">
+            and a.is_placefile = #{reBeHosPageVO.isPlacefile}
+        </if>
         AND a.qc_type_id != 0
         AND IFNULL( a.diagnose, '' )!= ''
         AND IFNULL( a.file_code, '' )!= ''
@@ -6543,7 +6549,9 @@
         med_behospital_info tt2
         WHERE
         tt2.is_deleted = 'N'
-        AND tt2.is_placefile = 1
+        <if test="reBeHosPageVO.isPlacefile != null and reBeHosPageVO.isPlacefile != ''">
+            and tt2.is_placefile = #{reBeHosPageVO.isPlacefile}
+        </if>
         AND tt2.qc_type_id != 0
         AND tt1.file_code = tt2.file_code
         AND tt1.diagnose = tt2.diagnose