From 36fb49a8ccbfbc4ee5032714b45a1c71718c866b Mon Sep 17 00:00:00 2001 From: litao Date: Tue, 27 Sep 2022 15:12:11 +0800 Subject: [PATCH] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E6=9C=80=E5=90=8E=E6=89=93?= =?UTF-8?q?=E5=8D=B0=E7=94=9F=E6=88=90=E6=8A=A5=E5=91=8A=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../lims/service/impl/EntrustServiceImpl.java | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) 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 8c1e593..250bc2d 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 @@ -417,7 +417,7 @@ public class EntrustServiceImpl extends BaseServiceImpl ExamineResult examineResult = getExamineResultByExamineId(examine.getId()); // 布鲁氏检测 - if ("2".equals(examineItem.getInputMode())) { + if ("2".equals(examineItem.getInputMode()) || "6".equals(examineItem.getInputMode())) { List list = JSON.parseArray(examineResult.getExamineDataArr(), ExamineTemplate2Excel.class); if (list != null && list.size() > 0) { for (int i1 = 0; i1 < list.size(); i1++) { @@ -1189,11 +1189,13 @@ public class EntrustServiceImpl extends BaseServiceImpl // String value = DictBizCache.getValue(DictBizEnum.SIMPLE_STATUS, examineResult.getSimpleStatus()); result.put("10", examineResult.getSimpleStatus()); result.put("11", "温度" + examineResult.getTemperature() + "℃; " + "湿度" + examineResult.getHumidity() + "%RH"); -// result.put("12", examineWay.getOperation()); + // 操作程序内容 result.put("12", examineResult.getOperateContent().replace("$", "\n")); - if (examineBasis != null) { - result.put("13", examineBasis.getContent().replace("$", "(char)11")); - } +// if (examineBasis != null) { +// result.put("13", examineBasis.getContent().replace("$", "(char)11")); +// } + // 结果判定方法和依据 + result.put("13", examineResult.getExamineBasisContent().replace("$", "(char)11")); String path = sysClient.getParamValue("electronic_signature_real_path").getData(); // 检测人 if (!"".equals(examine.getExamineBy()) && examine.getExamineBy() != null) {