复检实验生成报告修改

lab-service/lab-lims/src/main/java/org/springblade/lims/controller/EntrustController.java

@@ -961,7 +961,7 @@ public class EntrustController extends BladeController {
 
 
     /**
-     * 14.检测报告2打印
+     * 14.原始记录打印
      */
     @GetMapping("/reportPrint")
     public void reportPrint(String examineId, HttpServletResponse response) throws IOException {

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

@@ -1188,6 +1188,52 @@ public class EntrustServiceImpl extends BaseServiceImpl<EntrustMapper, Entrust>
             int yinNum = 0;
             int keyiNum = 0;
 
+            // 2024年3月18日新增修改内容（复检实验结果修改）
+            if (examine.getExamineItemId() == 1565164433829933058L) {
+                for (Examine examine1 : examineList) {
+                    if (examine.getExamineItemId().equals(examine1.getExamineItemId())
+                            && examine.getReceiveTime().equals(examine1.getReceiveTime())
+                            && examine1.getIsRecheck() != null
+                            && examine1.getIsRecheck() == 1) {
+                        LambdaQueryWrapper<ExamineResult> wrapper1 = new LambdaQueryWrapper<>();
+                        wrapper1.eq(ExamineResult::getExamineId, examine1.getId());
+                        ExamineResult one = examineResultService.getOne(wrapper1);
+                        // json原始数据
+                        List<ExamineResultVo> oneList = JSON.parseArray(one.getExamineDataArr(), ExamineResultVo.class);
+
+                        int fji = 0;
+                        if (one.getConformityType() != null && one.getConformityType() > 1) {
+                            fji = examine1.getSimpleCount() % one.getConformityType();
+                        }
+
+                        for (int j = 0; j < oneList.size(); j++) {
+                            ExamineResultVo vo = oneList.get(j);
+                            if (StringUtils.isNotBlank(vo.getResult())) {
+                                if (one.getConformityType() != null && one.getConformityType() > 1) {
+                                    if (i > 0 && j == oneList.size() - 3) {
+                                        if (vo.getResult().contains("阴性")) {
+                                            yinNum += i;
+                                            yangNum -= i;
+                                        }
+                                    } else {
+                                        if (vo.getResult().contains("阴性")) {
+                                            yinNum += one.getConformityType();
+                                            yangNum -= one.getConformityType();
+                                        }
+                                    }
+                                } else {
+                                    if (vo.getResult().contains("阴性")) {
+                                        yinNum++;
+                                        yangNum--;
+                                    }
+                                }
+                            }
+                        }
+                        break;
+                    }
+                }
+            }
+
             for (int j = 0; j < list.size(); j++) {
                 ExamineResultVo vo = list.get(j);
                 if (StringUtils.isNotBlank(vo.getResult())) {

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

@@ -665,7 +665,7 @@ public class ExamineResultServiceImpl extends BaseServiceImpl<ExamineResultMappe
             }
 
             // 如果是禽流感病毒核酸检测且有阳性
-            if (byId.getExamineItemId() == 1595723686709940226L && entry.getNeedTwice() == 1) {
+            else if (byId.getExamineItemId() == 1595723686709940226L && entry.getNeedTwice() == 1) {
                 // 上次检测结果为阳性的数据
                 String[] split = entry.getPositiveNum().split(",");