Merge pull request #255 from bcgov/develop/alex-GRAD2-2377

GRAD2-2377
bcgov · Apr 20, 2024 · ae6344e · ae6344e
2 parents f555a16 + f2f4237
commit ae6344e
Showing 1 changed file with 7 additions and 2 deletions.
diff --git a/api/src/main/java/ca/bc/gov/educ/api/grad/report/service/CommonService.java b/api/src/main/java/ca/bc/gov/educ/api/grad/report/service/CommonService.java
@@ -745,15 +745,20 @@ private synchronized List<ReportGradStudentData> getNextPageStudentsFromGradStud
             String paperType = e.getPaperType();
             String certificateTypeCode = e.getCertificateTypeCode(); //either transcript or certificate codes
             ReportGradStudentData s = getReportGradStudentDataByGraduationStudentRecordIdFromList(e.getGraduationStudentRecordId(), studentsInBatch);
-            if(s != null && "CUR".equalsIgnoreCase(s.getStudentStatus())) {
+            if(s != null) {
                 ReportGradStudentData dataResult = SerializationUtils.clone(s);
                 dataResult.setPaperType(paperType);
                 if ("YED4".equalsIgnoreCase(paperType)) {
                     dataResult.setTranscriptTypeCode(certificateTypeCode);
                 } else {
                     dataResult.setCertificateTypeCode(certificateTypeCode);
                 }
-                result.add(dataResult);
+                if("YED4".equalsIgnoreCase(paperType) && "CUR".equalsIgnoreCase(s.getStudentStatus())) {
+                    result.add(dataResult);
+                }
+                if (!"YED4".equalsIgnoreCase(paperType)) {
+                    result.add(dataResult);
+                }
             }
         }
         return result;