jiangs/lis8.0
2
0
Fork 0
Code Issues 29 Pull Requests Actions Packages Projects Releases Wiki Activity

微生物模块

Browse Source
This commit is contained in:
tangw 2025-11-25 16:15:17 +08:00
parent 886e4f8e2a
commit 5b95d78e1a
2 changed files with 29 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
liswork/src/main/java/com/czlis/liswork/service/impl/LisWorkGermServiceImpl.java
View File

@ -119,7 +119,7 @@ public class LisWorkGermServiceImpl implements LisWorkGermService {
} }
String yhdh = SecurityUtils.getLoginUser().getUsername(); String yhdh = SecurityUtils.getLoginUser().getUsername();
List<BactMediumgroupdet> mediumnolist = getmediumgroup(mediumno); List<BactMediumgroupdet> mediumnolist = getmediumgroup(mediumno);
if (!mediumnolist.isEmpty()) { if (!mediumnolist.isEmpty()&&mediumnolist.size()>0) {
for (BactMediumgroupdet mediumgroupdet : mediumnolist) { for (BactMediumgroupdet mediumgroupdet : mediumnolist) {
LabGermsheetNew labGermsheet = new LabGermsheetNew(); LabGermsheetNew labGermsheet = new LabGermsheetNew();
labGermsheet.setYq(yq); labGermsheet.setYq(yq);

30
liswork/src/main/java/com/czlis/liswork/service/impl/LisWorkServiceImpl.java
View File

@ -104,7 +104,28 @@ public class LisWorkServiceImpl implements LisWorkService {
@Override @Override
public Result getInstrdConfig(String yq) { 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); List<LabInputcol> labInputcolList = commonUtil.getLabInputcol(yq);
for (LabInputcol labInputcol : labInputcolList) { for (LabInputcol labInputcol : labInputcolList) {
String zdmc = labInputcol.getZdmc(); String zdmc = labInputcol.getZdmc();
@ -177,9 +198,14 @@ public class LisWorkServiceImpl implements LisWorkService {
Map<String, Object> instrdConfig = new HashMap<>(); Map<String, Object> instrdConfig = new HashMap<>();
instrdConfig.put("ResultConfig", getInstrdResultConfig(yq)); instrdConfig.put("ResultConfig", getInstrdResultConfig(yq));
instrdConfig.put("labInputcolList", labInputcolList); instrdConfig.put("labInputcolList", labInputcolList);
instrdConfig.put("instrdComOpt", instrdComOpt);
return new Result("0", "获取仪器参数成功！", instrdConfig); 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) { private List<LabInputcol> getInstrdResultConfig(String yq) {
String showod = commonUtil.getComOptValue(yq, "SHOWOD"); String showod = commonUtil.getComOptValue(yq, "SHOWOD");
if (showod == null || showod.isEmpty()) showod = "0"; if (showod == null || showod.isEmpty()) showod = "0";