缺陷详情

src/main/java/com/diagbot/facade/ConsoleByDeptFacade.java

@@ -506,10 +506,7 @@ public class ConsoleByDeptFacade {
         filterPageByDeptVO.setStartDate(startDate);
         filterPageByDeptVO.setEndDate(endDate);
         filterPageByDeptVO.setHospitalId(hospitalId);
-        if (filterPageByDeptVO.getGlobalType() == null
-                || !filterPageByDeptVO.getGlobalType().equals(1)) {
-            filterPageByDeptVO.setUserId(Long.valueOf(userId));
-        }
+        filterPageByDeptVO.setUserId(Long.valueOf(userId));
     }
 
     /**

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

@@ -11,19 +11,8 @@ import lombok.Setter;
 @Getter
 @Setter
 public class FilterPageByDeptVO extends FilterPageVO {
-    /**
-     * 科室名称
-     */
-    private String deptName;
-
     /**
      * 医生名称
      */
     private String doctorName;
-
-
-    /**
-     * 全局参数
-     */
-    private Integer globalType;
 }

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

@@ -42,4 +42,9 @@ public class FilterPageVO extends Page {
     @ApiModelProperty(hidden = true)
     private Long userId;
     private String name;
+
+    /**
+     * 科室名称
+     */
+    private String deptName;
 }

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

@@ -115,8 +115,7 @@ public class ConsoleByDeptController {
     @ApiOperation(value = "条目缺陷占比-科室（分页）-内页[by:zhaops]",
             notes = "type： 统计维度 1-本月，2-本年(必填)<br>" +
                     "name： 缺陷名称<br>" +
-                    "deptName： 科室名称(必填)<br>"+
-                    "globalType： 全局参数 1-全局(必填)<br>")
+                    "deptName： 科室名称(必填)<br>")
     @PostMapping("/entryCountGroupByEntryAndDeptPage")
     @SysLogger("entryCountGroupByEntryAndDeptPage")
     public RespDTO<IPage<DeptNumDTO>> entryCountGroupByEntryAndDeptPage(@RequestBody FilterPageByDeptVO filterPageByDeptVO) {

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

@@ -220,7 +220,8 @@ public class ConsoleController {
      * @return
      */
     @ApiOperation(value = "条目缺陷占比（分页）[by:zhaops]",
-            notes = "type： 统计维度 1-本月，2-本年(必填)<br>")
+            notes = "type： 统计维度 1-本月，2-本年(必填)<br>"+
+                    "deptName： 科室名称 <br>")
     @PostMapping("/entryCountGroupByEntryPage")
     @SysLogger("entryCountGroupByEntryPage")
     public RespDTO<IPage<NumDTO>> entryCountGroupByEntryPage(@RequestBody FilterPageVO filterPageVO) {

src/main/resources/mapper/QcresultInfoMapper.xml

@@ -452,6 +452,9 @@
         <if test="filterPageVO.name != null and filterPageVO.name != ''">
             AND e.name like CONCAT('%', #{filterPageVO.name},'%')
         </if>
+        <if test="filterPageVO.deptName != null and filterPageVO.deptName != ''">
+            AND a.beh_dept_name like CONCAT('%', #{filterPageVO.deptName},'%')
+        </if>
         GROUP BY
         d.cases_id,
         e.`name`
@@ -481,6 +484,9 @@
         <if test="filterPageVO.endDate != null and filterPageVO.endDate != ''">
             <![CDATA[AND a.leave_hospital_date < DATE(#{filterPageVO.endDate})]]>
         </if>
+        <if test="filterPageVO.deptName != null and filterPageVO.deptName != ''">
+            AND a.beh_dept_name like CONCAT('%', #{filterPageVO.deptName},'%')
+        </if>
         ) t2,
         (
         SELECT
@@ -552,6 +558,9 @@
         <if test="filterPageVO.name != null and filterPageVO.name != ''">
             AND d.name like CONCAT('%', #{filterPageVO.name},'%')
         </if>
+        <if test="filterPageVO.deptName != null and filterPageVO.deptName != ''">
+            AND a.beh_dept_name like CONCAT('%', #{filterPageVO.deptName},'%')
+        </if>
         ) t1,(
         SELECT
         count(*) AS totleNum
@@ -584,6 +593,9 @@
         <if test="filterPageVO.name != null and filterPageVO.name != ''">
             AND d.name like CONCAT('%', #{filterPageVO.name},'%')
         </if>
+        <if test="filterPageVO.deptName != null and filterPageVO.deptName != ''">
+            AND a.beh_dept_name like CONCAT('%', #{filterPageVO.deptName},'%')
+        </if>
         ) t2
         GROUP BY
         t1.id,