From 6f30bb1ade6fa4a852e87bcc49f7f5c174f9939c Mon Sep 17 00:00:00 2001 From: swj <1211312234@qq.com> Date: Mon, 26 Sep 2022 23:09:05 +0800 Subject: [PATCH] =?UTF-8?q?=E5=B0=9D=E8=AF=95=E8=AE=A9=E6=89=93=E5=8D=B0?= =?UTF-8?q?=E7=9A=84Word=E6=96=87=E4=BB=B6=E9=87=8C=E5=B8=A6=E6=8D=A2?= =?UTF-8?q?=E8=A1=8C=E7=AC=A6=20+=20=E8=A7=A3=E8=80=A6=E5=B8=83=E9=B2=81?= =?UTF-8?q?=E6=B0=8F=E7=9A=84=E4=B8=A4=E7=A7=8D=E6=A3=80=E6=B5=8B=E7=B1=BB?= =?UTF-8?q?=E5=9E=8B=E7=A1=AC=E7=BC=96=E7=A0=81=E9=97=AE=E9=A2=98=20+=20?= =?UTF-8?q?=E5=B9=B3=E6=9D=BF=E7=B1=BB=E5=9E=8B=E6=A3=80=E5=87=BA=E9=98=B3?= =?UTF-8?q?=E6=80=A7=E8=87=AA=E5=8A=A8=E5=A2=9E=E4=B8=80=E4=B8=AA=E8=AF=95?= =?UTF-8?q?=E7=AE=A1=E7=B1=BB=E5=9E=8B=E6=A3=80=E9=AA=8C=E9=80=BB=E8=BE=91?= =?UTF-8?q?=E8=A7=A3=E8=80=A6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../lims/service/impl/EntrustServiceImpl.java | 21 ++++++++------- .../impl/ExamineResultServiceImpl.java | 26 ++++++++++++++----- 2 files changed, 31 insertions(+), 16 deletions(-) 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 4fde3c0..623cd85 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 @@ -1192,7 +1192,7 @@ public class EntrustServiceImpl extends BaseServiceImpl // result.put("12", examineWay.getOperation()); result.put("12", examineResult.getOperateContent().replace("$", "\n")); if (examineBasis != null) { - result.put("13", examineBasis.getContent().replace("$", "\n")); + result.put("13", examineBasis.getContent().replace("$", "(char)11")); } String path = sysClient.getParamValue("electronic_signature_real_path").getData(); // 检测人 @@ -1244,25 +1244,26 @@ public class EntrustServiceImpl extends BaseServiceImpl result.put("17", s1); } - // position1 - // 如果是布鲁氏检测 - if ("2".equals(byId.getInputMode())) { + // 如果是布鲁氏检测 （列排单+式和列排多+式） + if ("2".equals(byId.getInputMode()) || "6".equals(byId.getInputMode())) { List list = JSON.parseArray(examineResult.getExamineDataArr(), ExamineTemplate2Excel.class); - // 阴性数量 + // 阴阳性数量 long yin = list.stream().filter((ExamineTemplate2Excel e) -> "阴性".equals(e.getResult())).count(); + long yang = list.stream().filter((ExamineTemplate2Excel e) -> "阳性".equals(e.getResult())).count(); + ExamineTemplate2Excel examineTemplate2Excel1 = new ExamineTemplate2Excel(); examineTemplate2Excel1.setExperieNum("阴性数量"); examineTemplate2Excel1.setValue(String.valueOf(yin)); list.add(examineTemplate2Excel1); - // 阳性数量 - long yang = list.stream().filter((ExamineTemplate2Excel e) -> "阳性".equals(e.getResult())).count(); + ExamineTemplate2Excel examineTemplate2Excel2 = new ExamineTemplate2Excel(); examineTemplate2Excel2.setExperieNum("阳性数量"); examineTemplate2Excel2.setValue(String.valueOf(yang)); list.add(examineTemplate2Excel2); - // 可疑数量 - long keyi = list.stream().filter((ExamineTemplate2Excel e) -> "可疑".equals(e.getResult())).count(); - if (keyi > 0) { + + // 如果是平板的，只有阴性和阳性，如果是试管的才有可疑 + if ("6".equals(byId.getInputMode())) { + long keyi = list.stream().filter((ExamineTemplate2Excel e) -> "可疑".equals(e.getResult())).count(); ExamineTemplate2Excel examineTemplate2Excel3 = new ExamineTemplate2Excel(); examineTemplate2Excel3.setExperieNum("可疑数量"); examineTemplate2Excel3.setValue(String.valueOf(keyi)); 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 635c57b..dfe2a42 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 @@ -1,5 +1,6 @@ package org.springblade.lims.service.impl; +import com.alibaba.fastjson.JSON; import com.alibaba.nacos.common.utils.CollectionUtils; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; @@ -7,7 +8,9 @@ import lombok.AllArgsConstructor; import org.springblade.core.mp.base.BaseServiceImpl; import org.springblade.core.secure.utils.AuthUtil; import org.springblade.core.tool.utils.BeanUtil; +import org.springblade.core.tool.utils.CollectionUtil; import org.springblade.lims.entry.*; +import org.springblade.lims.excel.PCR2Excel; import org.springblade.lims.mapper.ExamineResultMapper; import org.springblade.lims.service.*; import org.springblade.resource.enums.SysTypeEnum; @@ -18,6 +21,7 @@ import org.springblade.system.user.feign.IUserClient; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import org.springframework.web.multipart.MultipartFile; +import springfox.documentation.spring.web.json.Json; import java.io.*; import java.util.*; @@ -140,16 +144,26 @@ public class ExamineResultServiceImpl extends BaseServiceImpl queryWrapper = new QueryWrapper<>(); + queryWrapper.eq("input_mode", "6"); + List list = examineItemService.list(queryWrapper); + if (CollectionUtil.isNotEmpty(list) && list.get(0) != null) { + // 布鲁氏杆菌抗体检测（试管凝集微量法） + ExamineItem examineItem = list.get(0); + examine.setExamineItemId(examineItem.getId()); + String wayAndBasis = examineItem.getWayAndBasis(); + List wayAndBaseList = JSON.parseArray(wayAndBasis, WayAndBasis.class); + if (CollectionUtil.isNotEmpty(wayAndBaseList) && wayAndBaseList.get(0) != null) { + WayAndBasis wayAndBasis1 = wayAndBaseList.get(0); + examine.setExamineWayId(Long.valueOf(wayAndBasis1.getExamineWayId())); + examine.setExamineBasisId(Long.valueOf(wayAndBasis1.getExamineBasisId())); + } + } examine.setIsFinished("-1"); examineService.save(examine); // 新增一条记录