2023年8月28日15:17:47

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（科室一、科室二.....）
      */

lab-service/lab-lims/pom.xml

@@ -121,47 +121,12 @@
             <artifactId>pax-logging-api</artifactId>
             <version>2.0.6</version>
         </dependency>
-        <!--doc 转pdf -->
-
-
 
         <!--MinIO-->
         <dependency>
             <groupId>io.minio</groupId>
             <artifactId>minio</artifactId>
         </dependency>
-        <dependency>
-            <groupId>com.alibaba</groupId>
-            <artifactId>QLExpress</artifactId>
-            <version>3.2.0</version>
-        </dependency>
-        <dependency>
-            <groupId>com.alibaba</groupId>
-            <artifactId>QLExpress</artifactId>
-            <version>3.2.0</version>
-        </dependency>
-        <dependency>
-            <groupId>com.alibaba</groupId>
-            <artifactId>QLExpress</artifactId>
-            <version>3.2.0</version>
-        </dependency>
-        <dependency>
-            <groupId>com.alibaba</groupId>
-            <artifactId>QLExpress</artifactId>
-            <version>3.2.0</version>
-        </dependency>
-        <!--        <dependency>-->
-<!--            <groupId>cn.afterturn</groupId>-->
-<!--            <artifactId>easypoi-base</artifactId>-->
-<!--            <version>3.2.0</version>-->
-<!--            <scope>compile</scope>-->
-<!--        </dependency>-->
-
-        <dependency>
-            <groupId>org.apache.pdfbox</groupId>
-            <artifactId>pdfbox</artifactId>
-            <version>2.0.6</version>
-        </dependency>
 
         <!--> google zxing <-->
         <dependency>
@@ -204,6 +169,23 @@
             <artifactId>netdevice</artifactId>
             <version>2.2.2</version>
         </dependency>
+
+        <!--pdf转图片-->
+        <dependency>
+            <groupId>org.apache.pdfbox</groupId>
+            <artifactId>fontbox</artifactId>
+            <version>2.0.9</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.pdfbox</groupId>
+            <artifactId>pdfbox</artifactId>
+            <version>2.0.9</version>
+        </dependency>
+        <dependency>
+            <groupId>commons-logging</groupId>
+            <artifactId>commons-logging</artifactId>
+            <version>1.2</version>
+        </dependency>
     </dependencies>
 
 

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<ExamineResult> wrapper = new LambdaQueryWrapper<>();
-        wrapper.eq(ExamineResult::getExamineId, id);
+        wrapper.eq(ExamineResult::getExamineId, result.getId());
         // wrapper.eq(ExamineResult::getStatus, 1);
         List<ExamineResult> examineResults = examineResultService.list(wrapper);
         for (ExamineResult examineResult : examineResults) {
             examineResult.setVerificationUser(AuthUtil.getUserId());
-            examineResult.setVerificationTime(new Date());
+            examineResult.setVerificationTime(result.getVerificationTime());
         }
         examineResultService.updateBatchById(examineResults);
 

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

