批量审核

lis-interfaceCommon/src/main/resources/mapper/LabResultMedMapper.xml

@@ -3,25 +3,24 @@
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
 <mapper namespace="com.czlis.interfaceCommon.mapper.LabResultMedMapper">
     <select id="getLabResultMed"  resultType="com.czlis.common.core.domain.entity.lis.LabResultMed">
-        select *
+        select a.*,b.ywmc
-        from lab_resultmed
+        from lab_resultmed a,xm_med b where a.ywdh = b.ywdh
-        <where>
         <if test="jyrq != null ">
-                and jyrq = #{jyrq}
+            and a.jyrq = #{jyrq}
         </if>
         <if test="yq != null and yq != ''">
-                and yq = #{yq}
+            and a.yq = #{yq}
         </if>
         <if test="ybh != null and ybh != ''">
-                and ybh = #{ybh}
+            and a.ybh = #{ybh}
         </if>
         <if test="xmdh != null and xmdh != ''">
-                and xmdh = #{xmdh}
+            and a.xmdh = #{xmdh}
         </if>
         <if test="ywdh != null and ywdh != ''">
-                and ywdh = #{ywdh}
+            and a.ywdh = #{ywdh}
         </if>
-        </where>
+
     </select>
 
     <select id="getLabResultMedCount"  resultType="int">

lis-system/src/main/resources/application-druid.yml

@@ -54,7 +54,7 @@ spring:
                     enabled: true
                     # 慢SQL记录
                     log-slow-sql: true
-                    slow-sql-millis: 1000
+                    slow-sql-millis: 10000
                     merge-sql: true
                 wall:
                     config:

lis-system/src/main/resources/application.yml

@@ -103,6 +103,10 @@ spring:
     serialization:
       write-dates-as-timestamps: false # 禁用时间戳格式，使用自定义格式
     default-property-inclusion: always
+  mvc:
+    format:
+      date-time: yyyy-MM-dd HH:mm:ss
+      date: yyyy-MM-dd
 
 # token配置
 token:

liswork/src/main/java/com/czlis/liswork/controller/work/BatchCheckController.java

@@ -1,6 +1,7 @@
 package com.czlis.liswork.controller.work;
 
 import com.czlis.common.core.domain.Result;
+import com.czlis.common.core.domain.entity.lis.LabResult;
 import com.czlis.liswork.pojo.DTO.BatchCheckDTO;
 import com.czlis.liswork.pojo.DTO.work.BatchCheckDataDTO;
 import com.czlis.liswork.service.BatchCheckService;
@@ -43,4 +44,10 @@ public class BatchCheckController {
         return batchCheckService.unChekData(batchCheckDataDTOList);
     }
 
+    @ApiOperation("获取明细结果")
+    @GetMapping("/queryDetailResult")
+    public Result queryDetailResult(LabResult labResult){
+        return batchCheckService.queryDetailResult(labResult);
+    }
+
 }

liswork/src/main/java/com/czlis/liswork/pojo/VO/LabResultVO.java

@@ -0,0 +1,17 @@
+package com.czlis.liswork.pojo.VO;
+
+import com.czlis.common.core.domain.entity.lis.LabResult;
+import com.czlis.common.core.domain.entity.lis.LabResultMed;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.util.List;
+
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+public class LabResultVO {
+    private List<LabResult> labResultList;
+    private List<LabResultMed> labResultMedList;
+}

liswork/src/main/java/com/czlis/liswork/service/BatchCheckService.java

@@ -1,6 +1,7 @@
 package com.czlis.liswork.service;
 
 import com.czlis.common.core.domain.Result;
+import com.czlis.common.core.domain.entity.lis.LabResult;
 import com.czlis.liswork.pojo.DTO.BatchCheckDTO;
 import com.czlis.liswork.pojo.DTO.work.BatchCheckDataDTO;
 
@@ -12,4 +13,6 @@ public interface BatchCheckService {
     Result checkData(List<BatchCheckDataDTO> batchCheckDTOList);
 
     Result unChekData(List<BatchCheckDataDTO> batchCheckDataDTO);
+
+    Result queryDetailResult(LabResult labResult);
 }

