diff --git a/lab-service-api/pom.xml b/lab-service-api/pom.xml index 6eb9c9e..8cd9886 100644 --- a/lab-service-api/pom.xml +++ b/lab-service-api/pom.xml @@ -18,7 +18,7 @@ lab-dict-api - + lab-scope-api lab-system-api lab-user-api lab-lims-api diff --git a/lab-service/lab-lims/src/main/java/org/springblade/lims/service/impl/EntrustServiceImpl.java b/lab-service/lab-lims/src/main/java/org/springblade/lims/service/impl/EntrustServiceImpl.java index c1b339a..62de43f 100644 --- a/lab-service/lab-lims/src/main/java/org/springblade/lims/service/impl/EntrustServiceImpl.java +++ b/lab-service/lab-lims/src/main/java/org/springblade/lims/service/impl/EntrustServiceImpl.java @@ -2377,16 +2377,29 @@ public class EntrustServiceImpl extends BaseServiceImpl || "2002014518899601409".equals(examineResult.getReagentId()) || "2002188351753383937".equals(examineResult.getReagentId()) || "2002188672294678529".equals(examineResult.getReagentId()) + || "2010597883512958981".equals(examineResult.getReagentId()) + || "2010597883512958983".equals(examineResult.getReagentId()) + || "2010597883512958984".equals(examineResult.getReagentId()) + || "2010597883512958985".equals(examineResult.getReagentId()) + || "2010597883512958986".equals(examineResult.getReagentId()) + || "2010597883512958987".equals(examineResult.getReagentId()) + || "2010597883512958988".equals(examineResult.getReagentId()) + || "2010597883512958989".equals(examineResult.getReagentId()) + || "2010597883512958990".equals(examineResult.getReagentId()) ) { result.put("18", "S/P"); - } else if ("1580815808211578882".equals(examineResult.getReagentId())) { + } else if ("1580815808211578882".equals(examineResult.getReagentId()) + ||"2010597883441655809".equals(examineResult.getReagentId())) { result.put("18", "PI"); } else if ("1570666183341043714".equals(examineResult.getReagentId()) || "1692066046158401537".equals(examineResult.getReagentId())) { result.put("18", "PB"); } else if ("1570283733628678145".equals(examineResult.getReagentId()) || "1533624738296389636".equals(examineResult.getReagentId()) - || "1691714318883975170".equals(examineResult.getReagentId())) { + || "1691714318883975170".equals(examineResult.getReagentId()) + || "2010597883441655810".equals(examineResult.getReagentId()) + || "2010597883512958982".equals(examineResult.getReagentId()) + ) { result.put("18", "阻断率"); } else if ("1665968083879366657".equals(examineResult.getReagentId()) || "1665964229817307138".equals(examineResult.getReagentId())) { @@ -2401,7 +2414,13 @@ public class EntrustServiceImpl extends BaseServiceImpl || "1692059030258020354".equals(examineResult.getReagentId()) || "1682203201220390913".equals(examineResult.getReagentId()) || "1692060337681297410".equals(examineResult.getReagentId()) - || "1570667398619656194".equals(examineResult.getReagentId())) { + || "1570667398619656194".equals(examineResult.getReagentId()) + || "2010597883441655811".equals(examineResult.getReagentId()) + || "2010597883512958977".equals(examineResult.getReagentId()) + || "2010597883512958978".equals(examineResult.getReagentId()) + || "2010597883512958979".equals(examineResult.getReagentId()) + || "2010597883512958980".equals(examineResult.getReagentId()) + ) { result.put("18", "S/N"); } else if ("1570297053211455490".equals(examineResult.getReagentId()) || "1631222146321997826".equals(examineResult.getReagentId())) { @@ -3254,6 +3273,31 @@ public class EntrustServiceImpl extends BaseServiceImpl map2.put("2", "阳性对照OD平均值"); map2.put("3", format1); } + // 2010597883441655809 非洲猪瘟病毒阻断ELISA抗体检测试剂盒--青岛立见生物科技有限公司 + // 2010597883441655810 非洲猪瘟病毒(ASFV)阻断ELISA抗体检测试剂盒--北京鑫康生物技术开发有限公司 + // 2010597883441655811 非洲猪瘟病毒抗体阻断ELISA检测试剂盒--测易生物 + // 2010597883512958977 猪伪狂犬病病毒gE蛋白阻断ELISA抗体检测试剂盒--科前生物 + // 2010597883512958978 猪伪狂犬病病毒gB蛋自阻断ELIA抗体检测试剂盒--科前生物 + // 2010597883512958979 猪伪狂犬病毒gPI竞争ELISA抗体检测试剂盒--禾旭生物 + // 2010597883512958980 猪伪狂犬病毒gB竞争ELISA抗体检测试剂盒--禾旭生物 + // 2010597883512958981 猪瘟病毒ELISA抗体检测试剂盒--深圳市绿诗源生物技术有限公司 + // 2010597883512958982 猪瘟病毒阻断ELISA抗体检测试剂盒--科前生物 --有相同的 + // 2010597883512958983 猪瘟病毒间接ELISA抗体检测试剂盒--禾旭生物 --有相同的 + // 2010597883512958984 猪繁殖与呼吸综合征病毒ELISA抗体检测试剂盒(维伯鑫)--维伯鑫 + // 2010597883512958985 猪繁殖与呼吸综合征病毒ELISA抗体检测试剂盒(绿诗源)--深圳市绿诗源生物技术有限公司 + // 2010597883512958986 猪繁殖与呼吸综合征病毒间接ELISA抗体检测试剂盒--禾旭生物 --有相同的 + // 2010597883512958987 猪繁殖与呼吸综合征病毒ELISA抗体检测试剂盒(测易)--测易生物 + // 2010597883512958988 猪口蹄疫病毒O型VP1间接ELISA抗体检测试剂盒--洛阳莱普生信息科技有限公司 + // 2010597883512958989 禽白血病病毒J亚群ELISA抗体检测试剂盒--哈尔滨国生生物科技股份有限公司 + // 2010597883512958990 禽白血病病毒AB亚群ELISA抗体检测试剂盒--哈尔滨国生生物科技股份有限公司 + else if ("2010597883441655809".equals(reagentId) + ||"2010597883441655810".equals(reagentId) + ) { + map1.put("2", "阴性对照OD平均值"); + map1.put("3", format); + map2.put("2", "阳性对照OD平均值"); + map2.put("3", format1); + } map1.put("5", "成立"); map2.put("5", "成立"); resultList3.add(map1);