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-09-05 20:21:10 +08:00
parent baf49b9843
commit dcdc2f0023
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lis-interfaceCommon/src/main/java/com/czlis/interfaceCommon/utils/CheckResultUtils.java
View File

@ -283,7 +283,7 @@ public class CheckResultUtils {
break; break;
default: default:
String csjg = Optional.ofNullable(labResultList).flatMap(list -> list.stream().filter(result -> result != null && itemcode.equals(result.getXmdh())).map(LabResult::getCsjg).findFirst()).orElse(null); 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); errmsg.replace("[" + itemcode + "]", csjg);
} }
@ -333,7 +333,7 @@ public class CheckResultUtils {
break; break;
default: default:
String csjg = Optional.ofNullable(labResultList).flatMap(list -> list.stream().filter(result -> result != null && itemcode.equals(result.getXmdh())).map(LabResult::getCsjg).findFirst()).orElse(null); 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); variables.put(itemcode, csjg);
} }

4
liswork/src/main/java/com/czlis/liswork/service/impl/LisWorkOperServiceImpl.java
View File

@ -810,7 +810,7 @@ public class LisWorkOperServiceImpl implements LisWorkOperService {
Integer xsws =labResult.getXsws(); Integer xsws =labResult.getXsws();
if (xsws >= 0) result = LisUtil.round(result, xsws); 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())) { if(!result.equals(labResult.getCsjg())) {
labResult.setCsjg(result); labResult.setCsjg(result);
String finalResult = result; String finalResult = result;
@ -835,6 +835,7 @@ public class LisWorkOperServiceImpl implements LisWorkOperService {
labResult.setYgzq(xmInfo.getYgzq()); labResult.setYgzq(xmInfo.getYgzq());
labResult.setXmmc(xmInfo.getXmmc()); labResult.setXmmc(xmInfo.getXmmc());
labResultList.set(labResultList.size(), labResult); labResultList.set(labResultList.size(), labResult);
} }
} }
} }
@ -907,6 +908,7 @@ public class LisWorkOperServiceImpl implements LisWorkOperService {
log.info("调用存储过程{}返回值：{},{}", "sp_setrefs", retCode, retMsg); log.info("调用存储过程{}返回值：{},{}", "sp_setrefs", retCode, retMsg);
if (retCode == null || "".equals(retCode) || "-1".equals(retCode)) lb_setbj = false; if (retCode == null || "".equals(retCode) || "-1".equals(retCode)) lb_setbj = false;
labResultList = commonUtil.getLabResultList(jyrq, yq, ybh); labResultList = commonUtil.getLabResultList(jyrq, yq, ybh);
log.info("labResultList.size:{}",labResultList.size());
List<XmInfo> xmInfoList= commonUtil.getXmInfoList(yq); List<XmInfo> xmInfoList= commonUtil.getXmInfoList(yq);
List<XmAlarmdetail> xmAlarmdetailList=null; List<XmAlarmdetail> xmAlarmdetailList=null;
if(!nowjz){xmAlarmdetailList =commonUtil.getXmAlarmdetailList(yq);} if(!nowjz){xmAlarmdetailList =commonUtil.getXmAlarmdetailList(yq);}