From 51b8167055ace80ea34192b390ba5350e4186628 Mon Sep 17 00:00:00 2001 From: wyb <1977763549@qq.com> Date: Tue, 8 Apr 2025 17:38:35 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E6=8E=A5=E5=8F=A3=E6=B3=A8=E9=87=8A?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/docus/bgts/config/MyConstruct.java | 25 +- .../com/docus/bgts/config/MyScheduling.java | 52 +- .../docus/bgts/controller/BgtsController.java | 481 +++++++++--------- 3 files changed, 276 insertions(+), 282 deletions(-) diff --git a/src/main/java/com/docus/bgts/config/MyConstruct.java b/src/main/java/com/docus/bgts/config/MyConstruct.java index b4b0e13..d6ac8d3 100644 --- a/src/main/java/com/docus/bgts/config/MyConstruct.java +++ b/src/main/java/com/docus/bgts/config/MyConstruct.java @@ -1,14 +1,11 @@ package com.docus.bgts.config; -import com.docus.bgts.enums.Codes; import com.docus.bgts.facade.IBgtsService; -import com.docus.bgts.utils.FileUtils; -import org.apache.commons.lang3.StringUtils; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; -import javax.annotation.PostConstruct; + import javax.annotation.PreDestroy; @Component @@ -22,16 +19,16 @@ public class MyConstruct { /** * 开启手麻全量采集 */ - @PostConstruct - public void startCollectAll(){ - logger.info("全量采集开始------"); - String collectorid = String.valueOf(FileUtils.getJsonByName("collectorid")); - String startCollectTime = String.valueOf(FileUtils.getJsonByName("startCollectTime")); - String isStartCollect = String.valueOf(FileUtils.getJsonByName("isStartCollect")); - if(collectorid.equals(Codes.SMCODE.getCode())&& StringUtils.isNotBlank(startCollectTime)&&isStartCollect!=null&&isStartCollect.equals("1")){ - bgtsService.collectAll(); - } - } +// @PostConstruct +// public void startCollectAll(){ +// logger.info("全量采集开始------"); +// String collectorid = String.valueOf(FileUtils.getJsonByName("collectorid")); +// String startCollectTime = String.valueOf(FileUtils.getJsonByName("startCollectTime")); +// String isStartCollect = String.valueOf(FileUtils.getJsonByName("isStartCollect")); +// if(collectorid.equals(Codes.SMCODE.getCode())&& StringUtils.isNotBlank(startCollectTime)&&isStartCollect!=null&&isStartCollect.equals("1")){ +// bgtsService.collectAll(); +// } +// } /** * 开启重症全量采集 diff --git a/src/main/java/com/docus/bgts/config/MyScheduling.java b/src/main/java/com/docus/bgts/config/MyScheduling.java index aa5f6e4..3239b54 100644 --- a/src/main/java/com/docus/bgts/config/MyScheduling.java +++ b/src/main/java/com/docus/bgts/config/MyScheduling.java @@ -1,6 +1,5 @@ package com.docus.bgts.config; -import com.docus.bgts.enums.Codes; import com.docus.bgts.facade.IBgtsService; import com.docus.bgts.service.CheckIntegrityService; import com.docus.bgts.utils.FileUtils; @@ -62,14 +61,15 @@ public class MyScheduling { * 手麻/重症采集器 * 10分钟执行一次 */ - @Scheduled(fixedRate = 1000 * 60 * 10) - public void collect() { - String collectorid = String.valueOf(FileUtils.getJsonByName("collectorid")); - if ((!collectorid.equals(Codes.SMCODE.getCode())) && (!collectorid.equals(Codes.ZZCODE.getCode()))) { - return; - } - bgtsService.timerCollect(); - } +// @Scheduled(fixedRate = 1000 * 60 * 10) +// public void collect() { +// String collectorid = String.valueOf(FileUtils.getJsonByName("collectorid")); +// if ((!collectorid.equals(Codes.SMCODE.getCode())) && (!collectorid.equals(Codes.ZZCODE.getCode()))) { +// return; +// } +// bgtsService.timerCollect(); +// } + // // // 时间 // private static List date = new ArrayList<>(); @@ -149,23 +149,23 @@ public class MyScheduling { // // } // -// @Scheduled(cron ="0 0 0 * * ?") -// public void collect(){ -// String intervalDayOpen = String.valueOf(FileUtils.getJsonByName("intervalDayOpen")); -// if (intervalDayOpen.equals("1")){ -// try{ -// String collectorid = String.valueOf(FileUtils.getJsonByName("collectorid")); -// int day = Integer.parseInt(String.valueOf(FileUtils.getJsonByName("intervalDay"))); -// logger.info("0点采集前"+day+"天出院数据"); -// Map dateCollectionTime = getDateCollectionTime(new Date(), day); -// logger.info("采集"+dateCollectionTime.get("startDate")+"至-------"+dateCollectionTime.get("endDate")+"数据"); -// bgtsService.collectByDate(dateCollectionTime.get("startDate"),dateCollectionTime.get("endDate"),collectorid,String.valueOf(0)); -// }catch (Exception e) { -// logger.error("pacs二次采集出错！---"+e.getMessage()); -// } -// -// } -// } + @Scheduled(cron ="0 0 0 * * ?") + public void collect(){ + String intervalDayOpen = String.valueOf(FileUtils.getJsonByName("intervalDayOpen")); + if (intervalDayOpen.equals("1")){ + try{ + String collectorid = String.valueOf(FileUtils.getJsonByName("collectorid")); + int day = Integer.parseInt(String.valueOf(FileUtils.getJsonByName("intervalDay"))); + logger.info("0点采集前"+day+"天出院数据"); + Map dateCollectionTime = getDateCollectionTime(new Date(), day); + logger.info("采集"+dateCollectionTime.get("startDate")+"至-------"+dateCollectionTime.get("endDate")+"数据"); + bgtsService.collectByDate(dateCollectionTime.get("startDate"),dateCollectionTime.get("endDate"),collectorid,String.valueOf(0)); + }catch (Exception e) { + logger.error("pacs二次采集出错！---"+e.getMessage()); + } + + } + } /** diff --git a/src/main/java/com/docus/bgts/controller/BgtsController.java b/src/main/java/com/docus/bgts/controller/BgtsController.java index 91421e1..ebe3f25 100644 --- a/src/main/java/com/docus/bgts/controller/BgtsController.java +++ b/src/main/java/com/docus/bgts/controller/BgtsController.java @@ -5,7 +5,6 @@ import com.docus.bgts.config.MyScheduling; import com.docus.bgts.entity.CommonResult; import com.docus.bgts.facade.IAfCollectTaskService; import com.docus.bgts.facade.IBgtsService; -import com.docus.bgts.facade.IMzSyncService; import com.docus.bgts.service.CheckIntegrityService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; @@ -18,8 +17,6 @@ import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.RestController; -import java.util.Date; - @Api(value = "采集接口", tags = "采集接口") @RestController @@ -36,194 +33,194 @@ public class BgtsController { @Autowired IAfCollectTaskService afCollectTaskService; -// @ApiOperation("完整性同步程序开关0：关闭 1：开启") -// @GetMapping("/onOffSync") -// public void onOffSync(@RequestParam(value = "flag",defaultValue = "0") String flag){ -// MyScheduling.syncFlag=flag; -// } -// -// @GetMapping("/addSyncIntegrality") -// public void addSyncIntegrality(@RequestParam("startDate")String startDate,String endDate){ -// checkIntegrityService.addSyncIntegrality(startDate,endDate); -// } -// -// @GetMapping("/addSyncIntegralityByJzhs") -// public CommonResult addSyncIntegrality(@RequestParam("jzhs")String jzhs){ -// if(jzhs.split(",").length > 100){ -// return CommonResult.failed("jzh个数不能超过100个"); -// } -// checkIntegrityService.addSyncIntegralityByJzhs(jzhs); -// return CommonResult.success("完成"); -// } + @ApiOperation("完整性同步程序开关0：关闭 1：开启") + @GetMapping("/onOffSync") + public void onOffSync(@RequestParam(value = "flag",defaultValue = "0") String flag){ + MyScheduling.syncFlag=flag; + } + + @GetMapping("/addSyncIntegrality") + public void addSyncIntegrality(@RequestParam("startDate")String startDate,String endDate){ + checkIntegrityService.addSyncIntegrality(startDate,endDate); + } -// @ApiOperation("采集接口") -// @ApiImplicitParams({ -// @ApiImplicitParam(name = "empId",value = "患者主索引号",required = true,dataTypeClass = String.class), -// @ApiImplicitParam(name = "collectSubId",value = "af_interface_collect_sub表id",required = true) -// }) -// @GetMapping("/collect") -// public CommonResult collect(@RequestParam("collectSubId") String collectSubId, -// @RequestParam("empId") String empId) { -// try { -// logger.info("采集接口接收到参数：\nempId--"+empId+"\ncollectSubId--"+collectSubId); -// bgtsService.collect(empId); -// logger.info("采集完成"); -// afCollectTaskService.updateInterfaceCollect(collectSubId, 1); -// logger.info("------------采集结束-----------"); -// } catch (RuntimeException e) { -// e.printStackTrace(); -// try { -// afCollectTaskService.updateInterfaceCollect(collectSubId, 0); -// }catch (Exception e1) { -// logger.info(e1.getMessage()); -// return CommonResult.failed(e1.getMessage()); -// } -// return CommonResult.failed(e.getMessage()); -// } -// catch (Exception e) { -// e.printStackTrace(); -// }catch (Throwable t){ -// t.printStackTrace(); -// logger.error("throwable，{}", t.getMessage()); -// } -// return CommonResult.success("ok"); -// } -// -// @ApiOperation("Pacs采集接口") -// @ApiImplicitParams({ -// @ApiImplicitParam(name = "empId",value = "患者主索引号",required = true,dataTypeClass = String.class), -// @ApiImplicitParam(name = "collectSubId",value = "af_interface_collect_sub表id",required = true), -// @ApiImplicitParam(name = "admissDate",value = "入院时间",required = true), -// @ApiImplicitParam(name = "disDate",value = "出院时间",required = true), -// @ApiImplicitParam(name = "times",value = "住院次数",required = true) -// }) -// @GetMapping("/collectPacs") -// public CommonResult collect(@RequestParam("collectSubId") String collectSubId, -// @RequestParam("empId") String empId, -// @RequestParam("admissDate") String admissDate, -// @RequestParam("disDate") String disDate, -// @RequestParam("times") String times){ -// try { -// logger.info("采集接口接收到参数：\nempId--"+empId+"\ncollectSubId--"+collectSubId); -// bgtsService.collectPacs(empId,admissDate,disDate,times); -// logger.info("采集完成"); -// afCollectTaskService.updateInterfaceCollect(collectSubId, 1); -// logger.info("------------采集结束-----------"); -// } catch (RuntimeException e) { -// e.printStackTrace(); -// try { -// afCollectTaskService.updateInterfaceCollect(collectSubId, 0); -// }catch (Exception e1) { -// logger.info(e1.getMessage()); -// return CommonResult.failed(e1.getMessage()); -// } -// return CommonResult.failed(e.getMessage()); -// } -// catch (Exception e) { -// e.printStackTrace(); -// } -// return CommonResult.success("ok"); -// } -// + @GetMapping("/addSyncIntegralityByJzhs") + public CommonResult addSyncIntegrality(@RequestParam("jzhs")String jzhs){ + if(jzhs.split(",").length > 100){ + return CommonResult.failed("jzh个数不能超过100个"); + } + checkIntegrityService.addSyncIntegralityByJzhs(jzhs); + return CommonResult.success("完成"); + } -// @ApiOperation("动态心电采集接口") -// @ApiImplicitParams({ -// @ApiImplicitParam(name = "empId",value = "患者主索引号",required = true,dataTypeClass = String.class), -// @ApiImplicitParam(name = "collectSubId",value = "af_interface_collect_sub表id",required = true), -// @ApiImplicitParam(name = "admissDate",value = "入院时间",required = true), -// @ApiImplicitParam(name = "disDate",value = "出院时间",required = true), -// @ApiImplicitParam(name = "times",value = "住院次数",required = true) -// }) -// @GetMapping("/collectEcg") -// public CommonResult collectEcg(@RequestParam("collectSubId") String collectSubId, -// @RequestParam("empId") String empId, -// @RequestParam("admissDate") String admissDate, -// @RequestParam("disDate") String disDate, -// @RequestParam("times") String times){ -// try { -// logger.info("采集接口接收到参数：\nempId--"+empId+"\ncollectSubId--"+collectSubId); -// bgtsService.collectEcg(empId,admissDate,disDate,times); -// logger.info("采集完成"); -// afCollectTaskService.updateInterfaceCollect(collectSubId, 1); -// logger.info("------------采集结束-----------"); -// } catch (RuntimeException e) { -// e.printStackTrace(); -// try { -// afCollectTaskService.updateInterfaceCollect(collectSubId, 0); -// }catch (Exception e1) { -// logger.info(e1.getMessage()); -// return CommonResult.failed(e1.getMessage()); -// } -// return CommonResult.failed(e.getMessage()); -// } -// catch (Exception e) { -// e.printStackTrace(); -// } -// return CommonResult.success("ok"); -// } + @ApiOperation("采集接口") + @ApiImplicitParams({ + @ApiImplicitParam(name = "empId",value = "患者主索引号",required = true,dataTypeClass = String.class), + @ApiImplicitParam(name = "collectSubId",value = "af_interface_collect_sub表id",required = true) + }) + @GetMapping("/collect") + public CommonResult collect(@RequestParam("collectSubId") String collectSubId, + @RequestParam("empId") String empId) { + try { + logger.info("采集接口接收到参数：\nempId--"+empId+"\ncollectSubId--"+collectSubId); + bgtsService.collect(empId); + logger.info("采集完成"); + afCollectTaskService.updateInterfaceCollect(collectSubId, 1); + logger.info("------------采集结束-----------"); + } catch (RuntimeException e) { + e.printStackTrace(); + try { + afCollectTaskService.updateInterfaceCollect(collectSubId, 0); + }catch (Exception e1) { + logger.info(e1.getMessage()); + return CommonResult.failed(e1.getMessage()); + } + return CommonResult.failed(e.getMessage()); + } + catch (Exception e) { + e.printStackTrace(); + }catch (Throwable t){ + t.printStackTrace(); + logger.error("throwable，{}", t.getMessage()); + } + return CommonResult.success("ok"); + } -// /** -// * 按需采集 -// * @param emamNo -// * @return -// */ -// @ApiOperation("按需采集接口") -// @ApiImplicitParams({ -// @ApiImplicitParam(name = "emamNo",value = "报告单号",required = true,dataTypeClass = String.class), -// @ApiImplicitParam(name = "empId",value = "患者主索引号",required = true,dataTypeClass = String.class) -// }) -// @GetMapping("/collectByExamNo") -// public CommonResult collectByExamNo(@RequestParam("emamNo") String emamNo, -// @RequestParam("empId") String empId){ -// try { -// logger.info("按需采集接口接受参数：\nempId--"+empId+"\nemamNo--"+emamNo); -// bgtsService.collectByExamNo(emamNo,empId); -//// afCollectTaskService.updateInterfaceCollect(collectSubId, 1); -// }catch (RuntimeException e) { -// e.printStackTrace(); -// return CommonResult.failed(e.getMessage()); -// } -// catch (Exception e) { -// e.printStackTrace(); -// } -// return CommonResult.success("ok"); -// } + @ApiOperation("Pacs采集接口") + @ApiImplicitParams({ + @ApiImplicitParam(name = "empId",value = "患者主索引号",required = true,dataTypeClass = String.class), + @ApiImplicitParam(name = "collectSubId",value = "af_interface_collect_sub表id",required = true), + @ApiImplicitParam(name = "admissDate",value = "入院时间",required = true), + @ApiImplicitParam(name = "disDate",value = "出院时间",required = true), + @ApiImplicitParam(name = "times",value = "住院次数",required = true) + }) + @GetMapping("/collectPacs") + public CommonResult collect(@RequestParam("collectSubId") String collectSubId, + @RequestParam("empId") String empId, + @RequestParam("admissDate") String admissDate, + @RequestParam("disDate") String disDate, + @RequestParam("times") String times){ + try { + logger.info("采集接口接收到参数：\nempId--"+empId+"\ncollectSubId--"+collectSubId); + bgtsService.collectPacs(empId,admissDate,disDate,times); + logger.info("采集完成"); + afCollectTaskService.updateInterfaceCollect(collectSubId, 1); + logger.info("------------采集结束-----------"); + } catch (RuntimeException e) { + e.printStackTrace(); + try { + afCollectTaskService.updateInterfaceCollect(collectSubId, 0); + }catch (Exception e1) { + logger.info(e1.getMessage()); + return CommonResult.failed(e1.getMessage()); + } + return CommonResult.failed(e.getMessage()); + } + catch (Exception e) { + e.printStackTrace(); + } + return CommonResult.success("ok"); + } -// /** -// * 按需采集 -// */ -// @GetMapping("/collectByEx") -// public CommonResult collectByEx(@RequestParam("empId") String empId){ -// try{ -// bgtsService.collect(empId); -// }catch (Exception e){ -// e.printStackTrace(); -// return CommonResult.failed(e.getMessage()); -// } -// return CommonResult.success("ok"); -// } -// /** -// * pacs按需采集 -// */ -// @ApiOperation("pacs按需采集接口") -// @GetMapping("/collectByPacs") -// public CommonResult collectByPacs(){ -// try{ -// bgtsService.collectPacss(); -// }catch (Exception e){ -// e.printStackTrace(); -// return CommonResult.failed(e.getMessage()); -// } -// return CommonResult.success("ok"); -// } + @ApiOperation("动态心电采集接口") + @ApiImplicitParams({ + @ApiImplicitParam(name = "empId",value = "患者主索引号",required = true,dataTypeClass = String.class), + @ApiImplicitParam(name = "collectSubId",value = "af_interface_collect_sub表id",required = true), + @ApiImplicitParam(name = "admissDate",value = "入院时间",required = true), + @ApiImplicitParam(name = "disDate",value = "出院时间",required = true), + @ApiImplicitParam(name = "times",value = "住院次数",required = true) + }) + @GetMapping("/collectEcg") + public CommonResult collectEcg(@RequestParam("collectSubId") String collectSubId, + @RequestParam("empId") String empId, + @RequestParam("admissDate") String admissDate, + @RequestParam("disDate") String disDate, + @RequestParam("times") String times){ + try { + logger.info("采集接口接收到参数：\nempId--"+empId+"\ncollectSubId--"+collectSubId); + bgtsService.collectEcg(empId,admissDate,disDate,times); + logger.info("采集完成"); + afCollectTaskService.updateInterfaceCollect(collectSubId, 1); + logger.info("------------采集结束-----------"); + } catch (RuntimeException e) { + e.printStackTrace(); + try { + afCollectTaskService.updateInterfaceCollect(collectSubId, 0); + }catch (Exception e1) { + logger.info(e1.getMessage()); + return CommonResult.failed(e1.getMessage()); + } + return CommonResult.failed(e.getMessage()); + } + catch (Exception e) { + e.printStackTrace(); + } + return CommonResult.success("ok"); + } + + /** + * 按需采集 + * @param emamNo + * @return + */ + @ApiOperation("按需采集接口") + @ApiImplicitParams({ + @ApiImplicitParam(name = "emamNo",value = "报告单号",required = true,dataTypeClass = String.class), + @ApiImplicitParam(name = "empId",value = "患者主索引号",required = true,dataTypeClass = String.class) + }) + @GetMapping("/collectByExamNo") + public CommonResult collectByExamNo(@RequestParam("emamNo") String emamNo, + @RequestParam("empId") String empId){ + try { + logger.info("按需采集接口接受参数：\nempId--"+empId+"\nemamNo--"+emamNo); + bgtsService.collectByExamNo(emamNo,empId); +// afCollectTaskService.updateInterfaceCollect(collectSubId, 1); + }catch (RuntimeException e) { + e.printStackTrace(); + return CommonResult.failed(e.getMessage()); + } + catch (Exception e) { + e.printStackTrace(); + } + return CommonResult.success("ok"); + } + + /** + * 按需采集 + */ + @GetMapping("/collectByEx") + public CommonResult collectByEx(@RequestParam("empId") String empId){ + try{ + bgtsService.collect(empId); + }catch (Exception e){ + e.printStackTrace(); + return CommonResult.failed(e.getMessage()); + } + return CommonResult.success("ok"); + } + + /** + * pacs按需采集 + */ + @ApiOperation("pacs按需采集接口") + @GetMapping("/collectByPacs") + public CommonResult collectByPacs(){ + try{ + bgtsService.collectPacss(); + }catch (Exception e){ + e.printStackTrace(); + return CommonResult.failed(e.getMessage()); + } + return CommonResult.success("ok"); + } @ApiOperation("手麻根据出院时间区间补偿采集接口") @ApiImplicitParams({ @ApiImplicitParam(name = "startDate",value = "开始时间",required = true), @ApiImplicitParam(name = "endDate",value = "结束时间",required = true) }) - @GetMapping("/collectPacsCompensate") + @GetMapping("/collectSmCompensate") public CommonResult collectSm( @RequestParam("startDate") String startDate, @RequestParam("endDate") String endDate){ @@ -243,68 +240,68 @@ public class BgtsController { } return CommonResult.success("ok"); } -// -// @ApiOperation("Pacs补偿采集接口") -// @ApiImplicitParams({ -// @ApiImplicitParam(name = "empId",value = "住院号",required = true,dataTypeClass = String.class), -// @ApiImplicitParam(name = "admissDate",value = "入院时间",required = true), -// @ApiImplicitParam(name = "disDate",value = "出院时间",required = true), -// @ApiImplicitParam(name = "times",value = "住院次数",required = true) -// }) -// @GetMapping("/collectPacsCompensate") -// public CommonResult collectPacs( -// @RequestParam("empId") String empId, -// @RequestParam("admissDate") String admissDate, -// @RequestParam("disDate") String disDate, -// @RequestParam("times") String times){ -// try { -// logger.info("采集接口接收到参数：\nempId--"+empId); -// bgtsService.collectPacs(empId,admissDate,disDate,times); -// logger.info("采集完成"); -// logger.info("------------采集结束-----------"); -// } catch (RuntimeException e) { -// e.printStackTrace(); -// try { -// }catch (Exception e1) { -// logger.info(e1.getMessage()); -// return CommonResult.failed(e1.getMessage()); -// } -// return CommonResult.failed(e.getMessage()); -// } -// catch (Exception e) { -// e.printStackTrace(); -// } -// return CommonResult.success("ok"); -// } -// -// @ApiOperation("Pacs根据出院时间区间补偿采集接口") -// @ApiImplicitParams({ -// @ApiImplicitParam(name = "startDate",value = "开始时间",required = true), -// @ApiImplicitParam(name = "endDate",value = "结束时间",required = true) -// }) -// @GetMapping("/collectPacsByDate") -// public CommonResult collectPacsByDate( -// @RequestParam("startDate") String startDate, -// @RequestParam("endDate") String endDate){ -// try { -// logger.info("根据出院时间区间补偿采集接口收到参数：\n"+startDate+"\t"+endDate); -// bgtsService.collectPacsByDate(startDate,endDate); -// logger.info("采集完成"); -// logger.info("------------采集结束-----------"); -// } catch (RuntimeException e) { -// e.printStackTrace(); -// try { -// }catch (Exception e1) { -// logger.info(e1.getMessage()); -// return CommonResult.failed(e1.getMessage()); -// } -// return CommonResult.failed(e.getMessage()); -// } -// catch (Exception e) { -// e.printStackTrace(); -// } -// return CommonResult.success("ok"); -// } + + @ApiOperation("Pacs补偿采集接口") + @ApiImplicitParams({ + @ApiImplicitParam(name = "empId",value = "住院号",required = true,dataTypeClass = String.class), + @ApiImplicitParam(name = "admissDate",value = "入院时间",required = true), + @ApiImplicitParam(name = "disDate",value = "出院时间",required = true), + @ApiImplicitParam(name = "times",value = "住院次数",required = true) + }) + @GetMapping("/collectPacsCompensate") + public CommonResult collectPacs( + @RequestParam("empId") String empId, + @RequestParam("admissDate") String admissDate, + @RequestParam("disDate") String disDate, + @RequestParam("times") String times){ + try { + logger.info("采集接口接收到参数：\nempId--"+empId); + bgtsService.collectPacs(empId,admissDate,disDate,times); + logger.info("采集完成"); + logger.info("------------采集结束-----------"); + } catch (RuntimeException e) { + e.printStackTrace(); + try { + }catch (Exception e1) { + logger.info(e1.getMessage()); + return CommonResult.failed(e1.getMessage()); + } + return CommonResult.failed(e.getMessage()); + } + catch (Exception e) { + e.printStackTrace(); + } + return CommonResult.success("ok"); + } + + @ApiOperation("Pacs根据出院时间区间补偿采集接口") + @ApiImplicitParams({ + @ApiImplicitParam(name = "startDate",value = "开始时间",required = true), + @ApiImplicitParam(name = "endDate",value = "结束时间",required = true) + }) + @GetMapping("/collectPacsByDate") + public CommonResult collectPacsByDate( + @RequestParam("startDate") String startDate, + @RequestParam("endDate") String endDate){ + try { + logger.info("根据出院时间区间补偿采集接口收到参数：\n"+startDate+"\t"+endDate); + bgtsService.collectPacsByDate(startDate,endDate); + logger.info("采集完成"); + logger.info("------------采集结束-----------"); + } catch (RuntimeException e) { + e.printStackTrace(); + try { + }catch (Exception e1) { + logger.info(e1.getMessage()); + return CommonResult.failed(e1.getMessage()); + } + return CommonResult.failed(e.getMessage()); + } + catch (Exception e) { + e.printStackTrace(); + } + return CommonResult.success("ok"); + }