Merge remote-tracking branch 'origin/dev/20200513end_1.2.0' into debug

# Conflicts:
#	src/main/java/com/diagbot/service/BehospitalInfoService.java

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

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

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

@@ -20,4 +20,10 @@ public class FilterPageByDeptVO extends FilterPageVO {
      * 医生名称
      */
     private String doctorName;
+
+
+    /**
+     * 全局参数
+     */
+    private Integer globalType;
 }

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

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

src/main/resources/mapper/BehospitalInfoMapper.xml

@@ -823,7 +823,7 @@
             AND d.msg like CONCAT('%', #{filterPageByDeptVO.name},'%')
         </if>
         <if test="filterPageByDeptVO.doctorName != null and filterPageByDeptVO.doctorName != ''">
-            AND a.doctor_name = #{filterPageByDeptVO.name}
+            AND a.doctor_name = #{filterPageByDeptVO.doctorName}
         </if>
         <if test="filterPageByDeptVO.deptName != null and filterPageByDeptVO.deptName != ''">
             AND a.beh_dept_name = #{filterPageByDeptVO.deptName}
@@ -872,7 +872,7 @@
             AND d.msg like CONCAT('%', #{filterPageByDeptVO.name},'%')
         </if>
         <if test="filterPageByDeptVO.doctorName != null and filterPageByDeptVO.doctorName != ''">
-            AND a.doctor_name = #{filterPageByDeptVO.name}
+            AND a.doctor_name = #{filterPageByDeptVO.doctorName}
         </if>
         <if test="filterPageByDeptVO.deptName != null and filterPageByDeptVO.deptName != ''">
             AND a.beh_dept_name = #{filterPageByDeptVO.deptName}