字段统一

src/main/java/com/diagbot/vo/FilterVO.java

@@ -46,5 +46,5 @@ public class FilterVO {
     /**
      * 科室分类
      */
-    private String className;
+    private String deptClass;
 }

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

@@ -123,7 +123,7 @@ public class ConsoleController {
      */
     @ApiOperation(value = "各科室质控平均分（首页）-根据内外科系统统计[by:zhaops]",
             notes = "type： 统计维度 1-本月，2-本年(必填)<br>" +
-                    "className： 科室分类：内科/外科，全部不传 <br>" )
+                    "deptClass： 科室分类：内科/外科，全部不传 <br>" )
     @PostMapping("/getAverageScoreByDeptClass")
     @SysLogger("getAverageScoreByDeptClass")
     public RespDTO<Map<String, Object>> getAverageScoreByDeptClass(@RequestBody @Valid FilterVO filterVO) {
@@ -363,7 +363,7 @@ public class ConsoleController {
             notes = "type： 统计维度 1-本月，2-本年(必填)<br>" +
                     "level： 病历等级 <br>" +
                     "name： 科室名称 <br>" +
-                    "className： 科室分类：内科/外科，全部不传 <br>" +
+                    "deptClass： 科室分类：内科/外科，全部不传 <br>" +
                     "asc： 排序（升序） <br>" +
                     "desc： 排序（降序） <br>")
     @PostMapping("/levelStatisticsByDeptClass")

src/main/resources/mapper/BehospitalInfoMapper.xml

@@ -1158,8 +1158,8 @@
         <if test="name != null and name != ''">
             and a.beh_dept_name like CONCAT('%',#{name},'%')
         </if>
-        <if test="className != null and className != ''">
-            and e.dept_name = #{className}
+        <if test="deptClass != null and deptClass != ''">
+            and e.dept_name = #{deptClass}
         </if>
         GROUP BY
         a.beh_dept_id,
@@ -1218,8 +1218,8 @@
         <if test="name != null and name != ''">
             and a.beh_dept_name like CONCAT('%',#{name},'%')
         </if>
-        <if test="className != null and className != ''">
-            and g.dept_name = #{className}
+        <if test="deptClass != null and deptClass != ''">
+            and g.dept_name = #{deptClass}
         </if>
         GROUP BY
         a.beh_dept_id,
@@ -1237,6 +1237,8 @@
             <choose>
                 <when test='asc=="deptId"'>deptId asc</when>
                 <when test='asc=="deptName"'>deptName asc</when>
+                <when test='asc=="deptClassId"'>deptClassId asc</when>
+                <when test='asc=="deptClass"'>deptClass asc</when>
                 <when test='asc=="entryNum"'>entryNum asc</when>
                 <when test='asc=="mrNum"'>mrNum asc</when>
                 <when test='asc=="totleValue"'>totleValue asc</when>
@@ -1258,6 +1260,8 @@
             <choose>
                 <when test='desc=="deptId"'>deptId desc</when>
                 <when test='desc=="deptName"'>deptName desc</when>
+                <when test='desc=="deptClassId"'>deptClassId desc</when>
+                <when test='desc=="deptClass"'>deptClass desc</when>
                 <when test='desc=="entryNum"'>entryNum desc</when>
                 <when test='desc=="mrNum"'>mrNum desc</when>
                 <when test='desc=="totleValue"'>totleValue desc</when>

src/main/resources/mapper/QcresultInfoMapper.xml

@@ -400,8 +400,8 @@
         <if test="endDate != null and endDate != ''">
             <![CDATA[AND a.leave_hospital_date < DATE(#{endDate})]]>
         </if>
-        <if test="className != null and className != ''">
-            AND e.dept_name = #{className}
+        <if test="deptClass != null and deptClass != ''">
+            AND e.dept_name = #{deptClass}
         </if>
         GROUP BY
         a.beh_dept_id,