Merge remote-tracking branch 'origin/test' into test

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

@@ -30,7 +30,7 @@ public class QcResultShortDTO {
      */
     @Excel(name = "病历得分", width = 30, orderNum = "2")
     private Double scoreRes;
-    @Excel(name = "病人住院号", width = 40, orderNum = "3")
+    @Excel(name = "病人住院序号", width = 40, orderNum = "3")
     private String behospitalCode;
     @Excel(name = "病案号", width = 30, orderNum = "4")
     private String fileCode;
@@ -63,7 +63,7 @@ public class QcResultShortDTO {
     /**
      * 主治医生姓名
      */
-    @Excel(name = "主治医生", width = 30, orderNum = "14")
+    @Excel(name = "主管医生", width = 30, orderNum = "14")
     private String doctorName;
     private String directorDoctorId;
     @Excel(name = "主任医生", width = 30, orderNum = "15")

src/main/resources/application-test.yml

@@ -165,7 +165,7 @@ qc.address: http://192.168.2.241:6009
 
 # 加解密开关
 encrypt:
-  enable: false
+  enable: true
 
 swagger:
   enable: true

src/main/resources/mapper/BehospitalInfoMapper.xml

@@ -2704,7 +2704,7 @@
         t1.diagnose,
         t1.ward_name AS wardName,
         t2.age,
-        t2.file_code AS fileCode
+        t1.file_code AS fileCode
         FROM
         (
         SELECT DISTINCT
@@ -2715,6 +2715,7 @@
         a.hospital_id,
         a.behospital_code,
         a.bed_code,
+        a.file_code,
         b.LEVEL,
         b.grade_type,
         b.score_res,
@@ -2819,12 +2820,12 @@
             AND tt1.behospital_code = tt2.behospital_code
         </if>
         ) t1
-        <if test="qcResultShortPageVO.casesEntryId == null or (qcResultShortPageVO.casesEntryId!=2594  and qcResultShortPageVO.casesEntryId!=2973 and qcResultShortPageVO.casesEntryId!=2166)">
+        <if test="qcResultShortPageVO.casesEntryId == null or (qcResultShortPageVO.casesEntryId!=2594  and qcResultShortPageVO.casesEntryId!=2973 and qcResultShortPageVO.casesEntryId!=2930)">
             LEFT JOIN med_home_page t2 ON t1.hospital_id = t2.hospital_id
             AND t1.behospital_code = t2.behospital_code
             AND t2.is_deleted = 'N'
         </if>
-        <if test="qcResultShortPageVO.casesEntryId != null and( qcResultShortPageVO.casesEntryId==2594  or qcResultShortPageVO.casesEntryId==2973 or qcResultShortPageVO.casesEntryId==2166)">
+        <if test="qcResultShortPageVO.casesEntryId != null and( qcResultShortPageVO.casesEntryId==2594  or qcResultShortPageVO.casesEntryId==2973 or qcResultShortPageVO.casesEntryId==2930)">
             , med_home_page t2
             , med_home_operation_info t3
             WHERE t1.hospital_id = t2.hospital_id
@@ -2862,13 +2863,14 @@
         t1.diagnose,
         t1.ward_name AS wardName,
         t2.age,
-        t2.file_code AS fileCode
+        t1.file_code AS fileCode
         FROM
         (
         SELECT DISTINCT
         a.hospital_id,
         a.behospital_code,
         a.bed_code,
+        a.file_code,
         b.LEVEL,
         b.grade_type,
         b.score_res,