Merge remote-tracking branch 'origin/master_179_20250814' into master_179_20250814

fs-service/src/main/java/com/fs/medical/mapper/ReportIndicatorResultMapper.java

@@ -73,15 +73,31 @@ public interface ReportIndicatorResultMapper {
     /**
      * 分页查询报告指标检查结果列表
      */
-    @Select("SELECT rir.result_id,\\n\" +\n" +
-            "            \"rir.report_id,\\n\" +\n" +
-            "            \"rir.indicator_id,\\n\" +\n" +
-            "            \"mi.indicator_name,\\n\" +\n" +
-            "            \"concat(mi.reference_min,' ~ ',mi.reference_max) as ref_range,\\n\" +\n" +
-            "            \"rir.test_value,rir.test_result,rir.is_abnormal,rir.remarks,rir.create_time,rir.update_time\\n\" +\n" +
-            "            \"FROM fs_report_indicator_result  rir\\n\" +\n" +
-            "            \"left join fs_medical_indicator mi\\n\" +\n" +
-            "            \"on rir.indicator_id=mi.indicator_id and rir.report_id=#{reportId}")
+    @Select("<script>" +
+            "SELECT rir.result_id, " +
+            "rir.report_id, " +
+            "rir.indicator_id, " +
+            "mi.indicator_name, " +
+            "concat(mi.reference_min,' ~ ',mi.reference_max) as ref_range, " +
+            "rir.test_value, " +
+            "rir.test_result, " +
+            "rir.is_abnormal, " +
+            "rir.remarks, " +
+            "rir.create_time, " +
+            "rir.update_time " +
+            "FROM fs_report_indicator_result rir " +
+            "LEFT JOIN fs_medical_indicator mi ON rir.indicator_id = mi.indicator_id " +
+            "WHERE rir.report_id = #{reportId} " +
+            "<if test='indicatorName != null and indicatorName != \"\"'>" +
+            "AND mi.indicator_name LIKE CONCAT('%', #{indicatorName}, '%') " +
+            "</if>" +
+            "<if test='indicatorCateId != null'>" +
+            "AND rir.indicator_cate_id = #{indicatorCateId} " +
+            "</if>" +
+            "<if test='orderBy != null and orderBy != \"\"'>" +
+            "ORDER BY ${orderBy} " +
+            "</if>" +
+            "</script>")
     List<ReportIndicatorResult> selectPageList(ReportIndicatorResultQueryDto queryDto);
 
     @Select("select distinct indicator_cate_id as cate_id from fs_report_indicator_result where report_id=#{reportId}")

fs-service/src/main/java/com/fs/medical/param/ReportIndicatorResultQueryDto.java

@@ -18,6 +18,11 @@ public class ReportIndicatorResultQueryDto implements Serializable {
     @ApiModelProperty(value = "报告ID")
     private Long reportId;
 
+
+    /**
+     * 指标名称
+     */
+    private String indicatorName;
     @ApiModelProperty(value = "指标ID")
     private Long indicatorId;
 

fs-service/src/main/java/com/fs/medical/service/impl/ReportIndicatorResultServiceImpl.java

@@ -30,7 +30,8 @@ public class ReportIndicatorResultServiceImpl implements ReportIndicatorResultSe
 
     @Override
     public ReportIndicatorResult getById(Long resultId) {
-        return reportIndicatorResultMapper.getById(resultId);
+        ReportIndicatorResult byId = reportIndicatorResultMapper.getById(resultId);
+        return byId;
     }
 
     @Override

fs-user-app/src/main/java/com/fs/app/controller/medical/ReportIndicatorResultController.java

@@ -5,8 +5,11 @@ import com.fs.app.controller.AppBaseController;
 import com.fs.common.annotation.RepeatSubmit;
 import com.fs.common.core.domain.AjaxResult;
 import com.fs.common.core.domain.R;
+import com.fs.medical.domain.MedicalIndicator;
 import com.fs.medical.domain.ReportIndicatorResult;
 import com.fs.medical.dto.ReportAllIndicatorCateDTO;
+import com.fs.medical.mapper.MedicalIndicatorMapper;
+import com.fs.medical.mapper.ReportIndicatorResultMapper;
 import com.fs.medical.param.ReportIndicatorResultQueryDto;
 import com.fs.medical.service.ReportIndicatorResultService;
 import com.github.pagehelper.PageHelper;
@@ -34,6 +37,8 @@ public class ReportIndicatorResultController extends AppBaseController {
 
     @Autowired
     private ReportIndicatorResultService reportIndicatorResultService;
+    @Autowired
+    private MedicalIndicatorMapper medicalIndicatorMapper;
 
     /**
      * 根据报告ID查询所有指标结果
@@ -94,7 +99,11 @@ public class ReportIndicatorResultController extends AppBaseController {
     public R getById(@PathVariable("resultId") Long resultId) {
         try {
             ReportIndicatorResult result = reportIndicatorResultService.getById(resultId);
-            return R.ok().put("data",result);
+            MedicalIndicator indicator = null;
+            if(result != null) {
+                indicator = medicalIndicatorMapper.getById(result.getIndicatorId());
+            }
+            return R.ok().put("data",result).put("indicator",indicator);
         } catch (Exception e) {
             logger.error("查询检查结果详情失败", e);
             return R.error("查询失败");