Merge branch 'dev/20200903_1.4.5' into debug

src/main/java/com/diagbot/config/ResourceServerConfigurer.java

@@ -163,6 +163,7 @@ public class ResourceServerConfigurer extends ResourceServerConfigurerAdapter {
                 .antMatchers("/qc/medLisInfo/getExamineSonPage").permitAll()
                 .antMatchers("/console/medicalCheckForm").permitAll()
                 .antMatchers("/console/medicalCheckTitle").permitAll()
+                .antMatchers("/console/export/medicalCheckExport").permitAll()
                 .antMatchers("/**").authenticated();
         //                .antMatchers("/**").permitAll();
     }

src/main/java/com/diagbot/config/security/UrlAccessDecisionManager.java

@@ -207,12 +207,14 @@ public class UrlAccessDecisionManager implements AccessDecisionManager {
                 || matchers("/qc/medLisInfo/getExamineSonPage", request)
                 || matchers("/console/medicalCheckForm", request)
                 || matchers("/console/medicalCheckTitle", request)
+                || matchers("/console/export/medicalCheckExport", request)
                 || matchers("/", request)) {
             return true;
         }
         return false;
     }
 
+
     private boolean matchers(String url, HttpServletRequest request) {
         AntPathRequestMatcher matcher = new AntPathRequestMatcher(url);
         if (matcher.matches(request)) {

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

@@ -1,5 +1,6 @@
 package com.diagbot.dto;
 
+import cn.afterturn.easypoi.excel.annotation.Excel;
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import lombok.Getter;
 import lombok.Setter;
@@ -18,11 +19,13 @@ import java.util.Map;
 public class MedicalCheckDTO extends Object {
 
     //科室名称
+    @Excel(name = "科室", width = 20, orderNum = "1")
     private String deptName;
     //科室id
     private String deptId;
 
     //医生
+    @Excel(name = "医疗组", width = 11, orderNum = "2")
     private String doctorName;
 
     //目标字符串
@@ -33,66 +36,83 @@ public class MedicalCheckDTO extends Object {
     private String numId;
 
     //入院记录未24小时内
+    @Excel(name = "入院记录24小时内", width = 16, orderNum = "3")
     private Integer ryjlw_24 = 0;
 
     //首次病程记录未8小时内
+    @Excel(name = "首次病程记录8小时内", width = 18, orderNum = "4")
     private Integer scbcjlw_8h = 0;
 
+    @Excel(name = "副主任/主任医师首次查房72小时内完成", width = 20, orderNum = "5")
     //副主任/主任医师首次查房72小时内未完成
     private Integer zrsccfw_72h= 0;
 
     //入院后未连记3天病程
+    @Excel(name = "入院后连记3天病程", width = 16, orderNum = "6")
     private Integer ryhljbcw_3d= 0;
 
-
-
-
     //每周未至少2次副主任/主任医师查房
+    @Excel(name = "每周至少2次副主任/主任医师查房", width = 20, orderNum = "7")
     private Integer zrcfw_2w= 0;
 
     //每周未至少3次主治医师查房记录
+    @Excel(name = "每周至少3次主治医师查房记录", width = 20, orderNum = "8")
     private Integer zzcfw_3w= 0;
 
     //抢救记录未6小时内完成
+    @Excel(name = "抢救记录6小时内完成", width = 15, orderNum = "9")
     private Integer qjjlw_6h= 0;
 
     //会诊记录在会诊申请后未24小时完成
+    @Excel(name = "会诊记录在会诊申请后24小时完成", width = 20, orderNum = "10")
     private Integer hzjlw_24h= 0;
 
     //术前讨论、术前小结未完成
+    @Excel(name = "术前讨论、术前小结完成", width = 15, orderNum = "11")
     private Integer sqtlxjw= 0;
 
     //手术记录术后24小时内未完成
+    @Excel(name = "手术记录术后24小时内完成", width = 15, orderNum = "12")
     private Integer sxjlsw_24h= 0;
 
     //术后首程在术后30分钟内未完成
+    @Excel(name = "术后首程在术后30分钟内完成", width = 15, orderNum = "13")
     private Integer xhscw_30m= 0;
 
     //术后主刀查房24小时内未完成
+    @Excel(name = "术后主刀查房24小时内完成", width = 15, orderNum = "14")
     private Integer shzdcfw_24h= 0;
 
     //术后未连记3天病程
+    @Excel(name = "术后连记3天病程(包括术后首程)", width = 15, orderNum = "15")
     private Integer shjbcw_3d= 0;
 
     //转科后未连记3天病程
+    @Excel(name = "转科后连记3天病程(包括专科记录)", width = 15, orderNum = "16")
     private Integer zkjbcw_3d= 0;
 
     //转接科记录专科后24小时内未完成
+    @Excel(name = "转接科记录专科后24小时内完成", width = 15, orderNum = "17")
     private Integer zkjlw_24= 0;
 
     //病危/重患者未每日记录病程
+    @Excel(name = "病危/重患者每日记录病程", width = 15, orderNum = "18")
     private Integer bwzhjlbcw_md= 0;
 
     //输血后未完成输血记录
+    @Excel(name = "输血后完成输血记录", width = 15, orderNum = "20")
     private Integer sxhwjl= 0;
 
     //24小时未完成输血后评价
+    @Excel(name = "24小时完成输血后评价", width = 15, orderNum = "20")
     private Integer sxpjw_24= 0;
 
     //危急值未记录
+    @Excel(name = "危急值记录", width = 15, orderNum = "21")
     private Integer wjzwjl= 0;
 
     //住院30天未阶段小结
+    @Excel(name = "住院30天阶段小结", width = 16, orderNum = "22")
     private Integer wywwcxj= 0;
 
 

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

@@ -761,7 +761,7 @@ public class ConsoleController {
                     "isPlacefile： 是否归档（0：未归档，1：已归档） <br>")
     @PostMapping("/medicalCheckForm")
     @SysLogger("medicalCheckForm")
-    public RespDTO<IPage<Map<String, Object>> > getMedicalCheck(@RequestBody @Valid FilterMedicalCheckVO filterVO) {
+    public RespDTO<IPage<MedicalCheckDTO> > getMedicalCheck(@RequestBody @Valid FilterMedicalCheckVO filterVO) {
         return RespDTO.onSuc(consoleFacade.getMedicalCheck(filterVO));
     }
     /**

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

@@ -2,13 +2,7 @@ package com.diagbot.web;
 
 import com.diagbot.annotation.SysLogger;
 import com.diagbot.facade.ConsoleExportFacade;
-import com.diagbot.vo.EntryStatisticsVO;
-import com.diagbot.vo.FilterOrderVO;
-import com.diagbot.vo.FilterPageByAverageVO;
-import com.diagbot.vo.FilterPageVO;
-import com.diagbot.vo.FilterUnModifyMRVO;
-import com.diagbot.vo.QcResultShortPageVO;
-import com.diagbot.vo.ReBeHosPageVO;
+import com.diagbot.vo.*;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -69,6 +63,22 @@ public class ConsoleExportController {
         consoleExportFacade.entryGroupByEntryExport(response, filterPageVO);
     }
 
+    /**
+     * 运行病历稽查统计（首页）
+     * @param filterVO
+     * @return
+     */
+    @ApiOperation(value = "运行病历稽查导出[by:cy]",
+            notes =  "name： 科室名称 <br>" +
+                    "startDate： 起始时间 <br>" +
+                    "endDate： 截止时间 <br>" +
+                    "isPlacefile： 是否归档（0：未归档，1：已归档） <br>")
+    @PostMapping("/medicalCheckExport")
+    @SysLogger("medicalCheckExport")
+    public void medicalCheckExport(HttpServletResponse response, @RequestBody @Valid FilterMedicalCheckVO filterVO) {
+        consoleExportFacade.medicalCheckExport(response, filterVO);
+    }
+
     /**
      * 各科室缺陷占比（组合）
      *
@@ -423,4 +433,4 @@ public class ConsoleExportController {
     public void qcCheckMRPageExport(HttpServletResponse response, @RequestBody @Valid QcResultShortPageVO qcResultShortPageVO) {
         consoleExportFacade.qcCheckMRPageExport(response, qcResultShortPageVO);
     }
-}
+}