diff --git a/src/main/java/com/docus/server/report/controller/ApiTestController.java b/src/main/java/com/docus/server/report/controller/ApiTestController.java new file mode 100644 index 0000000..8fde78a --- /dev/null +++ b/src/main/java/com/docus/server/report/controller/ApiTestController.java @@ -0,0 +1,46 @@ +package com.docus.server.report.controller; + +import com.docus.infrastructure.web.api.CommonResult; +import com.docus.server.report.api.ShunDePeopleService; +import com.docus.server.report.api.TaskDistributeService; +import com.docus.server.report.api.dto.SdNurseInsertSugarRequest; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import lombok.extern.slf4j.Slf4j; +import org.apache.ibatis.annotations.Param; +import org.springframework.web.bind.annotation.*; + +import javax.annotation.Resource; + +@Slf4j +@Api(tags = "API 测试接口") +@RestController +@RequestMapping("/api/test") +public class ApiTestController { + @Resource + private TaskDistributeService taskDistributeService; + @Resource + private ShunDePeopleService shunDePeopleService; + + @ApiOperation(value = "获取pacs Pdf") + @GetMapping("/pacsBase64Test") + public CommonResult pacsBase64Test(@Param("examNo") String examNo, @Param("reportNo") String reportNo) { + return CommonResult.success(shunDePeopleService.getBase64PdfFromPacs(examNo, reportNo)); + } + + @ApiOperation(value = "移动护理报告接口测试") + @GetMapping("/nurseInsertSugarTest") + public CommonResult nurseInsertSugarTest(@Param("inpatientNo") String inpatientNo, @Param("admissTimes") String admissTimes) { + final String traceCode = "nurse_print_doc"; + SdNurseInsertSugarRequest sdNurseInsertSugarRequest = new SdNurseInsertSugarRequest(inpatientNo, admissTimes, traceCode); + return CommonResult.success(shunDePeopleService.getNurseInsertSugarReport(sdNurseInsertSugarRequest)); + } + + @ApiOperation(value = "获取任务测试") + @PostMapping("/getTaskTest") + public CommonResult getTaskTest(@RequestParam("collectorId") String collectorId) { + return CommonResult.success(taskDistributeService.getNoviewTaskByCollectorId(collectorId)); + } + + +} diff --git a/src/main/java/com/docus/server/report/controller/ReportDownController.java b/src/main/java/com/docus/server/report/controller/ReportDownController.java index ad981a2..d1e9e36 100644 --- a/src/main/java/com/docus/server/report/controller/ReportDownController.java +++ b/src/main/java/com/docus/server/report/controller/ReportDownController.java @@ -3,16 +3,11 @@ package com.docus.server.report.controller; import com.alibaba.fastjson.JSONObject; import com.docus.core.util.Func; import com.docus.infrastructure.web.api.CommonResult; -import com.docus.server.collection.mapper.TBasicMapper; -import com.docus.server.report.api.ShunDePeopleService; -import com.docus.server.report.api.TaskDistributeService; -import com.docus.server.report.api.dto.SdNurseInsertSugarRequest; import com.docus.server.report.job.ReportJob; import com.docus.server.report.service.ReportService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.extern.slf4j.Slf4j; -import org.apache.ibatis.annotations.Param; import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; @@ -31,33 +26,7 @@ public class ReportDownController { @Resource private ReportService reportService; @Resource - private TBasicMapper tBasicMapper; - @Resource ReportJob reportJob; - @Resource - private TaskDistributeService taskDistributeService; - @Resource - private ShunDePeopleService shunDePeopleService; - - @ApiOperation(value = "获取pacs Pdf") - @GetMapping("/pacsBase64Test") - public CommonResult pacsBase64Test(@Param("examNo") String examNo, @Param("reportNo") String reportNo) { - return CommonResult.success(shunDePeopleService.getBase64PdfFromPacs(examNo, reportNo)); - } - - @ApiOperation(value = "移动护理报告接口测试") - @GetMapping("/nurseInsertSugarTest") - public CommonResult nurseInsertSugarTest(@Param("inpatientNo") String inpatientNo, @Param("admissTimes") String admissTimes) { - final String traceCode = "nurse_print_doc"; - SdNurseInsertSugarRequest sdNurseInsertSugarRequest = new SdNurseInsertSugarRequest(inpatientNo, admissTimes, traceCode); - return CommonResult.success(shunDePeopleService.getNurseInsertSugarReport(sdNurseInsertSugarRequest)); - } - - @ApiOperation(value = "获取任务测试") - @PostMapping("/getTaskTest") - public CommonResult getTaskTest(@RequestParam("collectorId") String collectorId) { - return CommonResult.success(taskDistributeService.getNoviewTaskByCollectorId(collectorId)); - } @ApiOperation(value = " lis 检验 采集 job 测试") @GetMapping("/sdRyLisCollectJob")