Merge branch 'dev/20201224_2.0.0' into debug

src/main/java/com/diagbot/dto/ReBeHosDetailByDeptDTO.java

@@ -39,31 +39,38 @@ public class ReBeHosDetailByDeptDTO {
      * 科室编码
      */
     private String behDeptId;
+
+    /**
+     * 科室
+     */
+   // @Excel(name = "科室", width = 50, orderNum = "5")
+    private String behDeptName;
+
     /**
      * 主管医生
      */
-    @Excel(name = "主管医生", width = 50, orderNum = "5")
+    @Excel(name = "主管医生", width = 50, orderNum = "6")
     private String doctorName;
     /**
      * 出院日期
      */
-    @Excel(name = "出院日期", format = "yyyy-MM-dd", width = 30, orderNum = "6")
+    @Excel(name = "出院日期", format = "yyyy-MM-dd", width = 30, orderNum = "7")
     @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
     private Date leaveHospitalDate;
     /**
      * 入院日期
      */
-    @Excel(name = "入院日期", format = "yyyy-MM-dd", width = 30, orderNum = "7")
+    @Excel(name = "入院日期", format = "yyyy-MM-dd", width = 30, orderNum = "8")
     @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
     private Date behospitalDate;
     /**
      * 住院天数
      */
-    @Excel(name = "住院天数", width = 15, orderNum = "8")
+    @Excel(name = "住院天数", width = 15, orderNum = "9")
     private String behospitalDayNum;
     /**
      * 住院费用
      */
-    @Excel(name = "住院费用", width = 15, orderNum = "9")
+    @Excel(name = "住院费用", width = 15, orderNum = "10")
     private String totleFee;
 }

src/main/java/com/diagbot/dto/ReBeHosMergeDTO.java

