Merge remote-tracking branch 'origin/framework-v8-20220228' into framework-...

林致杰

2022-03-07 132a8ccbae5b3283a855b14bdbe8ae99557050d1

 src/main/java/com/ots/project/tool/report/MAQNEW/MAQReport_V2.java

@@ -57,11 +57,8 @@
            return simpleMessage;
        }).collect(Collectors.toList()));

        //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);