diff --git a/lab-service-api/lab-lims-api/src/main/java/org/springblade/lims/entry/Examine.java b/lab-service-api/lab-lims-api/src/main/java/org/springblade/lims/entry/Examine.java
index 1211fe6..78c14af 100644
--- a/lab-service-api/lab-lims-api/src/main/java/org/springblade/lims/entry/Examine.java
+++ b/lab-service-api/lab-lims-api/src/main/java/org/springblade/lims/entry/Examine.java
@@ -20,12 +20,6 @@ import java.util.Date;
@TableName("f_examine")
public class Examine extends BaseEntity implements Serializable {
- /**
- * 业务主键
- */
-// @Id
-// private Long id;
-
/**
* 部门id(科室一、科室二.....)
*/
diff --git a/lab-service/lab-lims/pom.xml b/lab-service/lab-lims/pom.xml
index 2c9d215..69cc6af 100644
--- a/lab-service/lab-lims/pom.xml
+++ b/lab-service/lab-lims/pom.xml
@@ -121,47 +121,12 @@
pax-logging-api
2.0.6
-
-
-
io.minio
minio
-
- com.alibaba
- QLExpress
- 3.2.0
-
-
- com.alibaba
- QLExpress
- 3.2.0
-
-
- com.alibaba
- QLExpress
- 3.2.0
-
-
- com.alibaba
- QLExpress
- 3.2.0
-
-
-
-
-
-
-
-
-
- org.apache.pdfbox
- pdfbox
- 2.0.6
-
google zxing <-->
@@ -204,6 +169,23 @@
netdevice
2.2.2
+
+
+
+ org.apache.pdfbox
+ fontbox
+ 2.0.9
+
+
+ org.apache.pdfbox
+ pdfbox
+ 2.0.9
+
+
+ commons-logging
+ commons-logging
+ 1.2
+
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 6dec880..d81d892 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
@@ -1,33 +1,19 @@
-
package org.springblade.lims.controller;
import cn.afterturn.easypoi.entity.ImageEntity;
-import cn.afterturn.easypoi.excel.ExcelExportUtil;
-import cn.afterturn.easypoi.excel.entity.TemplateExportParams;
import cn.afterturn.easypoi.word.WordExportUtil;
import com.alibaba.fastjson.JSON;
import com.alibaba.nacos.common.utils.CollectionUtils;
-import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.fasterxml.jackson.annotation.JsonFormat;
import com.github.binarywang.utils.qrcode.QrcodeUtils;
import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
-import com.spire.doc.Document;
-import com.spire.doc.FieldType;
-import com.spire.doc.FileFormat;
-import com.spire.doc.HeaderFooter;
-import com.spire.doc.documents.HorizontalAlignment;
-import com.spire.doc.documents.Paragraph;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
-import oracle.jdbc.proxy.annotation.Post;
import org.apache.commons.lang.StringUtils;
import org.apache.commons.lang3.RandomUtils;
-import org.apache.poi.ss.usermodel.Workbook;
import org.apache.poi.xwpf.usermodel.XWPFDocument;
-import org.springblade.common.utils.ZipCompressUtil;
import org.springblade.core.excel.util.ExcelUtil;
import org.springblade.core.secure.utils.AuthUtil;
import org.springblade.lims.entry.*;
@@ -41,33 +27,24 @@ import org.springblade.core.mp.support.Condition;
import org.springblade.core.mp.support.Query;
import org.springblade.core.tool.api.R;
import org.springblade.lims.service.impl.EntrustCustomerServiceImpl;
-import org.springblade.resource.enums.SysTypeEnum;
import org.springblade.resource.feign.IMessageClient;
-import org.springblade.system.cache.DictBizCache;
-import org.springblade.system.enums.DictBizEnum;
import org.springblade.system.feign.ISysClient;
import org.springblade.system.user.entity.User;
import org.springblade.system.user.feign.IUserClient;
-import org.springframework.format.annotation.DateTimeFormat;
import org.springframework.web.bind.annotation.*;
import javax.imageio.ImageIO;
-import javax.servlet.ServletOutputStream;
import javax.servlet.http.HttpServletResponse;
-import java.awt.*;
import java.awt.image.BufferedImage;
import java.io.*;
-import java.nio.file.Files;
import java.text.ParseException;
import java.text.SimpleDateFormat;
import java.time.LocalDateTime;
import java.util.*;
import java.util.List;
-import java.util.stream.Collectors;
/**
* 委托单
- *
* @author swj
* @since 2022年5月28日14:33:30
*/
@@ -732,21 +709,21 @@ public class EntrustController extends BladeController {
* 8.校核通过
*/
@PostMapping("/check")
- public void check(String id) {
+ public void check(@RequestBody ExamineResult result) {
// 修改检测状态为通过
- Examine examine = examineService.getById(id);
+ Examine examine = examineService.getById(result.getId());
examine.setStatus(1);
examine.setFinishTime(new Date());
examineService.updateById(examine);
// 添加检测结果的校核人和校核时间
LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>();
- wrapper.eq(ExamineResult::getExamineId, id);
+ wrapper.eq(ExamineResult::getExamineId, result.getId());
// wrapper.eq(ExamineResult::getStatus, 1);
List examineResults = examineResultService.list(wrapper);
for (ExamineResult examineResult : examineResults) {
examineResult.setVerificationUser(AuthUtil.getUserId());
- examineResult.setVerificationTime(new Date());
+ examineResult.setVerificationTime(result.getVerificationTime());
}
examineResultService.updateBatchById(examineResults);
diff --git a/lab-service/lab-lims/src/main/java/org/springblade/lims/controller/ExamineResultController.java b/lab-service/lab-lims/src/main/java/org/springblade/lims/controller/ExamineResultController.java
index a370115..37bf144 100644
--- a/lab-service/lab-lims/src/main/java/org/springblade/lims/controller/ExamineResultController.java
+++ b/lab-service/lab-lims/src/main/java/org/springblade/lims/controller/ExamineResultController.java
@@ -1,5257 +1,87 @@
+package org.springblade.lims.controller;
-package org.springblade.lims.controller;
-
-import com.alibaba.fastjson.JSON;
-import com.alibaba.fastjson.TypeReference;
-import com.alibaba.nacos.common.utils.CollectionUtils;
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
-import io.swagger.annotations.ApiOperation;
-import io.swagger.annotations.ApiParam;
-import lombok.AllArgsConstructor;
-import org.apache.commons.lang3.StringUtils;
-import org.springblade.core.boot.ctrl.BladeController;
-import org.springblade.core.excel.util.ExcelUtil;
-import org.springblade.core.mp.support.Condition;
-import org.springblade.core.mp.support.Query;
-import org.springblade.core.tool.api.R;
-import org.springblade.core.tool.utils.Func;
-import org.springblade.core.tool.utils.StringUtil;
-import org.springblade.lims.entry.*;
-import org.springblade.lims.excel.*;
-import org.springblade.lims.service.*;
-import org.springblade.lims.utils.FormulaTool;
-import org.springframework.web.bind.annotation.*;
-import org.springframework.web.multipart.MultipartFile;
-
-import javax.servlet.http.HttpServletResponse;
-import java.text.DecimalFormat;
-import java.util.*;
-import java.util.stream.Collectors;
-
-import static java.util.stream.Collectors.toList;
-
-@RestController
-@AllArgsConstructor
-@RequestMapping("/examineResult")
-public class ExamineResultController extends BladeController {
-
- private final IExamineService examineService;
-
- private final IExamineResultService service;
-
- private final ISimpleDoExamineLogService simpleDoExamineLogService;
-
- private final IExamineItemService examineItemService;
-
- private final IExamineWayService examineWayService;
-
- private final IReagentService reagentService;
-
- /**
- * 分页
- */
- @GetMapping("/list")
- @ApiOperationSupport(order = 2)
- public R> list(ExamineResult entry, Query query) {
- IPage page = service.page(Condition.getPage(query), Condition.getQueryWrapper(entry));
- return R.data(page);
- }
-
- /**
- * 检验修改
- */
- @PostMapping("/update")
- @ApiOperation(value = "更改", notes = "更改")
- public R update(@RequestBody ExamineResult entry) {
- return R.data(service.updateById(entry));
- }
-
- /**
- * 普通检验提交
- */
- @PostMapping("/insert")
- public boolean insertExamineResult(@RequestBody ExamineResult entry) throws Exception {
- return service.doExamine(entry);
- }
-
- /**
- * 布鲁氏杆菌检验提交
- */
- @PostMapping("/resultCommit")
- public void resultCommit(@RequestBody ExamineResult examineResult) throws Exception {
- service.resultCommit(examineResult);
- }
-
- /**
- * 解析数据
- */
- @PostMapping("/excel")
- public R excel(MultipartFile file, String examineId, String reagentId) throws Exception {
- Examine examine = examineService.getById(examineId);
- ExamineItem examineItem = examineItemService.getById(examine.getExamineItemId());
- ExamineWay examineWay = examineWayService.getById(examine.getExamineWayId());
- if ("2".equals(examineWay.getInputMode()) || "6".equals(examineWay.getInputMode()) || "7".equals(examineWay.getInputMode())) {
- return blsExcel(file, examineId);
- } else if ("3".equals(examineWay.getInputMode())) {
- return ktyExcel(file, examineId);
- }
- else if ("8".equals(examineWay.getInputMode())) {
- return shjdExcel(file, examineId);
- }
- else if ("5".equals(examineWay.getInputMode())) {
- return xnExcel(file, examineId);
- } else {
- return ptExcel(file, examineId, reagentId);
- }
- }
-
- private R shjdExcel(MultipartFile file, String examineId) throws Exception {
- List read = ExcelUtil.read(file, BiochemicalIdentificationExcel.class);
- if (read != null && read.size() > 0) {
- for (BiochemicalIdentificationExcel excel : read) {
- if ("+".equals(excel.getValue())) {
- excel.setResult("阳性");
- } else if ("-".equals(excel.getValue())) {
- excel.setResult("阴性");
- } else if (excel.getValue() == null || "".equals(excel.getValue())) {
- throw new Exception("有样品未填写的对应的结果!");
- }
- }
- LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>();
- wrapper.eq(ExamineResult::getExamineId, examineId);
- ExamineResult result = service.getOne(wrapper);
- if (result != null) {
- result.setOriginRecordData(JSON.toJSONString(read));
- result.setOriginRecordResult(JSON.toJSONString(read));
- result.setExamineDataArr(JSON.toJSONString(read));
- service.updateById(result);
- } else {
- ExamineResult examineResult = new ExamineResult();
- examineResult.setExamineId(Long.valueOf(examineId));
- examineResult.setOriginRecordData(JSON.toJSONString(read));
- examineResult.setOriginRecordResult(JSON.toJSONString(read));
- examineResult.setExamineDataArr(JSON.toJSONString(read));
- service.save(examineResult);
- }
- }
- return R.data(read);
- }
-
- /**
- * 普通Excel解析数据 review start
- **/
- //获取单元格的值
- private String getCode(List list, Integer order) {
- String result;
- ExamineExcel examineExcel = (order % 8 - 1 >= 0) ? list.get(order % 8 - 1) : list.get(list.size() - 1);
- Integer re = order / 8 + 1;
- switch (re) {
- case 1:
- result = examineExcel.getCode1();
- break;
- case 2:
- result = examineExcel.getCode2();
- break;
- case 3:
- result = examineExcel.getCode3();
- break;
- case 4:
- result = examineExcel.getCode4();
- break;
- case 5:
- result = examineExcel.getCode5();
- break;
- case 6:
- result = examineExcel.getCode6();
- break;
- case 7:
- result = examineExcel.getCode7();
- break;
- case 8:
- result = examineExcel.getCode8();
- break;
- case 9:
- result = examineExcel.getCode9();
- break;
- case 10:
- result = examineExcel.getCode10();
- break;
- case 11:
- result = examineExcel.getCode11();
- break;
- case 12:
- result = examineExcel.getCode12();
- break;
- default:
- result = "0";
- }
- return result;
- }
-
- private R