Merge branch 'develop' into dev/20200603_1.3.1

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

@@ -5,6 +5,7 @@ import cn.afterturn.easypoi.excel.annotation.ExcelCollection;
 import lombok.Getter;
 import lombok.Setter;
 
+import java.util.Date;
 import java.util.List;
 
 /**
@@ -22,9 +23,9 @@ public class ExportExcelBehospitalDTO {
     @Excel(name = "住院号", needMerge = true)
     private String behospitalCode;
     @Excel(name = "入院时间", needMerge = true, exportFormat = "yyyy/MM/dd")
-    private String behospitalDate;
+    private Date behospitalDate;
     @Excel(name = "出院时间", needMerge = true, exportFormat = "yyyy/MM/dd")
-    private String leaveHospitalDate;
+    private Date leaveHospitalDate;
     @Excel(name = "分数", needMerge = true)
     private String score;
     @ExcelCollection(name = "")

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

@@ -966,10 +966,11 @@ public class BehospitalInfoFacade extends BehospitalInfoServiceImpl {
             throw new CommonException(CommonErrorCode.PARAM_ERROR, "统计区间不能大于7天");
         }
 
+        exportQcresultVO.setLeaveHosDateEnd(DateUtil.getFirstTimeOfDay(DateUtil.addDay(endDate, 1)));
         List<ExportExcelDTO> res = this.exportQcresult(exportQcresultVO);
         String fileName = dateFormat.format(startDate) + "-" + dateFormat.format(endDate) + "抽查住院病历质量情况.xls";
         response.setContentType("text/html;charset=UTF-8");
-        ExcelUtils.exportExcel(res, null, "导出sheet1", ExportExcelDTO.class, fileName, response);
+        ExcelUtils.exportExcelUser(res, null, "sheet1", ExportExcelDTO.class, fileName, response);
     }
 
     /**
@@ -994,10 +995,10 @@ public class BehospitalInfoFacade extends BehospitalInfoServiceImpl {
         if (endDate.getTime() - startDate.getTime() > interval) {
             throw new CommonException(CommonErrorCode.PARAM_ERROR, "统计区间不能大于7天");
         }
-
+        exportQcresultVO.setLeaveHosDateEnd(DateUtil.getFirstTimeOfDay(DateUtil.addDay(endDate, 1)));
         List<ExportExcelDTO> res = this.exportQcresultByDept(exportQcresultVO);
         String fileName = dateFormat.format(startDate) + "-" + dateFormat.format(endDate) + "抽查住院病历质量情况.xls";
         response.setContentType("text/html;charset=UTF-8");
-        ExcelUtils.exportExcel(res, null, "导出sheet1", ExportExcelDTO.class, fileName, response);
+        ExcelUtils.exportExcelUser(res, null, "sheet1", ExportExcelDTO.class, fileName, response);
     }
 }