fix:PAQ报告增加当前年度时间

wzp

2024-12-30 6620dc7b245127616cb580700eb026da03e96de5

 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;

@@ -63,6 +67,10 @@
            ScoreCharacteristics_V2 scoreCharacteristics = new ScoreCharacteristics_V2(p);
            return scoreCharacteristics;
        }).collect(Collectors.toList()));

        //有效性结果诊断
        paramList.add(new DiagnosisTitle());
        paramList.add(new Diagnosis());

        return paramList;
    }
@@ -117,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 -> {
            //获取对应语言报告字典