From cf1a59a644afbea8c4c15591a8935327df3cd9b4 Mon Sep 17 00:00:00 2001
From: litao <a15234804788@163.com>
Date: Mon, 18 Mar 2024 13:55:26 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A4=8D=E6=A3=80=E5=AE=9E=E9=AA=8C=E7=94=9F?=
 =?UTF-8?q?=E6=88=90=E6=8A=A5=E5=91=8A=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../lims/controller/EntrustController.java    |  2 +-
 .../lims/service/impl/EntrustServiceImpl.java | 46 +++++++++++++++++++
 .../impl/ExamineResultServiceImpl.java        |  2 +-
 3 files changed, 48 insertions(+), 2 deletions(-)

diff --git a/lab-service/lab-lims/src/main/java/org/springblade/lims/controller/EntrustController.java b/lab-service/lab-lims/src/main/java/org/springblade/lims/controller/EntrustController.java
index 2e5391d..bef9b2b 100644
--- a/lab-service/lab-lims/src/main/java/org/springblade/lims/controller/EntrustController.java
+++ b/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 {
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 8e59ee2..0ffa72e 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
@@ -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())) {
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 9acb4d8..aa8205f 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
@@ -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(",");