@@ -31,6 +31,7 @@ public class ReBeHosMergeDTO {
     private Date leaveHospitalDate;
     private String lastBehDeptId;
     private String lastBehDeptName;
+    private String lastDoctorName;
     private String lastBehospitalCode;
     private Double lastScoreRes;
     private String lastLevel;

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

@@ -70,6 +70,7 @@ public class BasDoctorInfoFacade extends BasDoctorInfoServiceImpl {
                 QueryWrapper<BehospitalInfo> QueryWrapper = new QueryWrapper<>();
                 QueryWrapper.eq("hospital_id",basDoctorInfoVO.getHospitalId());
                 QueryWrapper.eq("is_deleted", IsDeleteEnum.N.getKey());
+                QueryWrapper.eq("is_placefile", basDoctorInfoVO.getIsPlacefile());
                 QueryWrapper.in("beh_dept_id",deptSetInfo);
 
                 if(StringUtils.isNotEmpty(basDoctorInfoVO.getInputStr())){

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

@@ -102,9 +102,9 @@ public class ConsoleByDeptExportFacade {
         filterPageByDeptVO.setCurrent(1L);
         filterPageByDeptVO.setSize(Long.MAX_VALUE);
         filterPageByDeptVO.setSearchCount(false);
-        IPage<DeptEntryNumDTO> page = qcresultInfoFacade.entryCountGroupByEntryAndDeptPage(filterPageByDeptVO);
+        IPage<EntryNumGroupDTO> page = qcresultInfoFacade.entryCountGroupByEntryAndDeptPage(filterPageByDeptVO);
         String fileName = "缺陷详情.xls";
-        ExcelUtils.exportExcel(page.getRecords(), null, "sheet1", DeptEntryNumDTO.class, fileName, response, 12.8f);
+        ExcelUtils.exportExcel(page.getRecords(), null, "sheet1", EntryNumGroupDTO.class, fileName, response, 12.8f);
     }
 
 

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

@@ -415,7 +415,7 @@ public class ConsoleByDeptFacade {
      * @param filterPageByDeptVO
      * @return
      */
-    public IPage<DeptEntryNumDTO> entryCountGroupByEntryAndDeptPage(FilterPageByDeptVO filterPageByDeptVO) {
+    public IPage<EntryNumGroupDTO> entryCountGroupByEntryAndDeptPage(FilterPageByDeptVO filterPageByDeptVO) {
         if (StringUtil.isBlank(filterPageByDeptVO.getDeptName())) {
             List<DeptBaseDTO> deptList = this.getDept();
             //默认取第一个科室
@@ -427,7 +427,7 @@ public class ConsoleByDeptFacade {
             filterPageByDeptVO.setDoctorName("");
         }
         filterFacade.filterPageByDeptVOSet(filterPageByDeptVO);
-        IPage<DeptEntryNumDTO> page = qcresultInfoFacade.entryCountGroupByEntryAndDeptPage(filterPageByDeptVO);
+        IPage<EntryNumGroupDTO> page = qcresultInfoFacade.entryCountGroupByEntryAndDeptPage(filterPageByDeptVO);
         return page;
     }
 
@@ -913,7 +913,8 @@ public class ConsoleByDeptFacade {
                 ReBeHosDetailByDeptDTO lastDetailRecord = new ReBeHosDetailByDeptDTO();
                 lastDetailRecord.setName(record.getName());
                 lastDetailRecord.setBehDeptId(record.getLastBehDeptId());
-                lastDetailRecord.setDoctorName(record.getDoctorName());
+                lastDetailRecord.setBehDeptName(record.getLastBehDeptName());
+                lastDetailRecord.setDoctorName(record.getLastDoctorName());
                 lastDetailRecord.setBehospitalCode(record.getLastBehospitalCode());
                 lastDetailRecord.setBehospitalDate(record.getLastBehospitalDate());
                 lastDetailRecord.setLeaveHospitalDate(record.getLastLeaveHospitalDate());

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

@@ -1972,7 +1972,7 @@ public class ConsoleFacade {
                 ReBeHosDetailDTO lastDetailRecord = new ReBeHosDetailDTO();
                 lastDetailRecord.setName(record.getName());
                 lastDetailRecord.setBehDeptId(record.getLastBehDeptId());
-                lastDetailRecord.setBehDeptName(record.getBehDeptName());
+                lastDetailRecord.setBehDeptName(record.getLastBehDeptName());
                 lastDetailRecord.setBehospitalCode(record.getLastBehospitalCode());
                 lastDetailRecord.setBehospitalDate(record.getLastBehospitalDate());
                 lastDetailRecord.setLeaveHospitalDate(record.getLastLeaveHospitalDate());

src/main/java/com/diagbot/mapper/QcresultInfoMapper.java

@@ -150,7 +150,7 @@ public interface QcresultInfoMapper extends BaseMapper<QcresultInfo> {
      * @param filterPageByDeptVO
      * @return
      */
-    public IPage<DeptEntryNumDTO> entryCountGroupByEntryAndDeptPage(@Param("filterPageByDeptVO") FilterPageByDeptVO filterPageByDeptVO);
+    public IPage<EntryNumGroupDTO> entryCountGroupByEntryAndDeptPage(@Param("filterPageByDeptVO") FilterPageByDeptVO filterPageByDeptVO);
     /**
      * 条目缺陷占比基础数据（内页）
      *

src/main/java/com/diagbot/service/QcresultInfoService.java

@@ -148,7 +148,7 @@ public interface QcresultInfoService extends IService<QcresultInfo> {
      * @param filterPageByDeptVO
      * @return
      */
-    public IPage<DeptEntryNumDTO> entryCountGroupByEntryAndDeptPage(@Param("filterPageByDeptVO") FilterPageByDeptVO filterPageByDeptVO);
+    public IPage<EntryNumGroupDTO> entryCountGroupByEntryAndDeptPage(@Param("filterPageByDeptVO") FilterPageByDeptVO filterPageByDeptVO);
 
     /**
      * 条目缺陷占比（内页）

src/main/java/com/diagbot/service/impl/QcresultInfoServiceImpl.java

@@ -198,7 +198,7 @@ public class QcresultInfoServiceImpl extends ServiceImpl<QcresultInfoMapper, Qcr
      * @return
      */
     @Override
-    public IPage<DeptEntryNumDTO> entryCountGroupByEntryAndDeptPage(@Param("filterPageByDeptVO") FilterPageByDeptVO filterPageByDeptVO) {
+    public IPage<EntryNumGroupDTO> entryCountGroupByEntryAndDeptPage(@Param("filterPageByDeptVO") FilterPageByDeptVO filterPageByDeptVO) {
         return baseMapper.entryCountGroupByEntryAndDeptPage(filterPageByDeptVO);
     }
 

src/main/java/com/diagbot/vo/data/BasDoctorInfoVO.java

@@ -16,6 +16,7 @@ public class BasDoctorInfoVO {
      * 搜索参数
      */
     private String inputStr;
+    private String isPlacefile;
     private String deptName;
     @ApiModelProperty(hidden = true)
     private String deptId;

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

@@ -152,8 +152,8 @@ public class ConsoleByDeptController {
                     "isPlacefile： 是否归档（0：未归档，1：已归档） <br>")
     @PostMapping("/entryCountGroupByEntryAndDeptPage")
     @SysLogger("entryCountGroupByEntryAndDeptPage")
-    public RespDTO<IPage<DeptEntryNumDTO>> entryCountGroupByEntryAndDeptPage(@RequestBody @Valid FilterPageByDeptVO filterPageByDeptVO) {
-        IPage<DeptEntryNumDTO> data = consoleByDeptFacade.entryCountGroupByEntryAndDeptPage(filterPageByDeptVO);
+    public RespDTO<IPage<EntryNumGroupDTO>> entryCountGroupByEntryAndDeptPage(@RequestBody @Valid FilterPageByDeptVO filterPageByDeptVO) {
+        IPage<EntryNumGroupDTO> data = consoleByDeptFacade.entryCountGroupByEntryAndDeptPage(filterPageByDeptVO);
         return RespDTO.onSuc(data);
     }
 

src/main/resources/mapper/BehospitalInfoMapper.xml

@@ -4571,7 +4571,7 @@
             AND a.diagnose LIKE CONCAT( '%', #{qcResultShortPageVO.diagnose}, '%' )
         </if>
         <if test="qcResultShortPageVO.deptName != null and qcResultShortPageVO.deptName != ''">
-            AND a.beh_dept_name LIKE CONCAT( '%', #{qcResultShortPageVO.deptName}, '%' )
+            AND a.beh_dept_name = #{qcResultShortPageVO.deptName}
         </if>
         <if test="qcResultShortPageVO.level != null and qcResultShortPageVO.level != ''">
             AND b.`level` = #{qcResultShortPageVO.level}
@@ -6504,7 +6504,7 @@
             AND a.diagnose LIKE CONCAT( '%', #{qcResultShortPageVO.diagnose}, '%' )
         </if>
         <if test="qcResultShortPageVO.deptName != null and qcResultShortPageVO.deptName != ''">
-            AND a.beh_dept_name LIKE CONCAT( '%', #{qcResultShortPageVO.deptName}, '%' )
+            AND a.beh_dept_name = #{qcResultShortPageVO.deptName}
         </if>
         <if test="qcResultShortPageVO.behospitalCode != null and qcResultShortPageVO.behospitalCode != ''">
             AND a.behospital_code LIKE CONCAT( '%', #{qcResultShortPageVO.behospitalCode}, '%' )
@@ -7868,7 +7868,7 @@
             AND a.diagnose LIKE CONCAT( '%', #{qcResultShortPageVO.diagnose}, '%' )
         </if>
         <if test="qcResultShortPageVO.deptName != null and qcResultShortPageVO.deptName != ''">
-            AND a.beh_dept_name LIKE CONCAT( '%', #{qcResultShortPageVO.deptName}, '%' )
+            AND a.beh_dept_name = #{qcResultShortPageVO.deptName}
         </if>
         <if test="qcResultShortPageVO.behospitalCode != null and qcResultShortPageVO.behospitalCode != ''">
             AND a.behospital_code LIKE CONCAT( '%', #{qcResultShortPageVO.behospitalCode}, '%' )
@@ -8101,7 +8101,7 @@
             AND a.diagnose LIKE CONCAT( '%', #{qcResultShortPageVO.diagnose}, '%' )
         </if>
         <if test="qcResultShortPageVO.deptName != null and qcResultShortPageVO.deptName != ''">
-            AND a.beh_dept_name LIKE CONCAT( '%', #{qcResultShortPageVO.deptName}, '%' )
+            AND a.beh_dept_name = #{qcResultShortPageVO.deptName}
         </if>
         <if test="qcResultShortPageVO.behospitalCode != null and qcResultShortPageVO.behospitalCode != ''">
             AND a.behospital_code LIKE CONCAT( '%', #{qcResultShortPageVO.behospitalCode}, '%' )
@@ -9417,8 +9417,7 @@
             AND a.diagnose LIKE CONCAT( '%', #{qcResultShortPageVO.diagnose}, '%' )
         </if>
         <if test="qcResultShortPageVO.deptName != null and qcResultShortPageVO.deptName != ''">
-            AND a.beh_dept_name LIKE CONCAT( '%', #{qcResultShortPageVO.deptName}, '%' )
-
+            AND a.beh_dept_name  = #{qcResultShortPageVO.deptName}
         </if>
         <if test="qcResultShortPageVO.level != null and qcResultShortPageVO.level != ''">
             AND b.`level` = #{qcResultShortPageVO.level}
@@ -9686,7 +9685,7 @@
             AND a.diagnose LIKE CONCAT( '%', #{qcResultShortPageVO.diagnose}, '%' )
         </if>
         <if test="qcResultShortPageVO.deptName != null and qcResultShortPageVO.deptName != ''">
-            AND a.beh_dept_name LIKE CONCAT( '%', #{qcResultShortPageVO.deptName}, '%' )
+            AND a.beh_dept_name  = #{qcResultShortPageVO.deptName}
         </if>
         <if test="qcResultShortPageVO.level != null and qcResultShortPageVO.level != ''">
             AND b.`level` = #{qcResultShortPageVO.level}
@@ -10819,7 +10818,7 @@
             AND a.diagnose LIKE CONCAT( '%', #{qcResultPageVO.diagnose}, '%' )
         </if>
         <if test="qcResultPageVO.deptName != null and qcResultPageVO.deptName != ''">
-            AND a.beh_dept_name LIKE CONCAT( '%', #{qcResultPageVO.deptName}, '%' )
+            AND a.beh_dept_name = #{qcResultPageVO.deptName}
         </if>
         <if test="qcResultPageVO.behospitalCode != null and qcResultPageVO.behospitalCode != ''">
             AND a.behospital_code LIKE CONCAT( '%', #{qcResultPageVO.behospitalCode}, '%' )
@@ -11087,7 +11086,7 @@
             AND a.diagnose LIKE CONCAT( '%', #{qcResultShortPageVO.diagnose}, '%' )
         </if>
         <if test="qcResultShortPageVO.deptName != null and qcResultShortPageVO.deptName != ''">
-            AND a.beh_dept_name LIKE CONCAT( '%', #{qcResultShortPageVO.deptName}, '%' )
+            AND a.beh_dept_name = #{qcResultShortPageVO.deptName}
 
         </if>
         <if test="qcResultShortPageVO.level != null and qcResultShortPageVO.level != ''">
@@ -11536,7 +11535,7 @@
             AND a.diagnose LIKE CONCAT( '%', #{qcResultShortPageVO.diagnose}, '%' )
         </if>
         <if test="qcResultShortPageVO.deptName != null and qcResultShortPageVO.deptName != ''">
-            AND a.beh_dept_name LIKE CONCAT( '%', #{qcResultShortPageVO.deptName}, '%' )
+            AND a.beh_dept_name = #{qcResultShortPageVO.deptName}
         </if>
         <if test="qcResultShortPageVO.behospitalCode != null and qcResultShortPageVO.behospitalCode != ''">
             AND a.behospital_code LIKE CONCAT( '%', #{qcResultShortPageVO.behospitalCode}, '%' )
@@ -11759,7 +11758,7 @@
             AND a.diagnose LIKE CONCAT( '%', #{qcResultShortPageVO.diagnose}, '%' )
         </if>
         <if test="qcResultShortPageVO.deptName != null and qcResultShortPageVO.deptName != ''">
-            AND a.beh_dept_name LIKE CONCAT( '%', #{qcResultShortPageVO.deptName}, '%' )
+            AND a.beh_dept_name = #{qcResultShortPageVO.deptName}
         </if>
         <if test="qcResultShortPageVO.behospitalCode != null and qcResultShortPageVO.behospitalCode != ''">
             AND a.behospital_code LIKE CONCAT( '%', #{qcResultShortPageVO.behospitalCode}, '%' )
@@ -12498,7 +12497,7 @@
             AND a.diagnose LIKE CONCAT( '%', #{qcResultShortPageVO.diagnose}, '%' )
         </if>
         <if test="qcResultShortPageVO.deptName != null and qcResultShortPageVO.deptName != ''">
-            AND a.beh_dept_name LIKE CONCAT( '%', #{qcResultShortPageVO.deptName}, '%' )
+            AND a.beh_dept_name = #{qcResultShortPageVO.deptName}
         </if>
         <if test="qcResultShortPageVO.level != null and qcResultShortPageVO.level != ''">
             AND b.`level` = #{qcResultShortPageVO.level}
@@ -12711,7 +12710,7 @@
             AND a.diagnose LIKE CONCAT( '%', #{qcResultShortPageVO.diagnose}, '%' )
         </if>
         <if test="qcResultShortPageVO.deptName != null and qcResultShortPageVO.deptName != ''">
-            AND a.beh_dept_name LIKE CONCAT( '%', #{qcResultShortPageVO.deptName}, '%' )
+            AND a.beh_dept_name = #{qcResultShortPageVO.deptName}
         </if>
         <if test="qcResultShortPageVO.level != null and qcResultShortPageVO.level != ''">
             AND b.`level` = #{qcResultShortPageVO.level}
@@ -13602,6 +13601,7 @@
         t.leaveHospitalDate,
         t.lastBehDeptId,
         t.lastBehDeptName,
+        t.lastDoctorName,
         t.lastBehospitalCode,
         t.lastBehospitalDate,
         t.lastLeaveHospitalDate,
@@ -13631,8 +13631,8 @@
         be.leaveHospitalDate,
         be.lastBehDeptId,
         be.lastBehDeptName,
-        be.lastBoctorId,
-        be.lastBoctorName,
+        be.lastDoctorId,
+        be.lastDoctorName,
         be.lastBehospitalCode,
         be.lastBehospitalDate,
         be.lastLeaveHospitalDate,
@@ -13656,8 +13656,8 @@
         r2.beh_dept_name AS lastBehDeptName,
         r2.behospital_code AS lastBehospitalCode,
         r2.behospital_date AS lastBehospitalDate,
-        r2.doctor_id as lastBoctorId,
-        r2.doctor_name as lastBoctorName,
+        r2.doctor_id as lastDoctorId,
+        r2.doctor_name as lastDoctorName,
         r2.leave_hospital_date AS lastLeaveHospitalDate,
         TIMESTAMPDIFF( DAY, DATE( r2.leave_hospital_date ), DATE( r1.behospital_date ) ) AS diffDays
         FROM
@@ -13681,8 +13681,8 @@
         SELECT
         tt1.file_code,
         tt1.diagnose,
-        tt1.doctor_id,
-        tt1.doctor_name,
+        tt2.doctor_id,
+        tt2.doctor_name,
         tt2.NAME,
         tt2.sex,
         tt2.hospital_id,
@@ -13810,8 +13810,8 @@
         SELECT
         tt1.file_code,
         tt1.diagnose,
-        tt1.doctor_id,
-        tt1.doctor_name,
+        tt2.doctor_id,
+        tt2.doctor_name,
         tt2.NAME,
         tt2.sex,
         tt2.hospital_id,
@@ -14165,7 +14165,7 @@
             </if>
         </if>
         <if test="qcResultShortPageVO.deptName != null and qcResultShortPageVO.deptName != ''">
-            AND m1.beh_dept_name like CONCAT('%', #{qcResultShortPageVO.deptName}, '%')
+            AND m1.beh_dept_name = #{qcResultShortPageVO.deptName}
         </if>
         GROUP BY
         m1.behospital_code
@@ -14650,7 +14650,7 @@
             AND a.diagnose LIKE CONCAT( '%', #{qcResultShortPageVO.diagnose}, '%' )
         </if>
         <if test="qcResultShortPageVO.deptName != null and qcResultShortPageVO.deptName != ''">
-            AND a.beh_dept_name LIKE CONCAT( '%', #{qcResultShortPageVO.deptName}, '%' )
+            AND a.beh_dept_name = #{qcResultShortPageVO.deptName}
         </if>
         <if test="qcResultShortPageVO.level != null and qcResultShortPageVO.level != ''">
             AND b.`level` = #{qcResultShortPageVO.level}
@@ -15071,7 +15071,7 @@
             </if>
         </if>
         <if test="qcResultShortPageVO.deptName != null and qcResultShortPageVO.deptName != ''">
-            AND m1.beh_dept_name like CONCAT('%', #{qcResultShortPageVO.deptName}, '%')
+            AND m1.beh_dept_name = #{qcResultShortPageVO.deptName}
         </if>
         GROUP BY
         m1.behospital_code
@@ -15321,7 +15321,7 @@
             </if>
         </if>
         <if test="qcResultShortPageVO.deptName != null and qcResultShortPageVO.deptName != ''">
-            AND m1.beh_dept_name like CONCAT('%', #{qcResultShortPageVO.deptName}, '%')
+            AND m1.beh_dept_name = #{qcResultShortPageVO.deptName}
         </if>
         GROUP BY
         m1.behospital_code
@@ -16166,7 +16166,7 @@
             AND a.diagnose LIKE CONCAT( '%', #{qcResultShortPageVO.diagnose}, '%' )
         </if>
         <if test="qcResultShortPageVO.deptName != null and qcResultShortPageVO.deptName != ''">
-            AND a.beh_dept_name LIKE CONCAT( '%', #{qcResultShortPageVO.deptName}, '%' )
+            AND a.beh_dept_name = #{qcResultShortPageVO.deptName}
 
         </if>
         <if test="qcResultShortPageVO.level != null and qcResultShortPageVO.level != ''">
@@ -16353,7 +16353,7 @@
             AND a.diagnose LIKE CONCAT( '%', #{qcResultShortPageVO.diagnose}, '%' )
         </if>
         <if test="qcResultShortPageVO.deptName != null and qcResultShortPageVO.deptName != ''">
-            AND a.beh_dept_name LIKE CONCAT( '%', #{qcResultShortPageVO.deptName}, '%' )
+            AND a.beh_dept_name = #{qcResultShortPageVO.deptName}
 
         </if>
         <if test="qcResultShortPageVO.level != null and qcResultShortPageVO.level != ''">

src/main/resources/mapper/QcresultInfoMapper.xml

@@ -2042,7 +2042,7 @@
     </select>
 
     <!-- 缺陷详情-科室（分页） -->
-    <select id="entryCountGroupByEntryAndDeptPage"  resultType="com.diagbot.dto.DeptEntryNumDTO">
+    <select id="entryCountGroupByEntryAndDeptPage"  resultType="com.diagbot.dto.EntryNumGroupDTO">
         SELECT
         t.*
         FROM

src/main/resources/mapper/SysRoleMapper.xml

@@ -36,6 +36,7 @@
                     t3.id AS permissionId,
                     t3.`name` AS permissionName,
                     t2.order_no AS orderNo,
+                    t1.order_nu AS orderNoPermissionId,
                     t1.id AS menuPermissionId
                 FROM
                     sys_menu t2
@@ -54,6 +55,6 @@
         AND t6.permission_id = t4.permissionId
         AND t6.role_id = #{roleId}
         ORDER BY
-            orderNo ASC,menuId ASC,menuPermissionId ASC
+            orderNo ASC,menuId ASC,orderNoPermissionId IS NULL ASC,orderNoPermissionId ASC, menuPermissionId ASC
      </select>
 </mapper>