MAQIAR部分修复

林致杰

2022-02-28 87e7b5f463d9207104b36881dd5a3e6be0656a61

MAQIAR部分修复

 src/main/java/com/ots/common/utils/poi/WordUtil.java

@@ -961,7 +961,7 @@
        }
        if (StringUtils.equals(reportType, ReportTypeEnum.MAQ.getCode())) {
            setMAQCompleteChars(textMap, charts);
        } else if (StringUtils.equals(reportType, ReportTypeEnum.MAQV2.getCode()) || StringUtils.equals(reportType, ReportTypeEnum.MAQIAR.getCode())) {
        } else if (StringUtils.equals(reportType, ReportTypeEnum.MAQV2.getCode())) {
            setMAQ_V2CompleteChars(textMap, charts);
        } else if (StringUtils.equals(reportType, ReportTypeEnum.RuiLin.getCode())) {
            setRuiLinChar(textMap, charts);

 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;