Skip to content

#13754 - Fixed NPE when date of diagnosis is not provided #13871

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
raulbob merged 2 commits into from
Mar 9, 2026
Merged

#13754 - Fixed NPE when date of diagnosis is not provided #13871

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ce06844
#13754 - Fixed NPE when date of diagnosis is not provided
raulbob Mar 9, 2026
2e3bc53
Added hanlding for potential report date overwrite
raulbob Mar 9, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 15 additions & 4 deletions ...as-ui/src/main/java/de/symeda/sormas/ui/caze/notifier/CaseNotifierSideViewController.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -343,13 +343,24 @@ private void openEditWindow(CaseDataDto caze, NotifierDto notifier, String title
* the form containing the values
*/
private void updateSurveillanceReportFromForm(SurveillanceReportDto surveillanceReport, CaseNotifierForm notifierForm) {
// Update report date from notification date
final LocalDate notificationDate = notifierForm.getNotificationDate();
surveillanceReport.setReportDate(Date.from(notificationDate.atStartOfDay(ZoneId.systemDefault()).toInstant()));

// Update report date from notification date if provided
if (notifierForm.getNotificationDate() != null) {
surveillanceReport.setReportDate(Date.from(notifierForm.getNotificationDate().atStartOfDay(ZoneId.systemDefault()).toInstant()));
} else {
// if no notification date is provided, use the current date as long as the report date is not set
if (surveillanceReport.getReportDate() == null) {
surveillanceReport.setReportDate(new Date());
}
}

// Update diagnosis date if provided
final LocalDate diagnosticDate = notifierForm.getDiagnosticDate();
surveillanceReport.setDateOfDiagnosis(Date.from(diagnosticDate.atStartOfDay(ZoneId.systemDefault()).toInstant()));
if (diagnosticDate != null) {
surveillanceReport.setDateOfDiagnosis(Date.from(diagnosticDate.atStartOfDay(ZoneId.systemDefault()).toInstant()));
} else {
surveillanceReport.setDateOfDiagnosis(null);
}

// Update treatment based on selected option
final TreatmentOption selectedOption = notifierForm.getSelectedTreatmentOption();
Expand Down
Loading