fix: validate serviceId for null, empty, and non-numeric values, normalize blank providerNo's to ensure rows load correctly with privacy filters, return null provider to avoid outputting null provider name, populate all parallel lists in ectConsultationVecByDemographic to preven IndexOutOfBounds Exception, replace hardcoded extension keys for enum refs, add extra context to error log messages, return default sorting by ascending

Author: LiamStanziani

src/main/java/ca/openosp/openo/commn/dao/ConsultationRequestDaoImpl.java

@@ -278,7 +278,7 @@ public List<ConsultationListDTO> getConsultationDTOs(String team, boolean showCo
     public List<ConsultationListDTO> getConsultationDTOsByDemographic(Integer demoNo) {
         String sql = DTO_SELECT + DTO_FROM +
                 "WHERE cr.demographicId = ?1 " +
-                "ORDER BY cr.referralDate DESC";
+                "ORDER BY cr.referralDate ASC";
 
         Query query = entityManager.createQuery(sql, ConsultationListDTO.class);
         query.setParameter(1, demoNo);

src/main/java/ca/openosp/openo/consultation/dto/ConsultationListDTO.java

@@ -20,6 +20,8 @@
 
 import org.apache.commons.lang3.time.DateFormatUtils;
 
+import ca.openosp.openo.commn.model.enumerator.ConsultationRequestExtKey;
+
 import java.io.Serializable;
 import java.util.Date;
 import java.util.HashMap;
@@ -264,9 +266,9 @@ public String getFollowUpDateFormatted() {
      */
     public void applyExtensions(Map<String, String> extMap) {
         if (extMap == null) return;
-        this.eReferral = extMap.containsKey("ereferral_ref");
-        this.ereferralService = extMap.getOrDefault("ereferral_service", null);
-        this.ereferralDoctor = extMap.getOrDefault("ereferral_doctor", null);
+        this.eReferral = extMap.containsKey(ConsultationRequestExtKey.EREFERRAL_REF.getKey());
+        this.ereferralService = extMap.getOrDefault(ConsultationRequestExtKey.EREFERRAL_SERVICE.getKey(), null);
+        this.ereferralDoctor = extMap.getOrDefault(ConsultationRequestExtKey.EREFERRAL_DOCTOR.getKey(), null);
     }
 
     public Integer getId() { return id; }

src/main/java/ca/openosp/openo/encounter/oscarConsultationRequest/pageUtil/EctConsultationFormRequestUtil.java

@@ -523,8 +523,16 @@ public String getFamilyDoctor() {
     }
 
     public String getServiceName(String id) {
-        String desc = consultationServiceDao.getServiceDescription(Integer.parseInt(id));
-        return desc != null ? desc : "";
+        if (id == null || id.isEmpty()) {
+            return "";
+        }
+        try {
+            String desc = consultationServiceDao.getServiceDescription(Integer.parseInt(id));
+            return desc != null ? desc : "";
+        } catch (NumberFormatException e) {
+            MiscUtils.getLogger().warn("Invalid service ID: non-numeric value provided");
+            return "";
+        }
     }
 
     public String getClinicName() {

src/main/java/ca/openosp/openo/encounter/oscarConsultationRequest/pageUtil/EctViewConsultationRequestsUtil.java

@@ -125,7 +125,7 @@ public boolean estConsultationVecByTeam(LoggedInInfo loggedInInfo, String team,b
               status.add(dto.getStatus());
               patient.add(dto.getPatientFormattedName());
               provider.add(dto.getMrpFormattedName());
-              providerNo.add(dto.getDemographicProviderNo() != null ? dto.getDemographicProviderNo() : "-1");
+              providerNo.add(isBlank(dto.getDemographicProviderNo()) ? "-1" : dto.getDemographicProviderNo());
               service.add(dto.getEffectiveServiceDescription());
               vSpecialist.add(dto.getSpecialistFormattedName());
               urgency.add(dto.getUrgency());
@@ -138,14 +138,11 @@ public boolean estConsultationVecByTeam(LoggedInInfo loggedInInfo, String team,b
               patientWillBook.add(String.valueOf(dto.isPatientWillBook()));
               followUpDate.add(dto.getFollowUpDateFormatted());
 
-              Provider cProv = new Provider();
-              cProv.setLastName(dto.getConsultProviderLastName());
-              cProv.setFirstName(dto.getConsultProviderFirstName());
-              consultProvider.add(cProv);
+              consultProvider.add(buildConsultProvider(dto));
           }
 
       } catch(Exception e) {
-         MiscUtils.getLogger().error("Error", e);
+         MiscUtils.getLogger().error("Error loading consultation list for team: " + (team != null ? team : "all"), e);
          verdict = false;
       }
       return verdict;
@@ -177,28 +174,50 @@ public boolean estConsultationVecByDemographic(LoggedInInfo loggedInInfo, String
               status.add(dto.getStatus());
               patient.add(dto.getPatientFormattedName());
               provider.add(dto.getMrpFormattedName());
+              providerNo.add(isBlank(dto.getDemographicProviderNo()) ? "-1" : dto.getDemographicProviderNo());
               service.add(dto.getEffectiveServiceDescription());
               vSpecialist.add(dto.getSpecialistFormattedName());
               urgency.add(dto.getUrgency());
               patientWillBook.add(String.valueOf(dto.isPatientWillBook()));
               date.add(dto.getReferralDateFormatted());
+              demographicNo.add(dto.getDemographicNo() != null ? dto.getDemographicNo().toString() : "0");
+              siteName.add(dto.getSiteName());
+              teams.add(dto.getSendTo());
+              eReferral.add(dto.isEReferral());
+              apptDate.add(dto.getAppointmentDateFormatted());
+              followUpDate.add(dto.getFollowUpDateFormatted());
 
-              Provider cProv = new Provider();
-              cProv.setLastName(dto.getConsultProviderLastName());
-              cProv.setFirstName(dto.getConsultProviderFirstName());
-              consultProvider.add(cProv);
+              consultProvider.add(buildConsultProvider(dto));
           }
 
       } catch (NumberFormatException e) {
          MiscUtils.getLogger().error("Invalid demographic number: non-numeric value provided", e);
          verdict = false;
       } catch(Exception e) {
-         MiscUtils.getLogger().error("Error", e);
+         MiscUtils.getLogger().error("Error loading consultations for demographic: " + demoNo, e);
          verdict = false;
       }
       return verdict;
    }
 
+   /**
+    * Builds a Provider object from DTO consulting provider fields, returning null when no provider data exists
+    * so JSPs can render blank instead of "null, null".
+    */
+   private Provider buildConsultProvider(ConsultationListDTO dto) {
+      if (dto.getConsultProviderLastName() == null && dto.getConsultProviderFirstName() == null) {
+         return null;
+      }
+      Provider cProv = new Provider();
+      cProv.setLastName(dto.getConsultProviderLastName() != null ? dto.getConsultProviderLastName() : "");
+      cProv.setFirstName(dto.getConsultProviderFirstName() != null ? dto.getConsultProviderFirstName() : "");
+      return cProv;
+   }
+
+   private boolean isBlank(String value) {
+      return value == null || value.trim().isEmpty();
+   }
+
    /**
     * Initializes all parallel lists to empty ArrayLists.
     */