Merge branch 'dev/20200426_2nd' into test

src/main/java/com/diagbot/web/ConsoleByDeptController.java

@@ -22,6 +22,7 @@ import java.util.Map;
 @RequestMapping("/consoleByDept")
 @RestController
 @Api(value = "控制台（科室）统计相关API", tags = { "控制台（科室）统计相关API" })
+@SuppressWarnings("unchecked")
 public class ConsoleByDeptController {
     @Autowired
     private ConsoleByDeptFacade consoleByDeptFacade;

src/main/resources/mapper/BehospitalInfoMapper.xml

@@ -334,7 +334,7 @@
         </if>
     </select>
 
-
+    <!--获取未评分病历-->
     <select id="getNoGrade" resultMap="BaseResultMap">
          select * from med_behospital_info a
             where a.is_deleted = 'N'
@@ -350,6 +350,8 @@
             AND a.behospital_code = b.behospital_code
             )
     </select>
+
+    <!--质控评分(科室)分页-->
     <select id="getPageByDept" resultType="com.diagbot.dto.BehospitalInfoDTO">
         SELECT
         *
@@ -414,8 +416,9 @@
         <if test="level != null and level != ''">
             and t.level = #{level}
         </if>
-
     </select>
+
+    <!--质控评分(个人)分页-->
     <select id="getPageByPerson" resultType="com.diagbot.dto.BehospitalInfoDTO">
         select * from (SELECT
         a.*,
@@ -479,7 +482,6 @@
         <if test="level != null and level != ''">
             and t.level = #{level}
         </if>
-
     </select>
 
     <!-- 病案首页病历数统计 -->