微生物模块

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) {
+    public Result getGroupInstrdList(
-        return lisWorkService.getGroupInstrdList(lisgroup);
+            @RequestParam(value = "lisgroup", required = false,defaultValue = "ALL") String lisgroup,
+            @RequestParam(value = "powerbit", required = false,defaultValue = "2") String powerbit
+            ) {
+        return lisWorkService.getGroupInstrdList(lisgroup,powerbit);
     }
 
     @ApiOperation("切换仪器，查询仪器参数")

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() {

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<XmTextResult> getGermTextDict();
+    LabPat getLabPat(@Param("yq")String yq,@Param("ybh") String ybh);
 }

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;
 
 
 }

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> labResult);
     Result check(Date jyrq, String yq, String ybh, String hdys,String type);
+    Result germsampleinfo(Date jyrq, String yq, String ybh);
 }

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<LabPat> getSampleList(Date jyrq, String yq, Long days);
     Result getresultinfo(Date jyrq, String yq, String ybh);

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<LabResult> labResultList = commonUtil.getLabResultList(jyrq, yq, ybh);
             return new Result("0", "成功！", labResultList);

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","查询条件转换错误！");
         }
+        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,9 +183,13 @@ public class LisWorkPageInfoServiceImpl implements LisWorkPageInfoService {
             return new Result("-1", "缺少查询条件！");
         }
         Map<String, Object> map = BeanUtil.beanToMap(lastLabPatParam);
+        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<String, Object> map) {
         List<HistoryResult> 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<String, Object> map) {
+        List<HistoryResult> hisResultList0 = lisWorkPageInfoMapper.getHisResult(map);
+        if (hisResultList0.isEmpty()) {
+            return new Result("-1", "无历史数据！");
+        }
+        List<HistoryResult> hisResultList1 = hisResultList0.stream().filter(st -> !"细菌仪".equals(st.getYbh())).collect(Collectors.toList());
+        if (hisResultList1.isEmpty()) {
+            return new Result("-1", "无历史数据！", hisResultList1);
+        }
+        List<HistoryResult> 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) {

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);
 

liswork/src/main/resources/mapper/LisWorkGermMapper.xml

@@ -162,4 +162,7 @@
         select * from  xm_textresult where yq = '_text_' AND xmdh = 'text'
         order by  xh
     </select>
+    <select id="getLabPat" resultType="com.czlis.common.core.domain.entity.lis.LabPat">
+        select top 1 * from lab_pat where yq = #{yq} and ybh = #{ybh}
+    </select>
 </mapper>

liswork/src/main/resources/mapper/LisWorkPageInfoMapper.xml

@@ -153,7 +153,7 @@
     </select>
 
     <select id="getHisResult" resultType="com.czlis.liswork.pojo.HistoryResult">
-        select b.jyrq,c.xmdh, c.xmmc,b.csjg,b.ybh,b.yq,d.yqdl,d.yqmc,a.brdh,
+        select b.jyrq,c.xmdh, c.xmmc,b.csjg,b.ybh,b.yq,d.yqdl,d.yqmc,a.brdh,a.yblx,
                (case a.brxb when '1' then '男' when '2' then '女' end) as brxb ,
                c.cksx,c.ckxx,
         convert(varchar(100),a.nl)+(case a.nldw when '1' then '岁' when '2' then '月' when '3' then '天' end) as nl,