解决最后打印生成报告问题

lab-service/lab-lims/src/main/java/org/springblade/lims/service/impl/EntrustServiceImpl.java

@@ -417,7 +417,7 @@ public class EntrustServiceImpl extends BaseServiceImpl<EntrustMapper, Entrust>
             ExamineResult examineResult = getExamineResultByExamineId(examine.getId());
 
             // 布鲁氏检测
-            if ("2".equals(examineItem.getInputMode())) {
+            if ("2".equals(examineItem.getInputMode()) || "6".equals(examineItem.getInputMode())) {
                 List<ExamineTemplate2Excel> 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<EntrustMapper, Entrust>
 //        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) {