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 0fb8d47..1daadab 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 @@ -44,10 +44,16 @@ public class LisWorkController extends BaseController { return lisWorkService.getInstrdList(); } - @ApiOperation("仪器组可操作仪器查询") + @ApiOperation(value = "仪器组可操作仪器查询", + notes="powerbit为操作场景\n1:报告查询\n"+"2:报告录入\n"+ + "3:统计\n"+"6:检验项目维护\n"+"7:系统,报告单设定优化\n"+ + "8:质控录入,查询\n"+"9:系统日志,修改记录查询\n"+"20:抽查报告") @GetMapping("/getGroupInstrdList") - public Result getGroupInstrdList(String lisgroup) { - return lisWorkService.getGroupInstrdList(lisgroup); + public Result getGroupInstrdList( + @RequestParam(value = "lisgroup", required = false,defaultValue = "ALL") String lisgroup, + @RequestParam(value = "powerbit", required = false,defaultValue = "2") String powerbit + ) { + return lisWorkService.getGroupInstrdList(lisgroup,powerbit); } @ApiOperation("切换仪器，查询仪器参数") 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 29b7bf6..9a8d1ad 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 @@ -32,6 +32,11 @@ public class LisWorkGermController extends BaseController { LisWorkGermMapper lisWorkGermMapper; @Autowired LisWorkGermService lisWorkGermService; + @ApiOperation("获取微生物样本信息") + @GetMapping("/germsampleinfo") + public Result germsampleinfo(Date jyrq, String yq, String ybh) { + return lisWorkGermService.germsampleinfo(jyrq, yq, ybh); + } @ApiOperation("获取药敏字典") @GetMapping("/getmeddict") public Result getmeddict() { diff --git a/liswork/src/main/java/com/czlis/liswork/mapper/LisWorkGermMapper.java b/liswork/src/main/java/com/czlis/liswork/mapper/LisWorkGermMapper.java index 8017625..e8c5f5a 100644 --- a/liswork/src/main/java/com/czlis/liswork/mapper/LisWorkGermMapper.java +++ b/liswork/src/main/java/com/czlis/liswork/mapper/LisWorkGermMapper.java @@ -31,4 +31,5 @@ public interface LisWorkGermMapper { int changeresultjyrq(@Param("jyrq") Date jyrq, @Param("yq") String yq, @Param("ybh")String ybh, @Param("jyrq1")Date jyrq1); int changepatjyrq(@Param("jyrq") Date jyrq, @Param("yq") String yq, @Param("ybh")String ybh, @Param("jyrq1")Date jyrq1); List getGermTextDict(); + LabPat getLabPat(@Param("yq")String yq,@Param("ybh") String ybh); } diff --git a/liswork/src/main/java/com/czlis/liswork/pojo/HistoryResult.java b/liswork/src/main/java/com/czlis/liswork/pojo/HistoryResult.java index cbb6c33..3dd64cb 100644 --- a/liswork/src/main/java/com/czlis/liswork/pojo/HistoryResult.java +++ b/liswork/src/main/java/com/czlis/liswork/pojo/HistoryResult.java @@ -26,6 +26,7 @@ public class HistoryResult { private String cksx; private String ckxx; private String yqmc; + private String yblx; } diff --git a/liswork/src/main/java/com/czlis/liswork/service/LisWorkGermService.java b/liswork/src/main/java/com/czlis/liswork/service/LisWorkGermService.java index 7080d99..84657d8 100644 --- a/liswork/src/main/java/com/czlis/liswork/service/LisWorkGermService.java +++ b/liswork/src/main/java/com/czlis/liswork/service/LisWorkGermService.java @@ -29,4 +29,5 @@ public interface LisWorkGermService { Result newresult(LabResult labResult); Result saveallresult(List labResult); Result check(Date jyrq, String yq, String ybh, String hdys,String type); + Result germsampleinfo(Date jyrq, String yq, String ybh); } diff --git a/liswork/src/main/java/com/czlis/liswork/service/LisWorkService.java b/liswork/src/main/java/com/czlis/liswork/service/LisWorkService.java index ac47c27..a2e247f 100644 --- a/liswork/src/main/java/com/czlis/liswork/service/LisWorkService.java +++ b/liswork/src/main/java/com/czlis/liswork/service/LisWorkService.java @@ -11,7 +11,7 @@ import java.util.List; public interface LisWorkService { Result getInstrdList(); - Result getGroupInstrdList(String groupId); + Result getGroupInstrdList(String groupId,String powerbit); Result getInstrdConfig(String yq); List getSampleList(Date jyrq, String yq, Long days); Result getresultinfo(Date jyrq, String yq, String ybh); diff --git a/liswork/src/main/java/com/czlis/liswork/service/impl/LisWorkGermServiceImpl.java b/liswork/src/main/java/com/czlis/liswork/service/impl/LisWorkGermServiceImpl.java index e299ed3..9dc24dd 100644 --- a/liswork/src/main/java/com/czlis/liswork/service/impl/LisWorkGermServiceImpl.java +++ b/liswork/src/main/java/com/czlis/liswork/service/impl/LisWorkGermServiceImpl.java @@ -39,6 +39,10 @@ public class LisWorkGermServiceImpl implements LisWorkGermService { @Autowired LisWorkGermMapper lisWorkGermMapper; @Override + public Result germsampleinfo(Date jyrq, String yq, String ybh){ + return new Result("0", "成功！", lisWorkGermMapper.getLabPat(yq,ybh)); + } + @Override public Result getresultinfo(Date jyrq, String yq, String ybh){ List labResultList = commonUtil.getLabResultList(jyrq, yq, ybh); return new Result("0", "成功！", labResultList); diff --git a/liswork/src/main/java/com/czlis/liswork/service/impl/LisWorkPageInfoServiceImpl.java b/liswork/src/main/java/com/czlis/liswork/service/impl/LisWorkPageInfoServiceImpl.java index 8fe0433..0df0c26 100644 --- a/liswork/src/main/java/com/czlis/liswork/service/impl/LisWorkPageInfoServiceImpl.java +++ b/liswork/src/main/java/com/czlis/liswork/service/impl/LisWorkPageInfoServiceImpl.java @@ -126,10 +126,15 @@ public class LisWorkPageInfoServiceImpl implements LisWorkPageInfoService { if(map == null || map.size() <= 0){ return new Result("-1","查询条件转换错误！"); } - Result historyResult = getHistoryResult(jyrq, yq, ybh, map); - if ("0".equals(historyResult.getCode())) { - return new Result("0", "获取成功！", historyResult.getData()); - } + if("细菌仪".equals( commonUtil.getYqdl(yq))){ + return getHistoryResultGerm(jyrq, yq, ybh, map); + }else{ + Result historyResult = getHistoryResult(jyrq, yq, ybh, map); + if ("0".equals(historyResult.getCode())) { + return new Result("0", "获取成功！", historyResult.getData()); + } + } + return new Result("-1", "无历史数据！"); } @@ -178,8 +183,12 @@ public class LisWorkPageInfoServiceImpl implements LisWorkPageInfoService { return new Result("-1", "缺少查询条件！"); } Map map = BeanUtil.beanToMap(lastLabPatParam); - Result historyResult = getHistoryResult(jyrq, yq, ybh, map); - return new Result("0", "获取成功！", historyResult.getData()); + if("细菌仪".equals( commonUtil.getYqdl(yq))){ + return getHistoryResultGerm(jyrq, yq, ybh, map); + }else { + Result historyResult = getHistoryResult(jyrq, yq, ybh, map); + return new Result("0", "获取成功！", historyResult.getData()); + } } /** @@ -201,7 +210,6 @@ public class LisWorkPageInfoServiceImpl implements LisWorkPageInfoService { return new Result("0", "获取数据成功！", labInputmdlList); } - public Result getHistoryResult(Date jyrq, String yq, String ybh, Map map) { List hisResultList0 = lisWorkPageInfoMapper.getHisResult(map); if (hisResultList0.isEmpty()) { @@ -286,6 +294,21 @@ public class LisWorkPageInfoServiceImpl implements LisWorkPageInfoService { } return new Result("0", "获取成功！", historyResultDTO); } + public Result getHistoryResultGerm(Date jyrq, String yq, String ybh, Map map) { + List hisResultList0 = lisWorkPageInfoMapper.getHisResult(map); + if (hisResultList0.isEmpty()) { + return new Result("-1", "无历史数据！"); + } + List hisResultList1 = hisResultList0.stream().filter(st -> !"细菌仪".equals(st.getYbh())).collect(Collectors.toList()); + if (hisResultList1.isEmpty()) { + return new Result("-1", "无历史数据！", hisResultList1); + } + List hisResultList = hisResultList1.stream().filter(st -> !(jyrq.equals(st.getJyrq()) && yq.trim().equals(st.getYq().trim()) && ybh.equals(st.getYbh()))).collect(Collectors.toList()); + if (hisResultList.isEmpty()) { + return new Result("-1", "无历史数据！", hisResultList); + } + return new Result("0", "获取成功！", hisResultList); + } @Override public Result getclinicref(String yq, String xmdh) { diff --git a/liswork/src/main/java/com/czlis/liswork/service/impl/LisWorkServiceImpl.java b/liswork/src/main/java/com/czlis/liswork/service/impl/LisWorkServiceImpl.java index eba2c80..7d64fb4 100644 --- a/liswork/src/main/java/com/czlis/liswork/service/impl/LisWorkServiceImpl.java +++ b/liswork/src/main/java/com/czlis/liswork/service/impl/LisWorkServiceImpl.java @@ -86,7 +86,7 @@ public class LisWorkServiceImpl implements LisWorkService { } @Override - public Result getGroupInstrdList(String groupId) { + public Result getGroupInstrdList(String groupId,String powerbit) { if ("ALL".equals(groupId)) groupId = ""; String yhdh = SecurityUtils.getLoginUser().getUsername(); SysLoginParam loginConfigParam = loginConfigParamUtil.getLoginConfigParam(); @@ -96,7 +96,7 @@ public class LisWorkServiceImpl implements LisWorkService { if ("admin".equals(yhdh) || "lis".equals(yhdh)) { labInstr = commonUtil.querybylisgroup(groupId, yljg, "0"); } else { - labInstr = commonUtil.getInstrdList(groupId, yljg, "0", yhdh, "2"); + labInstr = commonUtil.getInstrdList(groupId, yljg, "0", yhdh, powerbit); } return new Result("0", "获取分组仪器列表成功！", labInstr); diff --git a/liswork/src/main/resources/mapper/LisWorkGermMapper.xml b/liswork/src/main/resources/mapper/LisWorkGermMapper.xml index af3abb0..e5de4b3 100644 --- a/liswork/src/main/resources/mapper/LisWorkGermMapper.xml +++ b/liswork/src/main/resources/mapper/LisWorkGermMapper.xml @@ -162,4 +162,7 @@ select * from xm_textresult where yq = '_text_' AND xmdh = 'text' order by xh + \ No newline at end of file diff --git a/liswork/src/main/resources/mapper/LisWorkPageInfoMapper.xml b/liswork/src/main/resources/mapper/LisWorkPageInfoMapper.xml index 2808bd0..70d0eb7 100644 --- a/liswork/src/main/resources/mapper/LisWorkPageInfoMapper.xml +++ b/liswork/src/main/resources/mapper/LisWorkPageInfoMapper.xml @@ -153,7 +153,7 @@