adding code rabbit suggestions

Author: SR20290919

src/main/java/com/iemr/common/service/grievance/GrievanceHandlingServiceImpl.java

@@ -464,8 +464,14 @@ public String getGrievanceDetailsWithRemarks(String request) throws Exception {
 		                remarks = fetchRemarksFromGrievanceWorklist(grievance.getComplaintID());
 		            } else {
 		                // Default: Fetch remarks based on the grievance's specific conditions (no specific resolution status)
-		               // remarks = fetchRemarksBasedOnConditions(grievance.getComplaintID());
-		            	remarks = fetchRemarksFromBenCallByComplaint(grievance.getComplaintID());
+		            	String callRemarks = fetchRemarksFromBenCallByComplaint(grievance.getComplaintID());
+		            	if(remarks != null && !remarks.startsWith("No remarks found")) {
+		            		remarks = callRemarks;
+		            	}
+		            	else {
+			                remarks = fetchRemarksFromGrievanceWorklist(grievance.getComplaintID());
+
+		            	}
 		            }
 
 		            grievanceResponse.setRemarks(remarks);
@@ -475,12 +481,11 @@ public String getGrievanceDetailsWithRemarks(String request) throws Exception {
 		        }
 
 		        // Convert the list of GrievanceResponse objects to JSON and return as a string
-		      //  ObjectMapper objectMapper = new ObjectMapper();
 		        return objectMapper.writeValueAsString(grievanceResponseList);
 
 		    } catch (Exception e) {
 		        logger.error("Error while getting grievance details with remarks: " + e.getMessage(), e);
-		        return "Error fetching grievance details with remarks: " + e.getMessage();
+		        throw new Exception("Error processing grievance request");
 		    }
 		}