From 5b95d78e1a4049a1df3d9eb721b43e2685fd9af3 Mon Sep 17 00:00:00 2001
From: tangw <czlis@tangw>
Date: Tue, 25 Nov 2025 16:15:17 +0800
Subject: [PATCH] =?UTF-8?q?=E5=BE=AE=E7=94=9F=E7=89=A9=E6=A8=A1=E5=9D=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/LisWorkGermServiceImpl.java  |  2 +-
 .../service/impl/LisWorkServiceImpl.java      | 30 +++++++++++++++++--
 2 files changed, 29 insertions(+), 3 deletions(-)

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 d5ca48f..981b1bc 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
@@ -119,7 +119,7 @@ public class LisWorkGermServiceImpl implements LisWorkGermService {
             }
             String yhdh = SecurityUtils.getLoginUser().getUsername();
             List<BactMediumgroupdet> mediumnolist = getmediumgroup(mediumno);
-            if (!mediumnolist.isEmpty()) {
+            if (!mediumnolist.isEmpty()&&mediumnolist.size()>0) {
                 for (BactMediumgroupdet mediumgroupdet : mediumnolist) {
                     LabGermsheetNew labGermsheet = new LabGermsheetNew();
                     labGermsheet.setYq(yq);
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 3d1c3bd..e9b4d51 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
@@ -104,7 +104,28 @@ public class LisWorkServiceImpl implements LisWorkService {
 
     @Override
     public Result getInstrdConfig(String yq) {
-        // List<ComOpt> comOptlist = lisWorkMapper.getInstrdConfig(yq);
+        Map<String, Object> instrdComOpt = new HashMap<>();
+        LabInstr labInstr= commonUtil.getLabInstr(yq);
+        instrdComOpt.put("keepnodataitem",commonUtil.getComOptValue(yq, "keepnodataitem"));
+        if("细菌仪".equals(labInstr.getYqdl())) {
+            instrdComOpt.put("isxjy7day",commonUtil.getComOptValue(yq, "isxjy7day"));
+            String cbbgyq = commonUtil.getComOptValue(yq, "cbbgyq");
+            if(cbbgyq!=null&&!cbbgyq.isEmpty()){
+                instrdComOpt.put("yq1","CBBG"+cbbgyq);
+                instrdComOpt.put("yq2","EJBG"+cbbgyq);
+            }
+            instrdComOpt.put("cbaj",commonUtil.getComOptValue(yq, "cbaj"));
+            instrdComOpt.put("keepnodataitem","0");
+        }
+        instrdComOpt.put("showgraph",commonUtil.getComOptValue(yq, "showgraph"));
+        instrdComOpt.put("noticebeforeresultmo",commonUtil.getComOptValue(yq, "noticebeforeresultmo"));
+        instrdComOpt.put("sp_checkraw",commonUtil.getComOptValue(yq, "sp_checkraw"));
+        instrdComOpt.put("patinfomodify",commonUtil.getComOptValue(yq, "patinfomodify"));
+        instrdComOpt.put("automax",commonUtil.getComOptValue(yq, "automax"));
+        instrdComOpt.put("printautonext",commonUtil.getComOptValue(yq, "printautonext"));
+        instrdComOpt.put("chkautonext",commonUtil.getComOptValue(yq, "chkautonext"));
+        instrdComOpt.put("autobedno",commonUtil.getComOptValue(yq, "autobedno"));
+        instrdComOpt.put("defwsh",commonUtil.getHISOPT( "defwsh"));
         List<LabInputcol> labInputcolList = commonUtil.getLabInputcol(yq);
         for (LabInputcol labInputcol : labInputcolList) {
             String zdmc = labInputcol.getZdmc();
@@ -177,9 +198,14 @@ public class LisWorkServiceImpl implements LisWorkService {
         Map<String, Object> instrdConfig = new HashMap<>();
         instrdConfig.put("ResultConfig", getInstrdResultConfig(yq));
         instrdConfig.put("labInputcolList", labInputcolList);
+        instrdConfig.put("instrdComOpt", instrdComOpt);
         return new Result("0", "获取仪器参数成功！", instrdConfig);
     }
-
+    private String getopt(String yq, String xxdh){
+        String value= commonUtil.getComOptValue(yq,xxdh);
+        if(value==null||value.isEmpty()){value="";}
+        return value;
+    }
     private List<LabInputcol> getInstrdResultConfig(String yq) {
         String showod = commonUtil.getComOptValue(yq, "SHOWOD");
         if (showod == null || showod.isEmpty()) showod = "0";