Browse Source

修复多次警告
增加报表的导出功能

尚正平 2 năm trước cách đây
mục cha
commit
7a58a9f080

+ 1 - 1
src/main/java/com/diagbot/MrqcSysApplication.java

@@ -13,7 +13,7 @@ import org.springframework.cloud.netflix.hystrix.dashboard.EnableHystrixDashboar
 import org.springframework.cloud.openfeign.EnableFeignClients;
 
 
-/**
+/** 
  * @Description: 病历质控系统启动文件
  * @author: gaodm
  * @time: 2018/8/7 9:26

+ 11 - 17
src/main/java/com/diagbot/aggregate/ResultStatisticsAggregate.java

@@ -1,30 +1,26 @@
 package com.diagbot.aggregate;
 
+import java.math.BigDecimal;
+import java.math.RoundingMode;
+import java.text.DecimalFormat;
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.Map;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
 import com.diagbot.dto.NumDTO;
 import com.diagbot.facade.BehospitalInfoFacade;
-import com.diagbot.facade.QcCasesFacade;
 import com.diagbot.facade.QcresultInfoFacade;
 import com.diagbot.util.BeanUtil;
-import com.diagbot.util.EntityUtil;
 import com.diagbot.util.ListUtil;
 import com.diagbot.vo.FilterVO;
-import com.diagbot.vo.QcresultFilterVO;
 import com.google.common.collect.Lists;
+
 import io.github.lvyahui8.spring.annotation.DataConsumer;
 import io.github.lvyahui8.spring.annotation.DataProvider;
 import io.github.lvyahui8.spring.annotation.InvokeParameter;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Component;
-
-import java.math.BigDecimal;
-import java.math.RoundingMode;
-import java.text.DecimalFormat;
-import java.util.Collections;
-import java.util.Comparator;
-import java.util.LinkedHashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.stream.Collectors;
 
 /**
  * @Description:缺陷相关统计
@@ -36,8 +32,6 @@ public class ResultStatisticsAggregate {
     @Autowired
     private QcresultInfoFacade qcresultInfoFacade;
     @Autowired
-    private QcCasesFacade qcCasesFacade;
-    @Autowired
     private BehospitalInfoFacade behospitalInfoFacade;
 
     @DataProvider("setAllResult")

+ 1 - 1
src/main/java/com/diagbot/config/AccessDeniedExceptionPoint.java

@@ -21,7 +21,7 @@ import java.util.Map;
 public class AccessDeniedExceptionPoint implements AccessDeniedHandler {
     @Override
     public void handle(HttpServletRequest httpServletRequest, HttpServletResponse response, AccessDeniedException e) throws IOException, ServletException {
-        Map map = new HashMap();
+        Map<String,Object> map = new HashMap<>();
         //响应状态码统一为200
         response.setStatus(HttpServletResponse.SC_OK);
         map.put("code", "00000001");

+ 10 - 10
src/main/java/com/diagbot/config/AuthenticationExceptionHandler.java

@@ -1,9 +1,13 @@
 package com.diagbot.config;
 
 
-import com.diagbot.facade.SysUserFacade;
-import com.diagbot.util.StringUtil;
-import com.fasterxml.jackson.databind.ObjectMapper;
+import java.util.HashMap;
+import java.util.Map;
+
+import javax.servlet.ServletException;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.authentication.AccountExpiredException;
 import org.springframework.security.authentication.AccountStatusException;
@@ -15,13 +19,9 @@ import org.springframework.security.authentication.LockedException;
 import org.springframework.security.core.AuthenticationException;
 import org.springframework.security.web.util.matcher.AntPathRequestMatcher;
 import org.springframework.stereotype.Component;
-import org.springframework.validation.BindException;
 
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import java.util.HashMap;
-import java.util.Map;
+import com.diagbot.facade.SysUserFacade;
+import com.fasterxml.jackson.databind.ObjectMapper;
 
 /**
  * @Description:权限认证异常处理
@@ -35,7 +35,7 @@ public class AuthenticationExceptionHandler {
 
     public void handleException(HttpServletRequest request, HttpServletResponse response,
                                 AuthenticationException authException) throws ServletException {
-        Map map = new HashMap();
+        Map<String,Object> map = new HashMap<>();
         //登录前的获取登录页面的请求接口不知道什么原因会抛出未认证(Full authentication is required to access this resource)
         //如果抛出未认证在这个调用这个服务接口返回消息
         //响应状态码统一为200

+ 4 - 7
src/main/java/com/diagbot/config/MyJwtTokenStore.java

@@ -121,9 +121,8 @@ public class MyJwtTokenStore extends JwtTokenStore {
                 String userId = authentication.getUserAuthentication().getName();
                 String clientId = authentication.getOAuth2Request().getClientId();
                 Collection<Approval> approvals = this.approvalStore.getApprovals(userId, clientId);
-                Collection<String> approvedScopes = new HashSet();
-                Iterator var9 = approvals.iterator();
-
+                Collection<String> approvedScopes = new HashSet<>();
+                Iterator<?> var9 = approvals.iterator();
                 while(var9.hasNext()) {
                     Approval approval = (Approval)var9.next();
                     if (approval.isApproved()) {
@@ -181,14 +180,12 @@ public class MyJwtTokenStore extends JwtTokenStore {
             String clientId = auth.getOAuth2Request().getClientId();
             Authentication user = auth.getUserAuthentication();
             if (user != null) {
-                Collection<Approval> approvals = new ArrayList();
-                Iterator var6 = auth.getOAuth2Request().getScope().iterator();
-
+                Collection<Approval> approvals = new ArrayList<>();
+                Iterator<?> var6 = auth.getOAuth2Request().getScope().iterator();
                 while(var6.hasNext()) {
                     String scope = (String)var6.next();
                     approvals.add(new Approval(user.getName(), clientId, scope, new Date(), ApprovalStatus.APPROVED));
                 }
-
                 this.approvalStore.revokeApprovals(approvals);
             }
         }

+ 6 - 5
src/main/java/com/diagbot/config/OAuth2Configurer.java

@@ -1,8 +1,7 @@
 package com.diagbot.config;
 
-import com.diagbot.facade.SysDictionaryFacade;
-import com.diagbot.service.UrlUserService;
-import lombok.extern.slf4j.Slf4j;
+import java.util.Arrays;
+
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.context.annotation.Bean;
@@ -16,12 +15,14 @@ import org.springframework.security.oauth2.config.annotation.web.configurers.Aut
 import org.springframework.security.oauth2.config.annotation.web.configurers.AuthorizationServerSecurityConfigurer;
 import org.springframework.security.oauth2.provider.token.TokenEnhancer;
 import org.springframework.security.oauth2.provider.token.TokenEnhancerChain;
-import org.springframework.security.oauth2.provider.token.TokenStore;
 import org.springframework.security.oauth2.provider.token.store.JwtAccessTokenConverter;
 import org.springframework.security.oauth2.provider.token.store.JwtTokenStore;
 import org.springframework.security.oauth2.provider.token.store.KeyStoreKeyFactory;
 
-import java.util.Arrays;
+import com.diagbot.facade.SysDictionaryFacade;
+import com.diagbot.service.UrlUserService;
+
+import lombok.extern.slf4j.Slf4j;
 
 /**
  * @Description: OAuth2授权认证配置类

+ 4 - 4
src/main/java/com/diagbot/config/ResourceServerConfigurer.java

@@ -1,6 +1,7 @@
 package com.diagbot.config;
 
-import com.diagbot.util.RedisUtils;
+import java.io.IOException;
+
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -14,12 +15,10 @@ import org.springframework.security.jwt.crypto.sign.RsaVerifier;
 import org.springframework.security.oauth2.config.annotation.web.configuration.EnableResourceServer;
 import org.springframework.security.oauth2.config.annotation.web.configuration.ResourceServerConfigurerAdapter;
 import org.springframework.security.oauth2.config.annotation.web.configurers.ResourceServerSecurityConfigurer;
-import org.springframework.security.oauth2.provider.error.OAuth2AuthenticationEntryPoint;
 import org.springframework.security.oauth2.provider.token.store.JwtAccessTokenConverter;
-import org.springframework.security.oauth2.provider.token.store.JwtTokenStore;
 import org.springframework.util.FileCopyUtils;
 
-import java.io.IOException;
+import com.diagbot.util.RedisUtils;
 
 /**
  * @Description: 权限资源配置类
@@ -154,6 +153,7 @@ public class ResourceServerConfigurer extends ResourceServerConfigurerAdapter {
                 .antMatchers("/console/export/entryCountGroupByEntryExport").permitAll()
                 .antMatchers("/console/export/entryCountGroupByCaseExport").permitAll()
                 .antMatchers("/console/export/entryStatisticsExport").permitAll()
+                .antMatchers("/console/export/sjcfStatisticsExport").permitAll()
                 .antMatchers("/console/export/qcResultShortPageExport").permitAll()
                 .antMatchers("/console/export/leaveHosMrPageExport").permitAll()
                 .antMatchers("/console/export/qcCheckStatisticsExport").permitAll()

+ 1 - 0
src/main/java/com/diagbot/config/security/UrlAccessDecisionManager.java

@@ -229,6 +229,7 @@ public class UrlAccessDecisionManager implements AccessDecisionManager {
                 || matchers("/console/export/entryCountGroupByEntryExport", request)
                 || matchers("/console/export/entryCountGroupByCaseExport", request)
                 || matchers("/console/export/entryStatisticsExport", request)
+                || matchers("/console/export/sjcfStatisticsExport", request)
                 || matchers("/console/export/qcResultShortPageExport", request)
                 || matchers("/console/export/leaveHosMrPageExport", request)
                 || matchers("/console/export/qcCheckStatisticsExport", request)

+ 2 - 1
src/main/java/com/diagbot/config/security/UrlConfigAttribute.java

@@ -11,7 +11,8 @@ import javax.servlet.http.HttpServletRequest;
  */
 public class UrlConfigAttribute implements ConfigAttribute {
 
-    private final HttpServletRequest httpServletRequest;
+	private static final long serialVersionUID = 6871245426256786239L;
+	private final HttpServletRequest httpServletRequest;
 
     public UrlConfigAttribute(HttpServletRequest httpServletRequest) {
         this.httpServletRequest = httpServletRequest;

+ 0 - 1
src/main/java/com/diagbot/dto/SjcfStatisticsDTO.java

@@ -81,7 +81,6 @@ public class SjcfStatisticsDTO {
     @Excel(name = "主治医师首次查房未在患者入院48小时内完成率", width = 15, orderNum = "3")
     private String zzsccf48xsPercentStr = "0.00%";
     
-    
     /**
      * 副主任医师/主任医师首次查房未在患者入院72h内完成
      */

+ 60 - 14
src/main/java/com/diagbot/facade/ConsoleExportFacade.java

@@ -1,25 +1,63 @@
 package com.diagbot.facade;
 
-import cn.afterturn.easypoi.excel.entity.params.ExcelExportEntity;
-import com.alibaba.fastjson.JSONObject;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.Date;
+import java.util.List;
+
+import javax.servlet.http.HttpServletResponse;
+import javax.validation.Valid;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.metadata.OrderItem;
-import com.diagbot.dto.*;
+import com.diagbot.dto.AverageStatisticsDTO;
+import com.diagbot.dto.AverageStatisticsFeeDTO;
+import com.diagbot.dto.AverageStatisticsFeeMonthDTO;
+import com.diagbot.dto.AverageStatisticsMonthDTO;
+import com.diagbot.dto.EntryNumDTO;
+import com.diagbot.dto.EntryNumGroupDTO;
+import com.diagbot.dto.EntryStatisticsDTO;
+import com.diagbot.dto.ExportExcelBehospitalDTO;
+import com.diagbot.dto.ExportExcelDTO;
+import com.diagbot.dto.ExportExcelWideBehospitalDTO;
+import com.diagbot.dto.ExportWideExcelDTO;
+import com.diagbot.dto.HomePageImproveDTO;
+import com.diagbot.dto.HomePageNumDTO;
+import com.diagbot.dto.LevelStatisticsDTO;
+import com.diagbot.dto.LevelStatisticsTZDTO;
+import com.diagbot.dto.MedicalCheckExportDTO;
+import com.diagbot.dto.NumDTO;
+import com.diagbot.dto.QcResultPercentDTO;
+import com.diagbot.dto.QualityControlDTO;
+import com.diagbot.dto.ReBeHosDTO;
+import com.diagbot.dto.SjcfStatisticsDTO;
+import com.diagbot.dto.UnModifyMRDTO;
 import com.diagbot.entity.SysHospitalSet;
 import com.diagbot.exception.CommonErrorCode;
 import com.diagbot.exception.CommonException;
-import com.diagbot.util.*;
-import com.diagbot.vo.*;
+import com.diagbot.util.BeanUtil;
+import com.diagbot.util.ExcelUtils;
+import com.diagbot.util.ListUtil;
+import com.diagbot.util.StringUtil;
+import com.diagbot.util.SysUserUtils;
+import com.diagbot.vo.BehospitalPageVO;
+import com.diagbot.vo.EntryStatisticsVO;
+import com.diagbot.vo.FilterMedicalCheckVO;
+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.fasterxml.jackson.databind.ObjectMapper;
 import com.google.common.collect.Lists;
-import com.google.gson.JsonObject;
-import org.apache.commons.lang3.ObjectUtils;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Component;
 
-import javax.servlet.http.HttpServletResponse;
-import java.util.*;
+import cn.afterturn.easypoi.excel.entity.params.ExcelExportEntity;
 
 /**
  * @Description: 报表导出装饰层
@@ -211,6 +249,12 @@ public class ConsoleExportFacade {
         String fileName = "关键条目缺陷占比统计.xls";
         ExcelUtils.exportExcel(records, null, "sheet1", EntryStatisticsDTO.class, fileName, response, 12.8f);
     }
+    
+    public void sjcfStatisticsExport(HttpServletResponse response, @Valid EntryStatisticsVO entryStatisticsVO) {
+    	 List<SjcfStatisticsDTO> records = consoleFacade.sjcfStatistics(entryStatisticsVO);
+         String fileName = "三级查房制度相关制度.xls";
+         ExcelUtils.exportExcel(records, null, "sheet1", SjcfStatisticsDTO.class, fileName, response, 12.8f);
+    }
 
     /**
      * 缺陷详情质控评分页导出
@@ -456,7 +500,7 @@ public class ConsoleExportFacade {
                 continue;
             }
             String[] keyValue = valueStr.split("--");
-            if (keyValue != null || keyValue.length > 1) {
+            if (keyValue != null && keyValue.length > 1) {
                 ExcelExportEntity entryCol = new ExcelExportEntity(keyValue[1], "entry_" + keyValue[0] + "_num");
                 entryCol.setWidth(20);
                 colList.add(entryCol);
@@ -630,7 +674,7 @@ public class ConsoleExportFacade {
     }
 
    static void orderMethod(BehospitalPageVO behospitalPageVO){
-       List orders = behospitalPageVO.getOrders();
+       List<?> orders = behospitalPageVO.getOrders();
        Boolean flag= false;
        List<OrderItem> itemList = new ArrayList<>();
        for (Object order : orders) {
@@ -651,5 +695,7 @@ public class ConsoleExportFacade {
            behospitalPageVO.setOrders(itemList);
        }
 
-   };
+   }
+
+
 }

+ 1 - 1
src/main/java/com/diagbot/facade/ConsoleFacade.java

@@ -2519,7 +2519,7 @@ public class ConsoleFacade {
     }
     
     
-	public Object sjcfStatistics(@Valid EntryStatisticsVO entryStatisticsVO) {
+	public List<SjcfStatisticsDTO> sjcfStatistics(@Valid EntryStatisticsVO entryStatisticsVO) {
 		filterFacade.entryStatisticsVOSet(entryStatisticsVO);
         if (entryStatisticsVO.getDeptName().equals("全院")) {
             entryStatisticsVO.setDeptName("");

+ 0 - 1
src/main/java/com/diagbot/facade/data/AMedicalRecordFacade.java

@@ -269,7 +269,6 @@ public class AMedicalRecordFacade extends MedicalRecordServiceImpl {
      */
     public RespDTO<Map<String, Object>> executeMrRecordIng(AMrContentVO aMrContentVO) {
         if (aMrContentVO.getRecords() != null && aMrContentVO.getRecords().size() > 0) {
-            AMrContentDTO aMrContentDTO = new AMrContentDTO();
             //循环验证数据有效性
             for (AMedicalRecordVO aMedicalRecordVO : aMrContentVO.getRecords()) {
                 if ("".equals(aMedicalRecordVO.getRecId())) {

+ 14 - 15
src/main/java/com/diagbot/facade/str/BStrConsultationApplyFacade.java

@@ -1,13 +1,21 @@
 package com.diagbot.facade.str;
 
+import java.util.Date;
+import java.util.List;
+import java.util.Map;
+
+import org.springframework.beans.BeanUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Qualifier;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.stereotype.Component;
+
 import com.alibaba.fastjson.JSON;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.generator.config.rules.NamingStrategy;
 import com.diagbot.dto.RespDTO;
 import com.diagbot.dto.data.ColumnZhAndChDTO;
 import com.diagbot.entity.StrConsultationApply;
-import com.diagbot.entity.StrConsultationApply;
-import com.diagbot.enums.CacheKeyEnum;
 import com.diagbot.enums.IsDeleteEnum;
 import com.diagbot.facade.data.AMedAbnormalInfoFacade;
 import com.diagbot.facade.data.ColumnFacade;
@@ -20,15 +28,6 @@ import com.diagbot.vo.data.AStrConsultationApplyVO;
 import com.diagbot.vo.str.StrConsultationApplyVO;
 import com.diagbot.vo.str.StrContentVO;
 import com.google.common.collect.Lists;
-import org.springframework.beans.BeanUtils;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Qualifier;
-import org.springframework.beans.factory.annotation.Value;
-import org.springframework.stereotype.Component;
-
-import java.util.Date;
-import java.util.List;
-import java.util.Map;
 
 @Component
 public class BStrConsultationApplyFacade extends StrConsultationApplyServiceImpl {
@@ -137,7 +136,7 @@ public class BStrConsultationApplyFacade extends StrConsultationApplyServiceImpl
      * @Author:liuqq
      * @time: ${DATE} ${TIME}
      **/
-    public RespDTO execDealData(List<StrConsultationApplyVO> list){
+    public RespDTO<?> execDealData(List<StrConsultationApplyVO> list){
         try {
             if(list!=null && list.size()>0){
                 //循环验证数据有效性
@@ -197,9 +196,9 @@ public class BStrConsultationApplyFacade extends StrConsultationApplyServiceImpl
             if(StringUtil.isNotEmpty(s.getAuditDate())){
                 t.setAuditDate(DateUtil.parseDateTime(s.getAuditDate()));//审核时间
             }
-            Map<String, String> columnMap=columnFacade.getColumn(CacheKeyEnum.CONSULTATION_APPLY.getName());
-            Map<String, Object> entityMap=MapUtil.objectToMap(s);
-            Map<String, Object> wholeMap=MapUtil.objcetKeyConvert(columnMap,entityMap);
+//            Map<String, String> columnMap=columnFacade.getColumn(CacheKeyEnum.CONSULTATION_APPLY.getName());
+//            Map<String, Object> entityMap=MapUtil.objectToMap(s);
+//            Map<String, Object> wholeMap=MapUtil.objcetKeyConvert(columnMap,entityMap);
             //t.setWholeData(JSON.toJSONString(wholeMap));
             tList.add(t);
         }

+ 1 - 1
src/main/java/com/diagbot/web/ConsoleController.java

@@ -635,7 +635,7 @@ public class ConsoleController {
     
     
     /**
-     * 关键条目缺陷占比统计
+     * 三级查房制度相关制度
      *
      * @param entryStatisticsVO
      * @return

+ 37 - 11
src/main/java/com/diagbot/web/ConsoleExportController.java

@@ -1,21 +1,28 @@
 package com.diagbot.web;
 
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.diagbot.annotation.SysLogger;
-import com.diagbot.dto.QcResultShortDTO;
-import com.diagbot.dto.RespDTO;
-import com.diagbot.facade.ConsoleExportFacade;
-import com.diagbot.vo.*;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
+import javax.servlet.http.HttpServletResponse;
+import javax.validation.Valid;
+
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
-import javax.servlet.http.HttpServletResponse;
-import javax.validation.Valid;
+import com.diagbot.annotation.SysLogger;
+import com.diagbot.facade.ConsoleExportFacade;
+import com.diagbot.vo.BehospitalPageVO;
+import com.diagbot.vo.EntryStatisticsVO;
+import com.diagbot.vo.FilterMedicalCheckVO;
+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 io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
 
 /**
  * @Description:
@@ -25,7 +32,6 @@ import javax.validation.Valid;
 @RequestMapping("/console/export")
 @RestController
 @Api(value = "数据报表明细导出相关API", tags = { "数据报表明细导出相关API" })
-@SuppressWarnings("unchecked")
 public class ConsoleExportController {
 
     @Autowired
@@ -221,6 +227,26 @@ public class ConsoleExportController {
         consoleExportFacade.entryStatisticsExport(response, entryStatisticsVO);
     }
 
+    
+    /**
+     * 三级查房制度相关制度
+     *
+     * @param entryStatisticsVO
+     * @return
+     */
+    @ApiOperation(value = "三级查房制度相关制度导出[by:gaodm]",
+            notes = "deptName:科室名称 <br>" +
+                    "asc: 排序(升序) <br>" +
+                    "desc:排序(降序) <br>" +
+                    "startDate: 起始时间 <br>" +
+                    "endDate: 截止时间 <br>" +
+                    "isPlacefile: 是否归档(0:未归档,1:已归档) <br>")
+    @PostMapping("/sjcfStatisticsExport")
+    @SysLogger("sjcfStatisticsExport")
+    public void sjcfStatisticsExport(HttpServletResponse response, @RequestBody @Valid EntryStatisticsVO entryStatisticsVO) {
+        consoleExportFacade.sjcfStatisticsExport(response, entryStatisticsVO);
+    }
+    
     /**
      * 缺陷详情质控评分页导出
      *

+ 1 - 1
src/main/java/com/diagbot/web/DataStrController.java

@@ -128,7 +128,7 @@ public class DataStrController {
     @ApiOperation(value = "会诊申请单")
     @PostMapping("/sendConsultationApply")
     @SysLogger("sendConsultationApply")
-    public RespDTO sendConsultationApply(@RequestBody List<StrConsultationApplyVO> list){
+    public RespDTO<?> sendConsultationApply(@RequestBody List<StrConsultationApplyVO> list){
         return bStrConsultationApplyFacade.execDealData(list);
     }