Merge branch 'master' into test

src/main/resources/application-dev.yml

@@ -155,7 +155,7 @@ oath.self.address: http://${myhost}:${server.port}
 qc.address: http://192.168.2.232:6009
 
 encrypt:
-  enable: false
+  enable: true
 
 swagger:
   enable: true

src/main/resources/application-local.yml

@@ -152,10 +152,10 @@ mybatis-plus:
 
 myhost: localhost
 oath.self.address: http://${myhost}:${server.port}
-qc.address: http://192.168.3.117:6009
+qc.address: http://192.168.2.232:6009
 
 encrypt:
-  enable: false
+  enable: true
 
 swagger:
   enable: true

src/main/resources/mapper/QcresultInfoMapper.xml

@@ -34,7 +34,7 @@
             AND a.hospital_id = #{hospitalId}
         </if>
         <if test="startDate != null and startDate != ''">
-            <![CDATA[ and a.leave_hospital_date >= #{startDate}]]>
+            <![CDATA[ and a.behospital_date >= #{startDate}]]>
         </if>
         <if test="gradeType != null and gradeType != ''">
             AND b.grade_type = #{gradeType}