Merge remote-tracking branch 'origin/dev/20200702_1.3.7' into test

doc/013.20200706v1.3.7/qc_initv1.3.7.sql

@@ -123,11 +123,6 @@ INSERT INTO `sys_menu` VALUES ('34', 'N', '1970-01-01 12:00:00', '1970-01-01 12:
 INSERT INTO `sys_menu` VALUES ('35', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '出院人数统计', '17', 'YH-ZKK-CYRSTJ', '1', '1', '11', '用户-质控科-出院人数统计');
 INSERT INTO `sys_menu` VALUES ('36', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '质控核查统计', '17', 'YH-ZKK-ZKHCTJ', '1', '1', '12', '用户-质控科-质控核查统计');
 
-
-
 -- ----------------------------
 -- Table structure for sys_menu_permission
 -- ----------------------------

src/main/resources/mapper/BehospitalInfoMapper.xml

@@ -3558,6 +3558,7 @@
         AND a.is_placefile = 1
         AND a.qc_type_id != 0
         AND IFNULL( a.diagnose, '' )!= ''
+        AND IFNULL( a.file_code, '' )!= ''
         <if test="hospitalId != null and hospitalId != ''">
             AND a.hospital_id = #{hospitalId}
         </if>
@@ -3624,6 +3625,7 @@
         AND a.is_placefile = 1
         AND a.qc_type_id != 0
         AND IFNULL( a.diagnose, '' )!= ''
+        AND IFNULL( a.file_code, '' )!= ''
         <if test="hospitalId != null and hospitalId != ''">
             AND a.hospital_id = #{hospitalId}
         </if>