diff --git a/src/main/java/com/ccsens/carbasics/api/ExportController.java b/src/main/java/com/ccsens/carbasics/api/ExportController.java index f56dddf..bb505e1 100644 --- a/src/main/java/com/ccsens/carbasics/api/ExportController.java +++ b/src/main/java/com/ccsens/carbasics/api/ExportController.java @@ -48,9 +48,9 @@ public class ExportController { @ApiOperation(value = "导出最新急救信息(自用)", notes = "") @RequestMapping(value = "/exportFirstAid", method = RequestMethod.GET, produces = {"application/json;charset=UTF-8"}) - public void exportFirstAid(String startTime, HttpServletResponse response) throws Exception{ + public void exportFirstAid(String startTime,Byte type, HttpServletResponse response) throws Exception{ log.info("导出最新急救信息(自用):{}",startTime); - Workbook workbook = exportService.exportFirstAid(startTime); + Workbook workbook = exportService.exportFirstAid(startTime,type); log.info("导出最新急救信息(自用)结束:{}",workbook); String fileName = "医院急救信息汇总表"+ DateUtil.format(new Date(), "yyyyMMddHHmmss") +".xlsx"; response.setHeader("Content-Disposition", "attachment;filename=" + URLEncoder.encode(fileName, CharsetUtil.UTF_8)); diff --git a/src/main/java/com/ccsens/carbasics/persist/dao/FirstAidDao.java b/src/main/java/com/ccsens/carbasics/persist/dao/FirstAidDao.java index 579170d..a9db7bc 100644 --- a/src/main/java/com/ccsens/carbasics/persist/dao/FirstAidDao.java +++ b/src/main/java/com/ccsens/carbasics/persist/dao/FirstAidDao.java @@ -76,7 +76,7 @@ public interface FirstAidDao extends FirstAidMapper { * 查询四家医院的病例列表 * @return 四家医院的病例列表 */ - List queryNeedHospital(@Param("startTime") Long startTime); + List queryNeedHospital(@Param("startTime") Long startTime,@Param("type") Byte type); /** * 质检员查看急救列表 diff --git a/src/main/java/com/ccsens/carbasics/service/ExportService.java b/src/main/java/com/ccsens/carbasics/service/ExportService.java index 57b0b88..e096a54 100644 --- a/src/main/java/com/ccsens/carbasics/service/ExportService.java +++ b/src/main/java/com/ccsens/carbasics/service/ExportService.java @@ -260,7 +260,7 @@ public class ExportService implements IExportService{ @Override - public Workbook exportFirstAid(String startTime) throws IOException, ParseException { + public Workbook exportFirstAid(String startTime,Byte type) throws IOException, ParseException { Workbook workbook = new XSSFWorkbook(); //空白格 PoiUtil.PoiUtilCell blank = new PoiUtil.PoiUtilCell(); @@ -285,7 +285,7 @@ public class ExportService implements IExportService{ Date parse = timeParam.parse(startTime); long time = parse.getTime(); - List hospitalData = firstAidDao.queryNeedHospital(time); + List hospitalData = firstAidDao.queryNeedHospital(time,type); if (CollectionUtil.isNotEmpty(hospitalData)) { for (FirstAidVo.NeedHospital hospitalDatum : hospitalData) { List data = new ArrayList<>(); diff --git a/src/main/java/com/ccsens/carbasics/service/IExportService.java b/src/main/java/com/ccsens/carbasics/service/IExportService.java index 07d0081..2e27247 100644 --- a/src/main/java/com/ccsens/carbasics/service/IExportService.java +++ b/src/main/java/com/ccsens/carbasics/service/IExportService.java @@ -22,7 +22,8 @@ public interface IExportService { /** * 导出最新急救信息(自用) * @param startTime 用户id + * @param type 导出类型 * @return excel */ - Workbook exportFirstAid(String startTime) throws IOException, ParseException; + Workbook exportFirstAid(String startTime,Byte type) throws IOException, ParseException; } diff --git a/src/main/resources/mapper_dao/FirstAidDao.xml b/src/main/resources/mapper_dao/FirstAidDao.xml index 6162e4a..25e2c94 100644 --- a/src/main/resources/mapper_dao/FirstAidDao.xml +++ b/src/main/resources/mapper_dao/FirstAidDao.xml @@ -256,12 +256,14 @@ LEFT JOIN t_organization_project AS op ON o.id = op.organization_id WHERE o.rec_status = 0 + AND o.`name` IN ( '山西医科大学第一医院', '太原钢铁(集团)有限公司总医院', '运城市盐湖区人民医院', '晋中市榆次区人民医院' ) + AND op.rec_status = 0 AND f.rec_status = 0