优化

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

@@ -0,0 +1,14 @@
+package com.ruoyi.web.work.domain.dto;
+
+import com.ruoyi.web.work.domain.Report;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.experimental.Accessors;
+
+@Data
+@Accessors(chain = true)
+public class ReportDto extends Report {
+
+    @ApiModelProperty(value = "医技项目名称")
+    private String medTechProName;
+}

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

@@ -20,4 +20,6 @@ public interface RequestMapper extends BaseMapper<Request> {
     List<Request> getAllRequestByPatId(Long patId);
 
     List<Request> getRequestListByPatId(@Param("patId") String patId, @Param("startTime") String startTime, @Param("endTime") String endTime);
+
+    Request selectOrcReportByOrcId(String orcId);
 }

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

@@ -4,6 +4,7 @@ import java.util.List;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.ruoyi.web.work.domain.Report;
 import com.ruoyi.web.work.domain.Request;
+import com.ruoyi.web.work.domain.dto.ReportDto;
 
 /**
  * @author lsw
@@ -15,5 +16,5 @@ public interface IReportService extends IService<Report>{
 
     List<Request> getAllReportByPatId(Long patId);
 
-    Report getOrcReportByObcId(String orcId);
+    ReportDto getOrcReportByObcId(String orcId);
 }

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

@@ -3,6 +3,9 @@ package com.ruoyi.web.work.service.impl;
 import java.util.List;
 
 import com.ruoyi.web.work.domain.Request;
+import com.ruoyi.web.work.domain.dto.ReportDto;
+import com.ruoyi.web.work.mapper.RequestMapper;
+import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import com.ruoyi.web.work.mapper.ReportMapper;
@@ -19,6 +22,9 @@ public class ReportServiceImpl extends ServiceImpl<ReportMapper, Report> impleme
     @Autowired
     private ReportMapper reportMapper;
 
+    @Autowired
+    private RequestMapper requestMapper;
+
     @Override
     public List<Report> selectList(Report report) {
         return reportMapper.selectList(report);
@@ -30,8 +36,15 @@ public class ReportServiceImpl extends ServiceImpl<ReportMapper, Report> impleme
     }
 
     @Override
-    public Report getOrcReportByObcId(String orcId) {
-        return reportMapper.selectOrcReportByObcId(orcId);
+    public ReportDto getOrcReportByObcId(String orcId) {
+        ReportDto dto = new ReportDto();
+        //根据orcId查得到检查项目名称
+        Request request = requestMapper.selectOrcReportByOrcId(orcId);
+        String medTechProName = request.getMedTechProName();
+        Report report = reportMapper.selectOrcReportByObcId(orcId);
+        BeanUtils.copyProperties(report,dto);
+        dto.setMedTechProName(medTechProName);
+        return dto;
     }
 
 

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

@@ -51,4 +51,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         </if>
     </select>
 
+    <select id="selectOrcReportByOrcId" resultType="com.ruoyi.web.work.domain.Request">
+        SELECT * from tb_obr_request
+        where orc_id = #{orcId}
+    </select>
+
 </mapper>