Merge branch 'master' into test

src/main/resources/mapper/QcresultInfoMapper.xml

@@ -21,7 +21,7 @@
     <!-- 缺陷排行列表 -->
     <select id="getQcresultSelectively"  parameterType="com.diagbot.vo.QcresultFilterVO" resultType="int">
         SELECT
-        count(*)
+        count(1)
         FROM
         med_behospital_info a,
         med_qcresult_info b