liswork/src/main/java/com/czlis/liswork/service/impl/work/BatchCheckServiceImpl.java

@@ -1,25 +1,18 @@
 package com.czlis.liswork.service.impl.work;
 
 
+import cn.hutool.core.date.DateUtil;
 import com.czlis.common.core.domain.Result;
-import com.czlis.common.core.domain.entity.lis.LabPat;
+import com.czlis.common.core.domain.entity.lis.*;
-import com.czlis.common.core.domain.entity.lis.LabPatwarning;
-import com.czlis.common.core.domain.entity.lis.LabReqmain;
-import com.czlis.common.core.domain.entity.lis.LabResult;
-import com.czlis.interfaceCommon.constants.ComLogConstants;
-import com.czlis.interfaceCommon.constants.LabPatConstants;
-import com.czlis.interfaceCommon.constants.LabReqmainConstants;
-import com.czlis.interfaceCommon.constants.LisinterfaceNameConstants;
-import com.czlis.interfaceCommon.pojo.inter.SetReport;
 import com.czlis.interfaceCommon.utils.CommonUtil;
 import com.czlis.interfaceCommon.utils.LisUtil;
 import com.czlis.interfaceCommon.utils.LisWorkUtils;
 import com.czlis.liswork.mapper.work.BatchCheckMapper;
 import com.czlis.liswork.pojo.DTO.BatchCheckDTO;
 import com.czlis.liswork.pojo.DTO.work.BatchCheckDataDTO;
+import com.czlis.liswork.pojo.VO.LabResultVO;
 import com.czlis.liswork.service.BatchCheckService;
 import lombok.extern.slf4j.Slf4j;
-import org.apache.commons.lang3.time.DateFormatUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -71,7 +64,7 @@ public class BatchCheckServiceImpl implements BatchCheckService {
             }
             List<LabResult> labResultList = commonUtil.getLabResultList(jyrq,yq,ybh);
             if (labResultList.size() <= 0) {
-                errText += "没有找到结果信息：" + LisUtil.isBank(jyrq) + " yq:" + LisUtil.isBank(yq) + " ybh:" + LisUtil.isBank(ybh) + "\r\n";
+                errText += "没有找到结果信息：" + DateUtil.format(jyrq,"yyyy-MM-dd") + " yq:" + LisUtil.isBank(yq) + " ybh:" + LisUtil.isBank(ybh) + "\r\n";
                 continue;
             }
             //审核
@@ -113,5 +106,30 @@ public class BatchCheckServiceImpl implements BatchCheckService {
         return new Result("1", "批量取消审核执行成功:" + i + "个，失败：" + i1 + "个，\r\n" + errText);
     }
 
+    @Override
+    public Result queryDetailResult(LabResult labResult) {
+        Date jyrq = labResult.getJyrq();
+        if(jyrq == null) return new Result("-1","检验日期不能为空！");
+        String yq = labResult.getYq();
+        if(yq == null || yq.equals("")) return new Result("-1","仪器不能为空！");
+        String ybh = labResult.getYbh();
+        if(ybh == null || ybh.equals("")) return new Result("-1","样本号不能为空！");
+        String xmdh = labResult.getXmdh();
+        if(xmdh == null) xmdh = "";
+        List<LabResult> labResultList = commonUtil.getLabResultList(jyrq, yq, ybh);
+        LabResultMed labResultMed = new LabResultMed();
+        labResultMed.setJyrq(jyrq);
+        labResultMed.setYq(yq);
+        labResultMed.setYbh(ybh);
+        if(!xmdh.equals("")){
+            labResultMed.setXmdh(xmdh);
+        }
+        List<LabResultMed> labResultMedList = commonUtil.getLabResultMed(labResultMed);
+        LabResultVO labResultVO = new LabResultVO();
+        labResultVO.setLabResultList(labResultList);
+        labResultVO.setLabResultMedList(labResultMedList);
+        return new Result("0","获取明细数据成功！",labResultVO);
+    }
+
 
 }