From 4ce181bd784aeb873a4751826c227161d35de2b5 Mon Sep 17 00:00:00 2001
From: wzp <2040239371@qq.com>
Date: 星期二, 17 六月 2025 11:29:16 +0800
Subject: [PATCH] fix:修复报告文件名里有tab键导致的bug

---
 src/main/java/com/ots/project/tool/report/PAQ/PAQReport.java |   17 +++++++++++++++--
 1 files changed, 15 insertions(+), 2 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 09bef81..04af653 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
@@ -1,5 +1,6 @@
 package com.ots.project.tool.report.PAQ;
 
+import com.alibaba.druid.sql.visitor.functions.Locate;
 import com.ots.common.enums.LangTypeEnum;
 import com.ots.common.enums.ReportTypeEnum;
 import com.ots.common.utils.StringUtils;
@@ -8,12 +9,15 @@
 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;
 import lombok.Setter;
 import lombok.extern.slf4j.Slf4j;
 
+import java.time.LocalDate;
 import java.util.*;
 import java.util.stream.Collectors;
 
@@ -64,6 +68,10 @@
             return scoreCharacteristics;
         }).collect(Collectors.toList()));
 
+        //鏈夋晥鎬х粨鏋滆瘖鏂�
+        paramList.add(new DiagnosisTitle());
+        paramList.add(new Diagnosis());
+
         return paramList;
     }
 
@@ -93,8 +101,7 @@
                 "LIBPAQGS88021", "LIBPAQGS88022", "LIBPAQGS88023", "LIBPAQGS8803", "LIBPAQGS88031",
                 "LIBPAQGS88032", "LIBPAQGS88033", "LIBPAQGS8804", "LIBPAQGS88041", "LIBPAQGS88042",
                 "LIBPAQGS88043", "LIBPAQGS8805", "LIBPAQGS88051", "LIBPAQGS88052", "LIBPAQGS88053",
-                "LIBPAQGS8806", "LIBPAQGS88061", "LIBPAQGS88062", "LIBPAQGS88063"
-                ;
+                "LIBPAQGS8806", "LIBPAQGS88061", "LIBPAQGS88062", "LIBPAQGS88063");
     }
 
     /**
@@ -118,6 +125,12 @@
         textMap.put("questionnaireEmail", getQuestionnaireEmail());
         textMap.put("questionnaireStartTime", getQuestionnaireStartTime());
         textMap.put("questionnaireEndTime", getQuestionnaireEndTime());
+
+
+        //鏇挎崲褰撳墠骞翠唤
+        LocalDate currentDate = LocalDate.now();
+        textMap.put("year",currentDate.getYear());
+
         //鏍规嵁鎶ュ憡绫诲瀷鑾峰彇鎶ュ憡瀛楀吀
         getParamList(type).stream().forEach(p -> {
             //鑾峰彇瀵瑰簲璇█鎶ュ憡瀛楀吀

--
Gitblit v1.9.1