diff --git a/lis-interfaceCommon/src/main/java/com/czlis/interfaceCommon/utils/CheckResultUtils.java b/lis-interfaceCommon/src/main/java/com/czlis/interfaceCommon/utils/CheckResultUtils.java index 18e13ef..9ef12a3 100644 --- a/lis-interfaceCommon/src/main/java/com/czlis/interfaceCommon/utils/CheckResultUtils.java +++ b/lis-interfaceCommon/src/main/java/com/czlis/interfaceCommon/utils/CheckResultUtils.java @@ -283,7 +283,7 @@ public class CheckResultUtils { break; default: String csjg = Optional.ofNullable(labResultList).flatMap(list -> list.stream().filter(result -> result != null && itemcode.equals(result.getXmdh())).map(LabResult::getCsjg).findFirst()).orElse(null); - if (csjg == null) csjg = ""; + if (csjg == null) return ""; errmsg.replace("[" + itemcode + "]", csjg); } @@ -333,7 +333,7 @@ public class CheckResultUtils { break; default: String csjg = Optional.ofNullable(labResultList).flatMap(list -> list.stream().filter(result -> result != null && itemcode.equals(result.getXmdh())).map(LabResult::getCsjg).findFirst()).orElse(null); - if (csjg == null) csjg = ""; + if (csjg == null)return ""; variables.put(itemcode, csjg); } diff --git a/liswork/src/main/java/com/czlis/liswork/service/impl/LisWorkOperServiceImpl.java b/liswork/src/main/java/com/czlis/liswork/service/impl/LisWorkOperServiceImpl.java index ca9d826..140ddc8 100644 --- a/liswork/src/main/java/com/czlis/liswork/service/impl/LisWorkOperServiceImpl.java +++ b/liswork/src/main/java/com/czlis/liswork/service/impl/LisWorkOperServiceImpl.java @@ -810,7 +810,7 @@ public class LisWorkOperServiceImpl implements LisWorkOperService { Integer xsws =labResult.getXsws(); if (xsws >= 0) result = LisUtil.round(result, xsws); } - // log.info("result:{},getCsjg:{}",result,labResult.getCsjg()); + // log.info("result:{},getCsjg:{}",result,labResult.getCsjg()); if(!result.equals(labResult.getCsjg())) { labResult.setCsjg(result); String finalResult = result; @@ -835,6 +835,7 @@ public class LisWorkOperServiceImpl implements LisWorkOperService { labResult.setYgzq(xmInfo.getYgzq()); labResult.setXmmc(xmInfo.getXmmc()); labResultList.set(labResultList.size(), labResult); + } } } @@ -907,6 +908,7 @@ public class LisWorkOperServiceImpl implements LisWorkOperService { log.info("调用存储过程{}返回值:{},{}", "sp_setrefs", retCode, retMsg); if (retCode == null || "".equals(retCode) || "-1".equals(retCode)) lb_setbj = false; labResultList = commonUtil.getLabResultList(jyrq, yq, ybh); + log.info("labResultList.size:{}",labResultList.size()); List xmInfoList= commonUtil.getXmInfoList(yq); List xmAlarmdetailList=null; if(!nowjz){xmAlarmdetailList =commonUtil.getXmAlarmdetailList(yq);}