diff --git a/lab-service/lab-lims/src/main/java/org/springblade/lims/service/impl/ExamineReagentServiceImpl.java b/lab-service/lab-lims/src/main/java/org/springblade/lims/service/impl/ExamineReagentServiceImpl.java index 12a78ff..8f846cb 100644 --- a/lab-service/lab-lims/src/main/java/org/springblade/lims/service/impl/ExamineReagentServiceImpl.java +++ b/lab-service/lab-lims/src/main/java/org/springblade/lims/service/impl/ExamineReagentServiceImpl.java @@ -328,14 +328,14 @@ public class ExamineReagentServiceImpl implements IExamineReagentService { if (StringUtils.isNotBlank(cellVal)) { if (rowNum > 5 || colNum > 1) { if (negativeAvg != 0) { - SP = DECIMAL_FORMAT.format(((negativeAvg-(Double.parseDouble(cellVal)))/(negativeAvg-positiveAvg))*100); + SP = DECIMAL_FORMAT.format((negativeAvg-(Double.parseDouble(cellVal)))/(negativeAvg-positiveAvg)); } mapResult.put("originResult", cellVal); - mapResult.put("value", SP); + mapResult.put("value", BLOCKING_RATE_PERCENT_FORMAT.format(Double.parseDouble(SP))); mapResult.put("num", "1"); - if (Double.parseDouble(SP) <= 40) { + if (Double.parseDouble(SP) <= 0.4) { mapResult.put("result", "阴性"); - } else if (Double.parseDouble(SP) < 50) { + } else if (Double.parseDouble(SP) < 0.5) { mapResult.put("result", "可疑样本"); } else { mapResult.put("result", "阳性"); diff --git a/lab-service/lab-lims/src/main/java/org/springblade/lims/service/impl/ExamineResultServiceImpl.java b/lab-service/lab-lims/src/main/java/org/springblade/lims/service/impl/ExamineResultServiceImpl.java index bc42201..bc90a6e 100644 --- a/lab-service/lab-lims/src/main/java/org/springblade/lims/service/impl/ExamineResultServiceImpl.java +++ b/lab-service/lab-lims/src/main/java/org/springblade/lims/service/impl/ExamineResultServiceImpl.java @@ -797,13 +797,21 @@ public class ExamineResultServiceImpl extends BaseServiceImpl list1 = new ArrayList<>(); List list2 = new ArrayList<>(); ExamineItem examineItem = examineItemService.getById(examine.getExamineItemId()); ExamineWay examineWay = examineWayService.getById(examine.getExamineWayId()); ExamineBasis examineBasis = examineBasisService.getById(examine.getExamineBasisId()); + String s1 = ""; if (examineItem != null) { s1 = examineItem.getName(); @@ -817,34 +825,83 @@ public class ExamineResultServiceImpl extends BaseServiceImpl