fix：修改数据库表

ruoyi-admin/src/main/java/com/ruoyi/web/work/controller/DiagnosisController.java

@@ -41,11 +41,6 @@ public class DiagnosisController extends BaseController {
     public TableDataInfo list(Diagnosis diagnosis){
         startPage();
         List<Diagnosis> list = dgService.selectList(diagnosis);
-
-        System.out.println("diagnosis: "+diagnosis);
-        System.out.println("list: "+list);
-
-
         return getDataTable(list);
     }
 

ruoyi-admin/src/main/java/com/ruoyi/web/work/controller/RequestController.java

@@ -31,7 +31,7 @@ public class RequestController extends BaseController {
     @Autowired
     private IRequestService requestService;
 
-    @ApiOperation(value = "根据患者ID获取此人的全部科室申请列表")
+    @ApiOperation(value = "根据患者ID获取此人的全部检查项目列表")
     //@PreAuthorize("@ss.hasPermi('work:request:list')")
     @GetMapping("/patid/{patId}")
     public TableDataInfo getAllRequestByPatId(@PathVariable("patId") Long patId){

ruoyi-admin/src/main/java/com/ruoyi/web/work/controller/ResultController.java

@@ -31,7 +31,7 @@ public class ResultController extends BaseController {
     private IResultService resultService;
 
 
-    @ApiOperation(value = "根据患者ID获取此人的全部检查项目列表")
+    @ApiOperation(value = "根据患者ID获取此人的全部检查结果列表")
     //@PreAuthorize("@ss.hasPermi('work:request:list')")
     @GetMapping("/patid/{patId}")
     public TableDataInfo getAllResultByPatId(@PathVariable("patId") Long patId){

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

@@ -6,7 +6,9 @@ import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.experimental.Accessors;
 
+import java.sql.Date;
 import java.sql.Timestamp;
+import java.time.LocalDateTime;
 
 /**
  * 诊断信息
@@ -37,7 +39,7 @@ public class Diagnosis {
     private String diagnosticName;//诊断名称
 
     @ApiModelProperty(value = "诊断时间")
-    private Timestamp diagnosisTime; //诊断时间
+    private String diagnosisTime; //诊断时间
 
     @ApiModelProperty(value = "诊断类型代码")
     private String diagnosticType; //诊断类型代码
@@ -49,12 +51,12 @@ public class Diagnosis {
 
     @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/NextOfKin.java

@@ -1,6 +1,5 @@
 package com.ruoyi.web.work.domain;
 
-import java.sql.Timestamp;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.baomidou.mybatisplus.annotation.FieldFill;
 import com.baomidou.mybatisplus.annotation.TableField;
@@ -8,6 +7,9 @@ import lombok.Data;
 import com.baomidou.mybatisplus.annotation.TableName;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.experimental.Accessors;
+
+import java.util.Date;
+
 /**
  * @author lsw
  * @date 2024-07-19
@@ -49,14 +51,14 @@ public class NextOfKin{
 
     @TableField(fill = FieldFill.INSERT)
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    private Timestamp createTime;
+    private Date createTime;
 
     @TableField(fill = FieldFill.UPDATE)
-    private Timestamp updateBy;
+    private Date 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/Patient.java

@@ -1,7 +1,6 @@
 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;
@@ -9,6 +8,10 @@ import lombok.Data;
 import com.baomidou.mybatisplus.annotation.TableName;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.experimental.Accessors;
+
+import java.time.LocalDateTime;
+import java.util.Date;
+
 /**
  * @author lmx
  * @date 2024-07-22
@@ -32,7 +35,7 @@ public class Patient{
 
     @ApiModelProperty(value = "出生时间")
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    private Timestamp birthDate;
+    private String birthDate;
 
     @ApiModelProperty(value = "性别")
     private String sex;
@@ -60,7 +63,7 @@ public class Patient{
 
     @ApiModelProperty(value = "事件触发时间")
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    private Timestamp eventTime;
+    private String eventTime;
 
     @ApiModelProperty(value = "住院业务类型：(1入院登记 2入区登记 3转区接收(出A区后入B区) 4转科转床接收(同科室换床) 5出区 6出区召回 7出院 8取消出院 9新生儿登记 10修改病人信息 门诊业务类型： 1患者建卡 2修改病人信息 3门诊挂号 4取消挂号 5就诊结束)")
     private String eventType;
@@ -85,7 +88,7 @@ public class Patient{
     @ApiModelProperty(value = "创建时间")
     @TableField(fill = FieldFill.INSERT)
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    private Timestamp createTime;
+    private Date createTime;
 
     @ApiModelProperty(value = "更新人")
     @TableField(fill = FieldFill.UPDATE)
@@ -95,6 +98,6 @@ public class Patient{
     @ApiModelProperty(value = "更新时间")
     @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.time.LocalDateTime;
 
 /**
  * @author lsw
@@ -17,55 +18,48 @@ import java.sql.Timestamp;
 public class Report{
     private static final long serialVersionUID = 1L;
 
-    private Long id;
-
-    @ApiModelProperty(value = "就诊卡号")
-    private String cardId;
 
-    @ApiModelProperty(value = "医嘱操作码")
-    private String operation;
+    private Long id;
 
-    @ApiModelProperty(value = "申请单序号")
-    private String applicationNo;
+    @ApiModelProperty(value = "患者ID(当前患者存在则有患者ID)")
+    private Long patId;
 
-    @ApiModelProperty(value = "医嘱组号")
-    private String orderGroupNumber;
+    @ApiModelProperty(value = "就诊卡号")
+    private Long cardId;
 
-    @ApiModelProperty(value = "医嘱确认状态：0需确认 1已确认")
-    private String orderStatus;
+    @ApiModelProperty(value = "报告单号")
+    private String reportNo;
 
-    @ApiModelProperty(value = "医嘱明细数量")
-    private String orderDetailsNumber;
+    @ApiModelProperty(value = "原始申请号")
+    private String originalApplicationNo;
 
-    @ApiModelProperty(value = "医嘱录入者代码")
-    private String orderInputerCode;
+    @ApiModelProperty(value = "医技单号")
+    private String orderNo;
 
-    @ApiModelProperty(value = "医嘱录入者")
-    private String orderInputer;
+    @ApiModelProperty(value = "报告单类别代码")
+    private String reportClassCode;
 
-    @ApiModelProperty(value = "录入标志 0-his 系统，1-医技系统")
-    private String sign;
+    @ApiModelProperty(value = "报告单类别名称")
+    private String reportClassName;
 
-    @ApiModelProperty(value = "申请人信息代码")
-    private String orderApplicantCode;
+    @ApiModelProperty(value = "送检医生信息代码")
+    private String checkDoctorCode;
 
-    @ApiModelProperty(value = "申请人信息名称")
-    private String orderApplicantName;
+    @ApiModelProperty(value = "申请医生信息")
+    private String applyDoctorName;
 
-    @ApiModelProperty(value = "医嘱生效日期")
-    private Timestamp effectiveDate;
+    @ApiModelProperty(value = "检验医生信息代码")
+    private String testingDoctorCode;
 
-    @ApiModelProperty(value = "医嘱确认代码")
-    private String orderConfirmCode;
+    @ApiModelProperty(value = "检验医生信息名称")
+    private String testingDoctorName;
 
-    @ApiModelProperty(value = "医嘱确认姓名")
-    private String orderConfirmName;
+    @ApiModelProperty(value = "送检科室代码")
+    private String inspectionDepartmentCode;
 
-    @ApiModelProperty(value = "医嘱确认科室编码")
-    private String departmentCode;
+    @ApiModelProperty(value = "送检科室名称")
+    private String inspectionDepartmentName;
 
-    @ApiModelProperty(value = "医嘱确认科室名称")
-    private String departmentName;
 
 
 }

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

@@ -1,11 +1,13 @@
 package com.ruoyi.web.work.domain;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
 import com.baomidou.mybatisplus.annotation.TableName;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.experimental.Accessors;
 
 import java.sql.Timestamp;
+import java.util.Date;
 
 /**
  * @author lsw
@@ -17,28 +19,14 @@ import java.sql.Timestamp;
 public class Request{
     private static final long serialVersionUID = 1L;
 
-    private Long id;
-
-    @ApiModelProperty(value = "患者ID")
-    private Long patId;
-
-    @ApiModelProperty(value = "就诊卡号")
-    private String cardId;
 
-    @ApiModelProperty(value = "医嘱操作码")
-    private String orcId;
-
-    @ApiModelProperty(value = "医嘱明细序号")
-    private String medOrderCode;
-
-    @ApiModelProperty(value = "报告单号")
-    private String reportNo;
+    private Long id;
 
-    @ApiModelProperty(value = "医技号")
-    private String medOrderNo;
+    @ApiModelProperty(value = "报告单ID")
+    private Long orcId;
 
-    @ApiModelProperty(value = "医技项目信息")
-    private String medTechProInfo;
+    @ApiModelProperty(value = "医技项目代码")
+    private String medTechProCode;
 
     @ApiModelProperty(value = "医技项目名称")
     private String medTechProName;
@@ -46,77 +34,42 @@ public class Request{
     @ApiModelProperty(value = "报告单类别名称")
     private String reportClass;
 
-    @ApiModelProperty(value = "医嘱申请时间")
-    private Timestamp medOrderAppTime;
-
-    @ApiModelProperty(value = "检验或检查开始时间")
-    private String chkStartTime;
-
-    @ApiModelProperty(value = "危机报告标志")
-    private String reportStatus;
-
-    @ApiModelProperty(value = "检查部位或样本名称")
-    private String examinePart;
-
-    @ApiModelProperty(value = "申请医生代码")
-    private String appEmployeeId;
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @ApiModelProperty(value = "报告完成时间")
+    private String reportCompleteTime;
 
-    @ApiModelProperty(value = "申请医生姓名")
-    private String appEmployeeName;
+    @ApiModelProperty(value = "危机标志 0- 正常 1- 危机")
+    private String signs;
 
-    @ApiModelProperty(value = "申请科室代码")
-    private String appDeptCode;
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @ApiModelProperty(value = "样本收到日期")
+    private String sampleReceivedDate;
 
-    @ApiModelProperty(value = "申请科室名称")
-    private String appDeptName;
+    @ApiModelProperty(value = "检查部位或样本")
+    private String checkpoint;
 
     @ApiModelProperty(value = "执行科室代码")
-    private String executeDeptCode;
+    private String executeDepartmentCode;
 
     @ApiModelProperty(value = "执行科室名称")
-    private String executeDeptName;
+    private String executeDepartmentName;
 
-    @ApiModelProperty(value = "发布时间")
-    private Timestamp releaseTime;
+    @ApiModelProperty(value = "是否浏览 0：未浏览 1：已浏览")
+    private String isFlag;
 
-    @ApiModelProperty(value = "报告单类别编码")
-    private String repTypeCode;
+    @ApiModelProperty(value = "审核医生信息代码")
+    private String reviewDoctorCode;
 
-    @ApiModelProperty(value = "结果标志")
-    private String resultFlag;
-
-    @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;
 
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     @ApiModelProperty(value = "报告单日期")
-    private Timestamp enterTime;
+    private String reportDate;
+
+    @ApiModelProperty(value = "申请单序号集合")
+    private String reportNo;
 
-    @ApiModelProperty(value = "预约单号")
-    private String bookingNo;
 
 
 

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

@@ -1,6 +1,7 @@
 package com.ruoyi.web.work.domain;
 
 import java.sql.Timestamp;
+import java.time.LocalDateTime;
 import java.util.Date;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.baomidou.mybatisplus.annotation.FieldFill;
@@ -83,10 +84,10 @@ public class Visit {
     private String registrationStatus;
 
     @ApiModelProperty(value = "入院时间")
-    private Timestamp admissionTime;
+    private String admissionTime;
 
     @ApiModelProperty(value = "出院时间")
-    private Timestamp dischargeTime;
+    private String dischargeTime;
 
     @ApiModelProperty(value = "危重级别:0-一般病人1-危重病人")
     private String level;
@@ -98,21 +99,21 @@ public class Visit {
     private String babyCode;
 
     @ApiModelProperty(value = "入区时间")
-    private Timestamp entryTime;
+    private String entryTime;
 
     @ApiModelProperty(value = "出区时间")
-    private Timestamp exitTime;
+    private String exitTime;
 
     @TableField(fill = FieldFill.INSERT)
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    private Timestamp createTime;
+    private Date createTime;
 
     @TableField(fill = FieldFill.INSERT)
     private String createBy;
 
     @TableField(fill = FieldFill.UPDATE)
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    private Timestamp updateTime;
+    private Date updateTime;
 
     @TableField(fill = FieldFill.UPDATE)
     private String updateBy;

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

@@ -7,30 +7,25 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <select id="selectList" resultType="com.ruoyi.web.work.domain.Report">
         select * from tb_report
         <where>
-            <if test="id != null "> and id = #{id}</if>
-            <if test="cardId != null  and cardId != ''"> and card_id = #{cardId}</if>
-            <if test="operation != null  and operation != ''"> and operation = #{operation}</if>
-            <if test="applicationNo != null  and applicationNo != ''"> and application_no = #{applicationNo}</if>
-            <if test="orderGroupNumber != null  and orderGroupNumber != ''"> and order_group_number = #{orderGroupNumber}</if>
-            <if test="orderStatus != null  and orderStatus != ''"> and order_status = #{orderStatus}</if>
-            <if test="orderDetailsNumber != null  and orderDetailsNumber != ''"> and order_details_number = #{orderDetailsNumber}</if>
-            <if test="orderInputerCode != null  and orderInputerCode != ''"> and order_inputer_code = #{orderInputerCode}</if>
-            <if test="orderInputer != null  and orderInputer != ''"> and order_inputer = #{orderInputer}</if>
-            <if test="sign != null  and sign != ''"> and sign = #{sign}</if>
-            <if test="orderApplicantCode != null  and orderApplicantCode != ''"> and order_applicant_code = #{orderApplicantCode}</if>
-            <if test="orderApplicantName != null  and orderApplicantName != ''"> and order_applicant_name like concat('%', #{orderApplicantName}, '%')</if>
-            <if test="effectiveDate != null  and effectiveDate != ''"> and effective_date = #{effectiveDate}</if>
-            <if test="orderConfirmCode != null  and orderConfirmCode != ''"> and order_confirm_code = #{orderConfirmCode}</if>
-            <if test="orderConfirmName != null  and orderConfirmName != ''"> and order_confirm_name like concat('%', #{orderConfirmName}, '%')</if>
-            <if test="departmentCode != null  and departmentCode != ''"> and department_code = #{departmentCode}</if>
-            <if test="departmentName != null  and departmentName != ''"> and department_name like concat('%', #{departmentName}, '%')</if>
+            <if test="patId != null "> and pat_id = #{patId}</if>
+            <if test="cardId != null "> and card_id = #{cardId}</if>
+            <if test="reportNo != null and reportNo != ''"> and report_no = #{reportNo}</if>
+            <if test="originalApplicationNo != null and originalApplicationNo != ''"> and original_application_no = #{originalApplicationNo}</if>
+            <if test="orderNo != null and orderNo != ''"> and order_no = #{orderNo}</if>
+            <if test="reportClassCode != null and reportClassCode != ''"> and report_class_code = #{reportClassCode}</if>
+            <if test="reportClassName != null and reportClassName != ''"> and report_class_name like concat('%', #{reportClassName}, '%')</if>
+            <if test="checkDoctorCode != null and checkDoctorCode != ''"> and check_doctor_code = #{checkDoctorCode}</if>
+            <if test="applyDoctorName != null and applyDoctorName != ''"> and apply_doctor_name like concat('%', #{applyDoctorName}, '%')</if>
+            <if test="testingDoctorCode != null and testingDoctorCode != ''"> and testing_doctor_code = #{testingDoctorCode}</if>
+            <if test="testingDoctorName != null and testingDoctorName != ''"> and testing_doctor_name like concat('%', #{testingDoctorName}, '%')</if>
+            <if test="inspectionDepartmentCode != null and inspectionDepartmentCode != ''"> and inspection_department_code = #{inspectionDepartmentCode}</if>
+            <if test="inspectionDepartmentName != null and inspectionDepartmentName != ''"> and inspection_department_name like concat('%', #{inspectionDepartmentName}, '%')</if>
         </where>
     </select>
 
-    <select id="getAllReportByPatId" resultType="com.ruoyi.web.work.domain.Request">
+    <select id="getAllReportByPatId" resultType="com.ruoyi.web.work.domain.Report">
         SELECT * FROM tb_orc_report
-        WHERE tb_orc_report.card_id IN
-              ( SELECT tb_visit.card_id FROM tb_visit WHERE tb_visit.pat_id = #{patId} )
+        WHERE tb_orc_report.pat_id=#{patId}
     </select>
 
 

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

@@ -7,39 +7,21 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <select id="selectList" resultType="com.ruoyi.web.work.domain.Request">
         select * from tb_obr_request
         <where>
-            <if test="id != null "> and id = #{id}</if>
-            <if test="cardId != null  and cardId != ''"> and card_id = #{cardId}</if>
-            <if test="orcId != null  and orcId != ''"> and orc_id = #{orcId}</if>
-            <if test="medOrderCode != null  and medOrderCode != ''"> and med_order_code = #{medOrderCode}</if>
-            <if test="reportNo != null  and reportNo != ''"> and report_no = #{reportNo}</if>
-            <if test="medOrderNo != null  and medOrderNo != ''"> and med_order_no = #{medOrderNo}</if>
-            <if test="medTechProInfo != null  and medTechProInfo != ''"> and med_tech_pro_info = #{medTechProInfo}</if>
-            <if test="medTechProName != null  and medTechProName != ''"> and med_tech_pro_name like concat('%', #{medTechProName}, '%')</if>
-            <if test="reportClass != null  and reportClass != ''"> and report_class = #{reportClass}</if>
-            <if test="medOrderAppTime != null  and medOrderAppTime != ''"> and med_order_app_time = #{medOrderAppTime}</if>
-            <if test="chkStartTime != null  and chkStartTime != ''"> and chk_start_time = #{chkStartTime}</if>
-            <if test="reportStatus != null  and reportStatus != ''"> and report_status = #{reportStatus}</if>
-            <if test="examinePart != null  and examinePart != ''"> and examine_part = #{examinePart}</if>
-            <if test="appEmployeeId != null  and appEmployeeId != ''"> and app_employee_id = #{appEmployeeId}</if>
-            <if test="appEmployeeName != null  and appEmployeeName != ''"> and app_employee_name like concat('%', #{appEmployeeName}, '%')</if>
-            <if test="appDeptCode != null  and appDeptCode != ''"> and app_dept_code = #{appDeptCode}</if>
-            <if test="appDeptName != null  and appDeptName != ''"> and app_dept_name like concat('%', #{appDeptName}, '%')</if>
-            <if test="executeDeptCode != null  and executeDeptCode != ''"> and execute_dept_code = #{executeDeptCode}</if>
-            <if test="executeDeptName != null  and executeDeptName != ''"> and execute_dept_name like concat('%', #{executeDeptName}, '%')</if>
-            <if test="releaseTime != null  and releaseTime != ''"> and release_time = #{releaseTime}</if>
-            <if test="repTypeCode != null  and repTypeCode != ''"> and rep_type_code = #{repTypeCode}</if>
-            <if test="resultFlag != null  and resultFlag != ''"> and result_flag = #{resultFlag}</if>
-            <if test="repType != null  and repType != ''"> and rep_type = #{repType}</if>
-            <if test="checkEmployeeId != null  and checkEmployeeId != ''"> and check_employee_id = #{checkEmployeeId}</if>
-            <if test="checkEmployeeName != null  and checkEmployeeName != ''"> and check_employee_name like concat('%', #{checkEmployeeName}, '%')</if>
-            <if test="checkTime != null  and checkTime != ''"> and check_time = #{checkTime}</if>
-            <if test="publisherEmployeeId != null  and publisherEmployeeId != ''"> and publisher_employee_id = #{publisherEmployeeId}</if>
-            <if test="publisherEmployeeName != null  and publisherEmployeeName != ''"> and publisher_employee_name like concat('%', #{publisherEmployeeName}, '%')</if>
-            <if test="publisherTime != null  and publisherTime != ''"> and publisher_time = #{publisherTime}</if>
-            <if test="reportEntryId != null  and reportEntryId != ''"> and report_entry_id = #{reportEntryId}</if>
-            <if test="reportEntryName != null  and reportEntryName != ''"> and report_entry_name like concat('%', #{reportEntryName}, '%')</if>
-            <if test="enterTime != null  and enterTime != ''"> and enter_time = #{enterTime}</if>
-            <if test="bookingNo != null  and bookingNo != ''"> and booking_no = #{bookingNo}</if>
+            <if test="orcId != null "> and orc_id = #{orcId}</if>
+            <if test="medTechProCode != null and medTechProCode != ''"> and med_tech_pro_code = #{medTechProCode}</if>
+            <if test="medTechProName != null and medTechProName != ''"> and med_tech_pro_name like concat('%', #{medTechProName}, '%')</if>
+            <if test="reportClass != null and reportClass != ''"> and report_class = #{reportClass}</if>
+            <if test="reportCompleteTime != null "> and report_complete_time = #{reportCompleteTime}</if>
+            <if test="signs != null and signs != ''"> and signs = #{signs}</if>
+            <if test="sampleReceivedDate != null "> and sample_received_date = #{sampleReceivedDate}</if>
+            <if test="checkpoint != null and checkpoint != ''"> and checkpoint = #{checkpoint}</if>
+            <if test="executeDepartmentCode != null and executeDepartmentCode != ''"> and execute_department_code = #{executeDepartmentCode}</if>
+            <if test="executeDepartmentName != null and executeDepartmentName != ''"> and execute_department_name like concat('%', #{executeDepartmentName}, '%')</if>
+            <if test="isFlag != null and isFlag != ''"> and is_flag = #{isFlag}</if>
+            <if test="reviewDoctorCode != null and reviewDoctorCode != ''"> and review_doctor_code = #{reviewDoctorCode}</if>
+            <if test="reviewDoctorName != null and reviewDoctorName != ''"> and review_doctor_name like concat('%', #{reviewDoctorName}, '%')</if>
+            <if test="reportDate != null "> and report_date = #{reportDate}</if>
+            <if test="reportNo != null and reportNo != ''"> and report_no = #{reportNo}</if>
         </where>
     </select>
 
@@ -48,9 +30,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </select>
 
     <select id="getAllRequestByPatId" resultType="com.ruoyi.web.work.domain.Request">
-        select * from tb_obr_request
-        WHERE tb_obr_request.card_id in
-              (SELECT tb_visit.card_id from tb_visit where tb_visit.pat_id=#{patId} )
+        SELECT * from tb_obr_request
+        where tb_obr_request.orc_id in
+              (SELECT tb_orc_report.id from tb_orc_report where tb_orc_report.pat_id=#{patId})
 
     </select>
 

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

@@ -34,8 +34,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         SELECT * FROM tb_obx_result
         WHERE tb_obx_result.obr_id IN
               (SELECT tb_obr_request.id FROM tb_obr_request
-                    WHERE tb_obr_request.card_id IN
-                        ( SELECT tb_visit.card_id FROM tb_visit WHERE tb_visit.pat_id = #{patId} ))
+               WHERE tb_obr_request.orc_id IN
+                     ( SELECT tb_orc_report.id FROM tb_orc_report WHERE tb_orc_report.pat_id =#{patId} ))
     </select>