From a72ce23de12389206780e726bd1700c40c7f6a82 Mon Sep 17 00:00:00 2001
From: 林致杰 <1003392067@qq.com>
Date: 星期四, 06 一月 2022 12:18:00 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/framework-v7-20211119' into framework-v7-20211119
---
src/main/java/com/ots/project/tool/report/PAQ/PAQReport.java | 6 ++++++
1 files changed, 6 insertions(+), 0 deletions(-)
diff --git a/src/main/java/com/ots/project/tool/report/PAQ/PAQReport.java b/src/main/java/com/ots/project/tool/report/PAQ/PAQReport.java
index 40b7df9..a874d1c 100644
--- a/src/main/java/com/ots/project/tool/report/PAQ/PAQReport.java
+++ b/src/main/java/com/ots/project/tool/report/PAQ/PAQReport.java
@@ -8,6 +8,8 @@
import com.ots.project.tool.report.MAQNEW.base.MAQConditionVO_V2;
import com.ots.project.tool.report.MAQNEW.base.MAQSummaryCondition_V2;
import com.ots.project.tool.report.MAQNEW.condition.*;
+import com.ots.project.tool.report.PAQ.condition.Diagnosis;
+import com.ots.project.tool.report.PAQ.condition.DiagnosisTitle;
import com.ots.project.tool.report.ReportResultData;
import lombok.Data;
import lombok.Getter;
@@ -64,6 +66,10 @@
return scoreCharacteristics;
}).collect(Collectors.toList()));
+ //鏈夋晥鎬х粨鏋滆瘖鏂�
+ paramList.add(new DiagnosisTitle());
+ paramList.add(new Diagnosis());
+
return paramList;
}
--
Gitblit v1.9.1