From 87e7b5f463d9207104b36881dd5a3e6be0656a61 Mon Sep 17 00:00:00 2001
From: 林致杰 <1003392067@qq.com>
Date: 星期一, 28 二月 2022 17:26:15 +0800
Subject: [PATCH] MAQIAR部分修复
---
src/main/java/com/ots/project/tool/report/MAQNEW/MAQReport_V2.java | 21 ++++++++++-----------
1 files changed, 10 insertions(+), 11 deletions(-)
diff --git a/src/main/java/com/ots/project/tool/report/MAQNEW/MAQReport_V2.java b/src/main/java/com/ots/project/tool/report/MAQNEW/MAQReport_V2.java
index 3c17d5b..7729ae6 100644
--- a/src/main/java/com/ots/project/tool/report/MAQNEW/MAQReport_V2.java
+++ b/src/main/java/com/ots/project/tool/report/MAQNEW/MAQReport_V2.java
@@ -56,11 +56,13 @@
SimpleMessage_V2 simpleMessage = new SimpleMessage_V2(p);
return simpleMessage;
}).collect(Collectors.toList()));
-
- paramList.add(new ResponseFidelityDiagnosisTitle_V2());
-
- paramList.add(new ResponseFidelityDiagnosis_V2());
-
+
+ //MAQ IAR涓嶉渶瑕�
+ if(!reportTypeEnum.getCode().equals(ReportTypeEnum.MAQIAR.getCode())){
+ paramList.add(new ResponseFidelityDiagnosisTitle_V2());
+ paramList.add(new ResponseFidelityDiagnosis_V2());
+ }
+
paramList.addAll(getScoreCharacteristicsList().stream().map(p -> {
ScoreCharacteristics_V2 scoreCharacteristics = new ScoreCharacteristics_V2(p);
return scoreCharacteristics;
@@ -228,12 +230,9 @@
List<TLibraryCode> tLibraryCodes = p.calculateList(thaiCalculationMap, langType);
if(tLibraryCodes != null && tLibraryCodes.size() > 0){
//琛ㄦ牸澶氫綅 璁＄畻鍒嗘暟鍊艰祴鍊� 渚嬪
- // 琛ㄦ牸鐨勶細%P_Regula19_XX1%
- // 琛ㄦ牸鐨勶細%P_Regula19_XX2%
- // 琛ㄦ牸鐨勶細%P_Regula19_XX3%
- // 琛ㄦ牸鐨勶細%P_Regula19_XX4%
- // 琛ㄦ牸鐨勶細%P_Regula19_XX5%
- // 琛ㄦ牸鐨勶細%P_Regula19_XX6%
+ // 琛ㄦ牸鐨勶細%ResponseFidelityDiagnosis_V2_0%
+ // 琛ㄦ牸鐨勶細%ResponseFidelityDiagnosis_V2_1%
+ // 琛ㄦ牸鐨勶細%ResponseFidelityDiagnosis_V2_2%
for (int i = 0; i < tLibraryCodes.size(); i++) {
TLibraryCode tLibraryCode = tLibraryCodes.get(i);
textMap.put(p.getName() + "_" + i, Objects.isNull(tLibraryCode) || StringUtils.isBlank(tLibraryCode.getLangTypeContext(langType)) ? "N/A NONE" : tLibraryCode.getLangTypeContext(langType));
--
Gitblit v1.9.1