@@ -27,7 +27,7 @@ import java.util.Date;
 @RequestMapping("/handleSample")
 public class HandleSampleController extends BladeController {
 
-    private IHandleSampleService handleSampleService;
+    private final IHandleSampleService handleSampleService;
 
     /**
      * 留样处理申请列表

lab-service/lab-lims/src/main/java/org/springblade/lims/mapper/EntrustMapper.xml

@@ -108,10 +108,10 @@
 			<if test="handleSample.handleOpinion != null and handleSample.handleOpinion != ''">
 				AND b.experie_num like concat('%',#{handleSample.handleOpinion},'%')
 			</if>
-			<if test="handleSample.status != null and handleSample.status != '2'">
+			<if test="handleSample.status != null and handleSample.status != 2">
 				AND a.handle_state = #{handleSample.status}
 			</if>
-			<if test="handleSample.status != null and handleSample.status == '2'">
+			<if test="handleSample.status != null and handleSample.status == 2">
 				AND a.handle_state in (2,3)
 			</if>
 			AND a.is_deleted = 0 AND a.entrust_status != '-1'

lab-service/lab-lims/src/main/java/org/springblade/lims/service/IExamineResultService.java

@@ -3,10 +3,14 @@ package org.springblade.lims.service;
 
 
 import org.springblade.core.mp.base.BaseService;
+import org.springblade.core.tool.api.R;
 import org.springblade.lims.entry.Entrust;
 import org.springblade.lims.entry.ExamineResult;
 import org.springframework.web.multipart.MultipartFile;
 
+import javax.servlet.http.HttpServletResponse;
+import java.util.List;
+
 /**
  * 委托单表 服务类
  *
@@ -20,4 +24,10 @@ public interface IExamineResultService extends BaseService<ExamineResult> {
     void resultCommit(ExamineResult examineResult) throws Exception;
 
     String resultPicture(MultipartFile file, String examineId);
+
+    R excel(MultipartFile file, String examineId, String reagentId) throws Exception;
+
+    void exportCurrExamineTemplate(HttpServletResponse response, String id);
+
+    String handleNum(String id, Integer number);
 }

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

@@ -47,13 +47,13 @@ import static org.springblade.core.cache.constant.CacheConstant.PARAM_CACHE;
 @AllArgsConstructor
 public class HandleSampleServiceImpl extends BaseServiceImpl<HandleSampleMapper, HandleSample> implements IHandleSampleService {
 
-    private EntrustMapper entrustMapper;
+    private final EntrustMapper entrustMapper;
 
-    private IUserClient userClient;
+    private final IUserClient userClient;
 
-    private ISimpleService simpleService;
+    private final ISimpleService simpleService;
 
-    private ISysClient sysClient;
+    private final ISysClient sysClient;
 
     @Override
     public IPage<HandleSample> entrustList(HandleSample handleSample, IPage<HandleSample> page) {
@@ -327,11 +327,11 @@ public class HandleSampleServiceImpl extends BaseServiceImpl<HandleSampleMapper,
                         size++;
                         if (size == simples.size()) {
                             Map<String, Object> map = new HashMap<>();
-                            map.put("originalNum", start + "-" + (start + size));
-                            map.put("experieNum", num + start + "-" + num + (start + size));
+                            map.put("originalNum", start + "-" + (start + size - 1));
+                            map.put("experieNum", num + start + "-" + num + (start + size - 1));
                             map.put("simpleName", simple.getSimpleName());
                             map.put("sampleHandle", entrust.getSampleHandle());
-                            map.put("a", "~");
+                            map.put("a", "30天");
                             map.put("b", "接样室");
                             map.put("c", "李玉杰");
                             resultList.add(map);
@@ -344,12 +344,12 @@ public class HandleSampleServiceImpl extends BaseServiceImpl<HandleSampleMapper,
                             map.put("originalNum", start);
                             map.put("experieNum", num + start);
                         } else {
-                            map.put("originalNum", start + "-" + (start + size));
-                            map.put("experieNum", num + start + "-" + num + (start + size));
+                            map.put("originalNum", start + "-" + (start + size - 1));
+                            map.put("experieNum", num + start + "-" + num + (start + size - 1));
                         }
                         map.put("simpleName", simple.getSimpleName());
                         map.put("sampleHandle", entrust.getSampleHandle());
-                        map.put("a", "~");
+                        map.put("a", "30天");
                         map.put("b", "接样室");
                         map.put("c", "李玉杰");
                         resultList.add(map);
@@ -360,7 +360,7 @@ public class HandleSampleServiceImpl extends BaseServiceImpl<HandleSampleMapper,
                     map.put("experieNum", simple.getExperieNum());
                     map.put("simpleName", simple.getSimpleName());
                     map.put("sampleHandle", entrust.getSampleHandle());
-                    map.put("a", "~");
+                    map.put("a", "30天");
                     map.put("b", "接样室");
                     map.put("c", "李玉杰");
                     resultList.add(map);