试剂检验

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

@@ -349,7 +349,7 @@ public class ExamineReagentServiceImpl implements IExamineReagentService {
             double positiveAvg = (positiveVal1 + positiveVal2) / 2;
 
             // 成立条件校验
-            if (negativeAvg-positiveAvg>=0.3) {
+            if (!(negativeAvg-positiveAvg>=0.3)) {
                 throw new ServiceException("第" + (i + 1) + "板阴阳性对照OD值条件不成立，请修改后重新上传！");
             }
 
@@ -835,7 +835,7 @@ public class ExamineReagentServiceImpl implements IExamineReagentService {
                                 SP = DECIMAL_FORMAT.format(1-((Double.parseDouble(cellVal))/negativeAvg));
                             }
                             mapResult.put("originResult", cellVal);
-                            mapResult.put("value", BLOCKING_RATE_PERCENT_FORMAT.format(SP));
+                            mapResult.put("value", BLOCKING_RATE_PERCENT_FORMAT.format(Double.parseDouble(SP)));
                             mapResult.put("num", "1");
                             if (Double.parseDouble(SP) <0.35) {
                                 mapResult.put("result", "阴性");
@@ -1073,10 +1073,10 @@ public class ExamineReagentServiceImpl implements IExamineReagentService {
             double positiveVal1 = Double.parseDouble(excels.get(2).getCode1());
             double positiveVal2 = Double.parseDouble(excels.get(3).getCode1());
             // 阴性对照平均值
-            double negativeAvg = (negativeVal1 + negativeVal2) / 2;
+            double negativeAvg1 = (negativeVal1 + negativeVal2) / 2;
             // 阳性对照平均值
             double positiveAvg = (positiveVal1 + positiveVal2) / 2;
-
+            double negativeAvg = negativeAvg1 <=0.05 ? 0.05: negativeAvg1;
             // 成立条件校验
             if (!(negativeAvg < 0.4 && positiveAvg >= 0.6)) {
                 throw new ServiceException("第" + (i + 1) + "板阴阳性对照OD值条件不成立，请修改后重新上传！");