优化

ruoyi-admin/src/main/java/com/ruoyi/web/work/api/Api_ObrRequestController.java

@@ -2,6 +2,7 @@ package com.ruoyi.web.work.api;
 
 import com.ruoyi.common.core.domain.AjaxResult;
 import com.ruoyi.web.work.domain.Request;
+import com.ruoyi.web.work.domain.dto.ObrRequestDto;
 import com.ruoyi.web.work.service.IRequestService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -29,8 +30,9 @@ public class Api_ObrRequestController {
      */
     @ApiOperation(value = "检测报告列表")
     @GetMapping("/{patId}")
-    public AjaxResult getObrRequestByCardId(@PathVariable String patId){
-        List<Request> obrRequestList = obrRequestService.getRequestByPatId(patId);
+    public AjaxResult getObrRequestByCardId(@PathVariable String patId,@RequestParam(value = "startTime",required = false) String startTime,
+                                            @RequestParam(value = "endTime",required = false) String endTime){
+        List<ObrRequestDto> obrRequestList = obrRequestService.getRequestByPatId(patId,startTime,endTime);
         return AjaxResult.success(obrRequestList);
     }
 }

ruoyi-admin/src/main/java/com/ruoyi/web/work/api/Api_ObxResultController.java

@@ -2,6 +2,7 @@ package com.ruoyi.web.work.api;
 
 
 import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.web.work.domain.Report;
 import com.ruoyi.web.work.domain.Result;
 import com.ruoyi.web.work.service.IResultService;
 import io.swagger.annotations.Api;
@@ -29,11 +30,10 @@ public class Api_ObxResultController {
      * @param obrId
      * @return
      */
-    @ApiOperation(value = "检测报告列表")
+    @ApiOperation(value = "根据检测报告ID获取报告结果")
     @GetMapping("/{obrId}")
     public AjaxResult getObxResultByObrId(@PathVariable String obrId){
         List<Result> obxResults = obxResultService.getObxResultByObrId(obrId);
         return AjaxResult.success(obxResults);
     }
-
 }

ruoyi-admin/src/main/java/com/ruoyi/web/work/api/Api_VisitController.java

@@ -24,15 +24,15 @@ public class Api_VisitController {
     private IVisitService service;
 
     /**
-     * 根据就诊卡号获取就诊记录列表
-     * @param cardId
+     * 根据患者id获取就诊记录列表
+     * @param patId
      * @return
      */
     @ApiOperation(value = "就诊记录列表")
-    @GetMapping("/{cardId}")
-    public AjaxResult getVisitByCardId(@PathVariable String cardId,@RequestParam(value = "startTime",required = false) String startTime,
+    @GetMapping("/{patId}")
+    public AjaxResult getVisitByCardId(@PathVariable String patId,@RequestParam(value = "startTime",required = false) String startTime,
                                        @RequestParam(value = "endTime",required = false) String endTime){
-        List<Visit> visitList = service.getVisitByCardId(cardId,startTime,endTime);
+        List<Visit> visitList = service.getVisitByPatId(patId,startTime,endTime);
         return AjaxResult.success(visitList);
     }
 }

ruoyi-admin/src/main/java/com/ruoyi/web/work/domain/Diagnosis.java

@@ -6,7 +6,8 @@ import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.experimental.Accessors;
 
-import java.sql.Timestamp;
+import java.time.LocalDateTime;
+import java.util.Date;
 
 /**
  * 诊断信息
@@ -17,44 +18,31 @@ import java.sql.Timestamp;
 public class Diagnosis {
 
     private Long id;
-
     @ApiModelProperty(value = "就诊ID")
     private Long visitId;//就诊ID
-
     @ApiModelProperty(value = "患者ID")
     private Long patId;//患者ID
-
     @ApiModelProperty(value = "科室名称")
     private String departmentName; //科室名称
-
     @ApiModelProperty(value = "主治医师")
     private String doctor; //主治医师
-
     @ApiModelProperty(value = "诊断代码")
     private String diagnosticCode; //诊断代码
-
     @ApiModelProperty(value = "诊断名称")
     private String diagnosticName;//诊断名称
-
     @ApiModelProperty(value = "诊断时间")
-    private Timestamp diagnosisTime; //诊断时间
-
+    private String diagnosisTime; //诊断时间
     @ApiModelProperty(value = "诊断类型代码")
     private String diagnosticType; //诊断类型代码
-
     @ApiModelProperty(value = "诊断类别代码")
     private String diagnosticCategoryCode; //诊断类别代码
-
     private String createBy;
-
     @TableField(fill = FieldFill.INSERT)
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    private Timestamp createTime;
-
+    private Date createTime;
     private String updateBy;
-
     @TableField(fill = FieldFill.UPDATE)
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    private Timestamp updateTime;
+    private Date updateTime;
 
 }

ruoyi-admin/src/main/java/com/ruoyi/web/work/domain/Report.java

@@ -6,6 +6,7 @@ import io.swagger.annotations.ApiModelProperty;
 import lombok.experimental.Accessors;
 
 import java.sql.Timestamp;
+import java.util.Date;
 
 /**
  * @author lsw
@@ -22,50 +23,36 @@ public class Report{
     @ApiModelProperty(value = "就诊卡号")
     private String cardId;
 
-    @ApiModelProperty(value = "医嘱操作码")
-    private String operation;
+    @ApiModelProperty(value = "报告单号")
+    private String reportNo;
 
-    @ApiModelProperty(value = "申请单序号")
-    private String applicationNo;
+    @ApiModelProperty(value = "原始申请号")
+    private String originalApplicationNo;
 
-    @ApiModelProperty(value = "医嘱组号")
-    private String orderGroupNumber;
+    @ApiModelProperty(value = "医技单号")
+    private String orderNo;
 
-    @ApiModelProperty(value = "医嘱确认状态：0需确认 1已确认")
-    private String orderStatus;
+    @ApiModelProperty(value = "报告单类别代码")
+    private String reportClassCode;
 
-    @ApiModelProperty(value = "医嘱明细数量")
-    private String orderDetailsNumber;
+    @ApiModelProperty(value = "报告单类别名称")
+    private String reportClassname;
 
-    @ApiModelProperty(value = "医嘱录入者代码")
-    private String orderInputerCode;
+    @ApiModelProperty(value = "送检医生信息代码")
+    private String checkDoctorCode;
 
-    @ApiModelProperty(value = "医嘱录入者")
-    private String orderInputer;
+    @ApiModelProperty(value = "申请医生信息")
+    private String applyDoctorName;
 
-    @ApiModelProperty(value = "录入标志 0-his 系统，1-医技系统")
-    private String sign;
+    @ApiModelProperty(value = "检验医生信息代码")
+    private String testingDoctorCode;
 
-    @ApiModelProperty(value = "申请人信息代码")
-    private String orderApplicantCode;
-
-    @ApiModelProperty(value = "申请人信息名称")
-    private String orderApplicantName;
-
-    @ApiModelProperty(value = "医嘱生效日期")
-    private Timestamp effectiveDate;
-
-    @ApiModelProperty(value = "医嘱确认代码")
-    private String orderConfirmCode;
-
-    @ApiModelProperty(value = "医嘱确认姓名")
-    private String orderConfirmName;
-
-    @ApiModelProperty(value = "医嘱确认科室编码")
-    private String departmentCode;
-
-    @ApiModelProperty(value = "医嘱确认科室名称")
-    private String departmentName;
+    @ApiModelProperty(value = "检验医生信息名称")
+    private String testingDoctorName;
 
+    @ApiModelProperty(value = "送检科室代码")
+    private String inspectionDepartmentCode;
 
+    @ApiModelProperty(value = "送检科室名称")
+    private String inspectionDepartmentName;
 }

ruoyi-admin/src/main/java/com/ruoyi/web/work/domain/Request.java

@@ -6,6 +6,7 @@ import io.swagger.annotations.ApiModelProperty;
 import lombok.experimental.Accessors;
 
 import java.sql.Timestamp;
+import java.util.Date;
 
 /**
  * @author lsw
@@ -19,26 +20,12 @@ public class Request{
 
     private Long id;
 
-    @ApiModelProperty(value = "患者ID")
-    private Long patId;
+    @ApiModelProperty(value = "报告单ID")
+    private Long orcId;
 
-    @ApiModelProperty(value = "就诊卡号")
-    private String cardId;
+    @ApiModelProperty(value = "医技项目代码")
+    private String medTechProCode;
 
-    @ApiModelProperty(value = "医嘱操作码")
-    private String orcId;
-
-    @ApiModelProperty(value = "医嘱明细序号")
-    private String medOrderCode;
-
-    @ApiModelProperty(value = "报告单号")
-    private String reportNo;
-
-    @ApiModelProperty(value = "医技号")
-    private String medOrderNo;
-
-    @ApiModelProperty(value = "医技项目信息")
-    private String medTechProInfo;
 
     @ApiModelProperty(value = "医技项目名称")
     private String medTechProName;
@@ -46,78 +33,38 @@ public class Request{
     @ApiModelProperty(value = "报告单类别名称")
     private String reportClass;
 
-    @ApiModelProperty(value = "医嘱申请时间")
-    private Timestamp medOrderAppTime;
+    @ApiModelProperty(value = "报告完成时间")
+    private String reportCompleteTime;
 
-    @ApiModelProperty(value = "检验或检查开始时间")
-    private String chkStartTime;
+    @ApiModelProperty(value = "危机标志0- 正常1- 危机")
+    private String signs;
 
-    @ApiModelProperty(value = "危机报告标志")
-    private String reportStatus;
+    @ApiModelProperty(value = "样本收到日期")
+    private String sampleReceivedDate;
 
-    @ApiModelProperty(value = "检查部位或样本名称")
-    private String examinePart;
-
-    @ApiModelProperty(value = "申请医生代码")
-    private String appEmployeeId;
-
-    @ApiModelProperty(value = "申请医生姓名")
-    private String appEmployeeName;
-
-    @ApiModelProperty(value = "申请科室代码")
-    private String appDeptCode;
-
-    @ApiModelProperty(value = "申请科室名称")
-    private String appDeptName;
+    @ApiModelProperty(value = "检查部位或样本")
+    private String checkpoint;
 
     @ApiModelProperty(value = "执行科室代码")
-    private String executeDeptCode;
+    private String executeDepartmentCode;
 
     @ApiModelProperty(value = "执行科室名称")
-    private String executeDeptName;
-
-    @ApiModelProperty(value = "发布时间")
-    private Timestamp releaseTime;
+    private String executeDepartmentName;
 
-    @ApiModelProperty(value = "报告单类别编码")
-    private String repTypeCode;
+    @ApiModelProperty(value = "是否浏览 0：未浏览 1：已浏览")
+    private String isFlag;
 
-    @ApiModelProperty(value = "结果标志")
-    private String resultFlag;
+    @ApiModelProperty(value = "审核医生信息代码")
+    private String reviewDoctorCode;
 
-    @ApiModelProperty(value = "报告类型")
-    private String repType;
-
-    @ApiModelProperty(value = "报告审核Id")
-    private String checkEmployeeId;
-
-    @ApiModelProperty(value = "报告审核者")
-    private String checkEmployeeName;
-
-    @ApiModelProperty(value = "审核日期")
-    private Timestamp checkTime;
-
-    @ApiModelProperty(value = "报告发布者id")
-    private String publisherEmployeeId;
-
-    @ApiModelProperty(value = "报告发布者")
-    private String publisherEmployeeName;
-
-    @ApiModelProperty(value = "发布时间")
-    private Timestamp publisherTime;
-
-    @ApiModelProperty(value = "报告录入人ID")
-    private String reportEntryId;
-
-    @ApiModelProperty(value = "报告录入人名称")
-    private String reportEntryName;
+    @ApiModelProperty(value = "审核医生信息名称")
+    private String reviewDoctorName;
 
     @ApiModelProperty(value = "报告单日期")
-    private Timestamp enterTime;
-
-    @ApiModelProperty(value = "预约单号")
-    private String bookingNo;
+    private String reportDate;
 
+    @ApiModelProperty(value = "申请单序号集合")
+    private String reportNo;
 
 
 }

ruoyi-admin/src/main/java/com/ruoyi/web/work/domain/Visit.java

@@ -1,119 +1,63 @@
 package com.ruoyi.web.work.domain;
 
-import java.sql.Timestamp;
-import java.util.Date;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import com.baomidou.mybatisplus.annotation.FieldFill;
-import com.baomidou.mybatisplus.annotation.TableField;
-import lombok.Data;
-import com.baomidou.mybatisplus.annotation.TableName;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.experimental.Accessors;
-/**
- * @author lsw
- * @date 2024-07-23
-=======
 import com.baomidou.mybatisplus.annotation.*;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.experimental.Accessors;
 
+import java.sql.Timestamp;
 import java.time.LocalDateTime;
+import java.util.Date;
 
 /**
  * 就诊记录
->>>>>>> 69578e590975eaecfdcae1c17163fa34af959b7e
  */
 @Data
 @TableName(value = "tb_visit")
 @Accessors(chain = true)
-
 public class Visit {
-    private static final long serialVersionUID = 1L;
 
     private Long id;
-
     @ApiModelProperty(value = "患者ID")
     private Long patId;
-
     @ApiModelProperty(value = "就诊卡号")
     private Long cardId;
-
-    @ApiModelProperty(value = "患者类别")
+    @ApiModelProperty(value = "患者分类")
     private String patClass;
-
-    @ApiModelProperty(value = "患者位置")
-    private String bed;
-
     @ApiModelProperty(value = "科室")
     private String department;
-
-    @ApiModelProperty(value = "病区代码")
-    private String wardCode;
-
-    @ApiModelProperty(value = "病区代名称")
-    private String wardName;
-
-    @ApiModelProperty(value = "主治医师代码")
+    @ApiModelProperty(value = "床位")
+    private String bed;
+    @ApiModelProperty(value = "医生代码")
     private String doctorCode;
-
     @ApiModelProperty(value = "主治医师")
     private String physician;
-
     @ApiModelProperty(value = "主管护士代码")
     private String nurseCode;
-
     @ApiModelProperty(value = "入院次数")
     private String hospitalizedNumber;
-
     @ApiModelProperty(value = "收费类别")
     private String feeCategory;
-
-    @ApiModelProperty(value = "出院方式 1-治愈 2-好转 3 -稳定 4-恶化 5-死亡 9 -其他")
+    @ApiModelProperty(value = "出院方式")
     private String dischargeMethod;
-
     @ApiModelProperty(value = "医疗机构代码")
     private String medicalCode;
-
-    @ApiModelProperty(value = " 在院状态 0 入院登记 1 病区分床 2 病人出区 3 病人出院 4 取消结算 5 进入 ICU 6 进入产房 7 转科状态 8 数据转出 9 入院作")
+    @ApiModelProperty(value = "在院状态")
     private String hospitalStatus;
-
-    @ApiModelProperty(value = "门诊挂号状态： 0-有效 1-无效")
+    @ApiModelProperty(value = "门诊挂号状态")
     private String registrationStatus;
-
     @ApiModelProperty(value = "入院时间")
-    private Timestamp admissionTime;
-
+    private String admissionTime;
     @ApiModelProperty(value = "出院时间")
-    private Timestamp dischargeTime;
-
-    @ApiModelProperty(value = "危重级别:0-一般病人1-危重病人")
-    private String level;
-
-    @ApiModelProperty(value = "出区原因")
-    private String reasonArea;
-
-    @ApiModelProperty(value = "婴儿信息标识：Y-是 N-否")
-    private String babyCode;
-
-    @ApiModelProperty(value = "入区时间")
-    private Timestamp entryTime;
-
-    @ApiModelProperty(value = "出区时间")
-    private Timestamp exitTime;
-
+    private String dischargeTime;
+    private String createBy;  //创建人
     @TableField(fill = FieldFill.INSERT)
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    private Timestamp createTime;
-
-    @TableField(fill = FieldFill.INSERT)
-    private String createBy;
-
+    private Data createTime;  //创建时间
+    private String updateBy;  //更新人
     @TableField(fill = FieldFill.UPDATE)
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    private Timestamp updateTime;
+    private Data updateTime;  //更新时间
 
-    @TableField(fill = FieldFill.UPDATE)
-    private String updateBy;
 }

ruoyi-admin/src/main/java/com/ruoyi/web/work/mapper/ReportMapper.java

@@ -13,4 +13,6 @@ public interface ReportMapper extends BaseMapper<Report> {
     List<Report> selectList(Report report);
 
     List<Request> getAllReportByPatId(Long patId);
+
+    Report selectOrcReportByObcId(String orcId);
 }

ruoyi-admin/src/main/java/com/ruoyi/web/work/mapper/RequestMapper.java

@@ -4,6 +4,8 @@ import java.util.List;
 
 import com.ruoyi.web.work.domain.Request;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.ruoyi.web.work.domain.dto.ObrRequestDto;
+import org.apache.ibatis.annotations.Param;
 
 /**
  * @author lsw
@@ -17,5 +19,5 @@ public interface RequestMapper extends BaseMapper<Request> {
 
     List<Request> getAllRequestByPatId(Long patId);
 
-    List<Request> getRequestListByPatId(String patId);
+    List<Request> getRequestListByPatId(@Param("patId") String patId, @Param("startTime") String startTime, @Param("endTime") String endTime);
 }

ruoyi-admin/src/main/java/com/ruoyi/web/work/mapper/VisitMapper.java

@@ -22,4 +22,7 @@ public interface VisitMapper extends BaseMapper<Visit> {
     List<Visit> getVisitByTime(String beginTime, String endTime, Long patId);
 
     List<Visit> selectVisitsByCardId(String cardId);
+
+    //根据患者id查询就诊列表
+    List<Visit> selectVisitsByPatId(@Param("patId") String patId,@Param("startTime")String startTime,@Param("endTime")String endTime);
 }

ruoyi-admin/src/main/java/com/ruoyi/web/work/service/IReportService.java

@@ -14,4 +14,6 @@ public interface IReportService extends IService<Report>{
 
 
     List<Request> getAllReportByPatId(Long patId);
+
+    Report getOrcReportByObcId(String orcId);
 }

ruoyi-admin/src/main/java/com/ruoyi/web/work/service/IRequestService.java

@@ -4,6 +4,7 @@ import java.util.List;
 
 import com.ruoyi.web.work.domain.Request;
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.ruoyi.web.work.domain.dto.ObrRequestDto;
 
 
 /**
@@ -19,5 +20,5 @@ public interface IRequestService extends IService<Request>{
     List<Request> getAllRequestByPatId(Long patId);
 
     //根据患者id查询患者报告
-    List<Request> getRequestByPatId(String patId);
+    List<ObrRequestDto> getRequestByPatId(String patId, String startTime, String endTime);
 }

ruoyi-admin/src/main/java/com/ruoyi/web/work/service/IResultService.java

@@ -2,6 +2,7 @@ package com.ruoyi.web.work.service;
 
 import java.util.List;
 
+import com.ruoyi.web.work.domain.Report;
 import com.ruoyi.web.work.domain.Request;
 import com.ruoyi.web.work.domain.Result;
 import com.baomidou.mybatisplus.extension.service.IService;
@@ -20,4 +21,7 @@ public interface IResultService extends IService<Result>{
 
     //根据检测报告ID获取报告结果
     List<Result> getObxResultByObrId(String obrId);
+
+    //根据检测项目ORC_ID申请报告单
+    Report getOrcReportByObcId(String orcId);
 }

ruoyi-admin/src/main/java/com/ruoyi/web/work/service/IVisitService.java

@@ -21,6 +21,6 @@ public interface IVisitService extends IService<Visit>{
 
     List<Visit> getVisitByTime(String beginTime, String endTime, Long patId);
 
-    //根据就诊卡号获取就诊记录列表
-    List<Visit> getVisitByCardId(String cardId, String startTime, String endTime);
+    //根据患者Id获取就诊记录列表
+    List<Visit> getVisitByPatId(String patId,String startTime,String endTime);
 }

ruoyi-admin/src/main/java/com/ruoyi/web/work/service/impl/ReportServiceImpl.java

@@ -1,6 +1,5 @@
 package com.ruoyi.web.work.service.impl;
 
-import java.util.Collections;
 import java.util.List;
 
 import com.ruoyi.web.work.domain.Request;
@@ -30,5 +29,10 @@ public class ReportServiceImpl extends ServiceImpl<ReportMapper, Report> impleme
         return reportMapper.getAllReportByPatId(patId);
     }
 
+    @Override
+    public Report getOrcReportByObcId(String orcId) {
+        return reportMapper.selectOrcReportByObcId(orcId);
+    }
+
 
 }

ruoyi-admin/src/main/java/com/ruoyi/web/work/service/impl/RequestServiceImpl.java

@@ -1,15 +1,24 @@
 package com.ruoyi.web.work.service.impl;
 
+import java.sql.Timestamp;
+import java.util.ArrayList;
 import java.util.Collections;
+import java.util.Date;
 import java.util.List;
 
+import cn.hutool.captcha.CaptchaUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.ruoyi.web.work.domain.Visit;
+import com.ruoyi.web.work.domain.dto.ObrRequestDto;
+import com.ruoyi.web.work.mapper.VisitMapper;
+import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import com.ruoyi.web.work.mapper.RequestMapper;
 import com.ruoyi.web.work.domain.Request;
 import com.ruoyi.web.work.service.IRequestService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.util.CollectionUtils;
 
 /**
  * @author lsw
@@ -20,6 +29,8 @@ public class RequestServiceImpl extends ServiceImpl<RequestMapper, Request> impl
     @Autowired
     private RequestMapper requestMapper;
 
+    @Autowired
+    private VisitMapper visitMapper;
 
     @Override
     public List<Request> selectList(Request request) {
@@ -37,7 +48,25 @@ public class RequestServiceImpl extends ServiceImpl<RequestMapper, Request> impl
     }
 
     @Override
-    public List<Request> getRequestByPatId(String patId) {
-        return requestMapper.getRequestListByPatId(patId);
+    public List<ObrRequestDto> getRequestByPatId(String patId, String startTime, String endTime) {
+        List<ObrRequestDto> dtoList = new ArrayList<>();
+        //根据患者ID获取就诊的入院和出院时间
+        String admissionTime = null;//入院时间
+        String dischargeTime = null;//出院时间
+        List<Visit> visitList = visitMapper.selectVisitsByPatId(patId,null,null);
+        if (!CollectionUtils.isEmpty(visitList)){
+            Visit visitEntity = visitList.get(visitList.size() - 1); //获取最后一次就诊记录
+            admissionTime = visitEntity.getAdmissionTime();//入院时间
+            dischargeTime = visitEntity.getDischargeTime();//出院时间
+        }
+        List<Request> requests = requestMapper.getRequestListByPatId(patId, startTime, endTime);
+        for (Request request : requests) {
+            ObrRequestDto dto = new ObrRequestDto();
+            dto.setAdmissionTime(admissionTime);
+            dto.setDischargeTime(dischargeTime);
+            BeanUtils.copyProperties(request,dto);
+            dtoList.add(dto);
+        }
+        return dtoList;
     }
 }

ruoyi-admin/src/main/java/com/ruoyi/web/work/service/impl/ResultServiceImpl.java

@@ -4,7 +4,9 @@ import java.util.Collections;
 import java.util.List;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.ruoyi.web.work.domain.Report;
 import com.ruoyi.web.work.domain.Request;
+import com.ruoyi.web.work.mapper.ReportMapper;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import com.ruoyi.web.work.mapper.ResultMapper;
@@ -21,6 +23,9 @@ public class ResultServiceImpl extends ServiceImpl<ResultMapper, Result> impleme
     @Autowired
     private ResultMapper resultMapper;
 
+    @Autowired
+    private ReportMapper reportMapper;
+
     @Override
     public List<Result> selectList(Result result) {
         return resultMapper.selectList(result);
@@ -41,6 +46,10 @@ public class ResultServiceImpl extends ServiceImpl<ResultMapper, Result> impleme
         return resultMapper.selectResultByObrId(obrId);
     }
 
+    @Override
+    public Report getOrcReportByObcId(String orcId) {
+        return reportMapper.selectOrcReportByObcId(orcId);
+    }
 
 
 }

ruoyi-admin/src/main/java/com/ruoyi/web/work/service/impl/VisitServiceImpl.java

@@ -46,9 +46,7 @@ public class VisitServiceImpl extends ServiceImpl<VisitMapper, Visit> implements
     }
 
     @Override
-    public List<Visit> getVisitByCardId(String cardId, String startTime, String endTime) {
-        return baseMapper.selectVisitsByCardId(cardId);
+    public List<Visit> getVisitByPatId(String patId,String startTime,String endTime) {
+        return visitMapper.selectVisitsByPatId(patId,startTime,endTime);
     }
-
-
 }

ruoyi-admin/src/main/resources/mapper/work/ReportMapper.xml

@@ -33,5 +33,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
               ( SELECT tb_visit.card_id FROM tb_visit WHERE tb_visit.pat_id = #{patId} )
     </select>
 
+    <select id="selectOrcReportByObcId" resultType="com.ruoyi.web.work.domain.Report">
+        SELECT * FROM tb_orc_report
+        WHERE id = #{orcId}
+    </select>
 
 </mapper>

ruoyi-admin/src/main/resources/mapper/work/RequestMapper.xml

@@ -54,10 +54,19 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
     </select>
 
-
+    <!--小程序检测报告列表-->
     <select id="getRequestListByPatId" resultType="com.ruoyi.web.work.domain.Request">
-        select * from tb_obr_request
-        WHERE pat_id=#{patId}
+        SELECT
+            *
+        FROM
+            tb_orc_report orc
+                LEFT JOIN tb_obr_request obr ON orc.id = obr.orc_id
+                LEFT JOIN tb_visit vi ON vi.card_id = orc.card_id
+        WHERE
+            orc.pat_id = #{patId}
+        <if test="startTime != null and endTime != null">
+            AND vi.admission_time BETWEEN #{startTime} AND #{endTime}
+        </if>
     </select>
 
 </mapper>

ruoyi-admin/src/main/resources/mapper/work/VisitMapper.xml

@@ -79,5 +79,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         select * from tb_visit where card_id=#{cardId}
     </select>
 
+    <select id="selectVisitsByPatId" resultType="com.ruoyi.web.work.domain.Visit">
+        select * from tb_visit where pat_id=#{patId}
+        <if test="startTime != null and endTime != null">
+            AND admission_time BETWEEN #{startTime} AND #{endTime}
+        </if>
+    </select>
 
 </mapper>