diff --git a/liswork/src/main/java/com/czlis/liswork/controller/work/LisWorkController.java b/liswork/src/main/java/com/czlis/liswork/controller/work/LisWorkController.java index f6e362d..0fb8d47 100644 --- a/liswork/src/main/java/com/czlis/liswork/controller/work/LisWorkController.java +++ b/liswork/src/main/java/com/czlis/liswork/controller/work/LisWorkController.java @@ -62,7 +62,7 @@ public class LisWorkController extends BaseController { return new Result("0", "获取样本数据成功!", lisWorkService.getSampleList(jyrq, yq, days)); } - @ApiOperation("获取样本列表") + @ApiOperation("获取样本列表分页") @GetMapping("/samplelistpage") public TableDataInfo samplelistpage(Date jyrq, String yq, Long days) { try { diff --git a/liswork/src/main/java/com/czlis/liswork/controller/work/LisWorkGermController.java b/liswork/src/main/java/com/czlis/liswork/controller/work/LisWorkGermController.java index 3ac9c47..0e57b21 100644 --- a/liswork/src/main/java/com/czlis/liswork/controller/work/LisWorkGermController.java +++ b/liswork/src/main/java/com/czlis/liswork/controller/work/LisWorkGermController.java @@ -71,5 +71,23 @@ public class LisWorkGermController extends BaseController { public Result getmedgroup(String mbmc){ return lisWorkGermService.getmedgroup(mbmc); } + @ApiOperation("获取微生物样本列表") + @GetMapping("/wswsamplelist") + public Result wswgetSampleList(Date jyrq, String yq, Integer days) { + return new Result("0", "获取样本数据成功!", lisWorkGermService.getSampleList(jyrq, yq, days)); + } + + @ApiOperation("获取微生物样本列表分页") + @GetMapping("/wswsamplelistpage") + public TableDataInfo wswsamplelistpage(Date jyrq, String yq, Integer days) { + try { + startPage(); + startOrderBy(); + List labPatList = lisWorkGermService.getSampleList(jyrq, yq, days); + return getDataTable(labPatList); + } finally { + clearPage(); + } + } }