Merge branch 'dev/20200522temp' into test

doc/005.20200528v1.2.x/qc_init.sql

@@ -1048,4 +1048,6 @@ CREATE TABLE `med_module_mapping` (
 ) ENGINE=InnoDB AUTO_INCREMENT=0 DEFAULT CHARSET=utf8 COMMENT='模板与文书映射关系表';
 
 
-ALTER TABLE `med_behospital_info` ADD INDEX `idx_hospital_id_behospital_code` (`hospital_id`,`behospital_code`) USING BTREE;
+ALTER TABLE `med_behospital_info` ADD INDEX `idx_hospital_id_behospital_code` (`hospital_id`,`behospital_code`) USING BTREE;
+
+alter table med_medical_record add COLUMN `status` TINYINT(4) NOT NULL DEFAULT '0' COMMENT '模板处理状态(0:未处理，1：已处理)' AFTER `rec_title`;

src/main/java/com/diagbot/config/ResourceServerConfigurer.java

@@ -64,6 +64,7 @@ public class ResourceServerConfigurer extends ResourceServerConfigurerAdapter {
                 .antMatchers("/qc/behospitalInfo/exportExcel").permitAll()
                 .antMatchers("/qc/behospitalInfo/exportQcresult").permitAll()
                 .antMatchers("/qc/behospitalInfo/exportQcresultByDept").permitAll()
+                .antMatchers("/qc/abnormal/getQcAnnormalMode").permitAll()
                 .antMatchers("/**").authenticated();
 //                .antMatchers("/**").permitAll();
     }

src/main/java/com/diagbot/config/security/UrlAccessDecisionManager.java

@@ -107,6 +107,7 @@ public class UrlAccessDecisionManager implements AccessDecisionManager {
                 || matchers("/qc/behospitalInfo/exportExcel", request)
                 || matchers("/qc/behospitalInfo/exportQcresult", request)
                 || matchers("/qc/behospitalInfo/exportQcresultByDept", request)
+                || matchers("/qc/abnormal/getQcAnnormalMode", request)
                 || matchers("/", request)) {
             return true;
         }

src/main/resources/mapper/BehospitalInfoMapper.xml

@@ -401,7 +401,7 @@
         AND a.hospital_id = b.hospital_id
         AND a.behospital_code = b.behospital_code
         AND a.is_placefile = '1'
-        AND ( b.age IS NULL OR b.age = '-' OR b.age = '' )
+        -- AND ( b.age IS NULL OR b.age = '-' OR b.age = '' )
         <![CDATA[AND ( b.newborn_month IS NOT NULL OR b.newborn_month <> '' OR b.newborn_day IS NOT NULL OR b.newborn_day <> '' )]]>
         <![CDATA[AND a.qc_type_id <>0 ]]>
         <if test="hospitalId != null and hospitalId != ''">