Add-functionality-for-Ward-Admission-and-Local-Surge #17777

damithdeshan98 · 2026-01-05T15:22:04Z

Signed-off-by: damithdeshan98 [email protected]

Summary by CodeRabbit

Release Notes

New Features
- Added Ward Admission Diagnosis Card feature with print and close functionality
- Added Local Surgery Diagnosis Card feature with print and close functionality
- Introduced new dialogs to view and interact with both diagnosis card types across clinical data and admission profile sections
- Labeled existing diagnosis card as "Diagnosis Card (Legacy)" for clarity

_{✏️ Tip: You can customize this high-level summary in your review settings.}

Signed-off-by: damithdeshan98 <[email protected]>

coderabbitai · 2026-01-05T15:22:38Z

Walkthrough

The changes introduce diagnosis card template support to the inpatient clinical data workflow. A new dependency injection of ConfigOptionApplicationController was added to InpatientClinicalDataController, along with methods to load Ward Admission and Local Surgery diagnosis card templates, perform HTML variable substitution, and expose the rendered HTML. Corresponding UI updates add buttons and dialogs in two view files to trigger and display these new diagnosis card types.

Changes

Cohort / File(s)	Summary
Backend Controller - Diagnosis Card Support `src/main/java/com/divudi/bean/inward/InpatientClinicalDataController.java`	Added ConfigOptionApplicationController dependency injection; introduced three new private String fields (wardAdmissionDiagnosisCardHtml, localSurgeryDiagnosisCardHtml, selectedDiagnosisCardTypeHtml); added loadWardAdmissionDiagnosisCard() and loadLocalSurgeryDiagnosisCard() methods to load templates via controller and build variable replacements from encounter data; added replaceVariablesInHtml() utility method; added getters/setters for all three new fields.
Frontend UI - Diagnosis Card Dialogs & Buttons `src/main/webapp/inward/admission_profile.xhtml`, `src/main/webapp/inward/clinical_data.xhtml`	Added two new AJAX buttons (Ward Admission Card and Local Surgery Card) triggering the new controller actions; added two new dialogs (wardDiagnosisDlgDashboard/wardDiagnosisDlg and surgeryDiagnosisDlgDashboard/surgeryDiagnosisDlg) that render the HTML from the controller properties; each dialog includes Print and Close buttons; clinical_data.xhtml also added a new "Diagnosis Card Types Section" with additional button options; renamed existing diagnosis button to "(Legacy)".

Sequence Diagram(s)

sequenceDiagram
    participant UI as UI / View
    participant Controller as InpatientClinicalDataController
    participant ConfigCtrl as ConfigOptionApplicationController
    participant UI2 as Dialog / Renderer

    UI->>Controller: loadWardAdmissionDiagnosisCard()
    activate Controller
    Controller->>ConfigCtrl: retrieve template (Ward Admission)
    activate ConfigCtrl
    ConfigCtrl-->>Controller: HTML template
    deactivate ConfigCtrl
    
    Note over Controller: Build replacements map<br/>from current encounter
    Controller->>Controller: replaceVariablesInHtml(template, replacements)
    activate Controller
    Controller-->>Controller: rendered HTML
    deactivate Controller
    
    Controller->>Controller: set wardAdmissionDiagnosisCardHtml
    Controller-->>UI: response (AJAX complete)
    deactivate Controller
    
    UI->>UI2: show wardDiagnosisDlg
    Note over UI2: Render wardAdmissionDiagnosisCardHtml
    UI2->>UI2: Print or Close action

Estimated code review effort

🎯 3 (Moderate) | ⏱️ ~25 minutes

Pre-merge checks and finishing touches

❌ Failed checks (1 warning, 1 inconclusive)

Check name	Status	Explanation	Resolution
Docstring Coverage	⚠️ Warning	Docstring coverage is 21.43% which is insufficient. The required threshold is 80.00%.	You can run `@coderabbitai generate docstrings` to improve docstring coverage.
Title check	❓ Inconclusive	The title is incomplete and truncated, ending with 'Surge' instead of the full intended name, making it vague and unclear about the complete scope of the changes.	Complete the title to fully describe the functionality being added, e.g., 'Add Ward Admission and Local Surgery Diagnosis Card functionality' for clarity.

✅ Passed checks (1 passed)

Check name	Status	Explanation
Description Check	✅ Passed	Check skipped - CodeRabbit’s high-level summary is enabled.

✨ Finishing touches

📝 Generate docstrings

Thanks for using CodeRabbit! It's free for OSS, and your support helps us grow. If you like it, consider giving us a shout-out.

❤️ Share

_{Comment @coderabbitai help to get the list of available commands and usage tips.}

coderabbitai

Actionable comments posted: 3

Fix all issues with AI Agents 🤖

In @src/main/java/com/divudi/bean/inward/InpatientClinicalDataController.java:
- Around line 493-527: Reset the diagnosis card HTML state at the start of each
loader and ensure encounter/patient lists are populated before building
replacements: in loadWardAdmissionDiagnosisCard() and
loadLocalSurgeryDiagnosisCard() clear wardAdmissionDiagnosisCardHtml /
localSurgeryDiagnosisCardHtml and selectedDiagnosisCardTypeHtml immediately,
then if current != null call fillCurrentPatientLists(current.getPatient()) and
fillCurrentEncounterLists(current) before invoking
createReplacementsMap(current) and replaceVariablesInHtml(...); this prevents
stale HTML on early returns and avoids NPEs inside createReplacementsMap when
encounter/patient lists are null.

In @src/main/webapp/inward/admission_profile.xhtml:
- Around line 348-373: The Ward and Local Surgery buttons call
inpatientClinicalDataController.loadWardAdmissionDiagnosisCard and
loadLocalSurgeryDiagnosisCard but never set
inpatientClinicalDataController.current from admissionController.current,
causing a null-current early return; fix by adding a pre-action sync such as an
<f:setPropertyActionListener> (value="#{admissionController.current}"
target="#{inpatientClinicalDataController.current}") or an actionListener that
sets inpatientClinicalDataController.current before invoking the
loadWardAdmissionDiagnosisCard / loadLocalSurgeryDiagnosisCard actions so the
controller has the selected encounter (alternatively mirror how
navigateToInpatientClinicalData() assigns current).

In @src/main/webapp/inward/clinical_data.xhtml:
- Around line 59-80: The button labels are inconsistent and duplicate concepts
across header and tab sections, causing confusion; update the value attributes
so wording is consistent across both places (use either "Ward Admission
Diagnosis Card" and "Local Surgery Diagnosis Card" everywhere) and/or remove
duplicate buttons if redundant; specifically harmonize the values for the
p:commandButton elements that call
inpatientClinicalDataController.loadWardAdmissionDiagnosisCard /
loadLocalSurgeryDiagnosisCard and ensure the oncomplete targets
PF('wardDiagnosisDialog') and PF('surgeryDiagnosisDialog') match the chosen
labels so header shortcuts and tab labels consistently refer to the same dialog
and controller actions.

Caution

Some comments are outside the diff and can’t be posted inline due to platform limitations.

⚠️ Outside diff range comments (1)

src/main/webapp/inward/admission_profile.xhtml (1)

602-615: Duplicate </h:form>, </ui:define>, </ui:composition> – invalid view structure

There are two consecutive sets of closing tags for h:form, ui:define, and ui:composition (Lines 602–604 and again 613–615). This will produce invalid XHTML/Facelets and can break view compilation.

Remove one of the duplicate sets so that each of these elements is closed exactly once.

🧹 Nitpick comments (3)

src/main/webapp/inward/admission_profile.xhtml (1)

548-600: Ward/Local Surgery dashboard dialogs look structurally correct

The new dashboard dialogs (widgetVars wardDiagnosisDialogDashboard and surgeryDiagnosisDialogDashboard) are inside the JSF form, use h:panelGroup as the AJAX/print target, and render the HTML via h:outputText escape="false" as expected for pre-rendered HTML fragments. The Print and Close buttons are wired correctly to p:printer and PF(...).hide().

If you want to avoid an unnecessary server round-trip for Print/Close (they don’t rely on server-side state changes), you could set ajax="false" and/or use type="button" with pure client-side handlers, but the current implementation is functionally fine.

src/main/webapp/inward/clinical_data.xhtml (1)

666-718: Diagnosis card dialogs are wired correctly; consider small UX optimization

The new wardDiagnosisDlg / surgeryDiagnosisDlg dialogs correctly:

Use h:panelGroup as the AJAX/print target (wardDiagnosisPanel, surgeryDiagnosisPanel).

Render the HTML fragments from inpatientClinicalDataController with escape="false".

Provide Print buttons targeting the respective panels and Close buttons that hide the dialog via PF(...).hide().

Functionally this is sound. If you want to reduce server round-trips, you could switch the Print/Close buttons to ajax="false" (or type="button" with purely client-side handlers), since they don’t need to hit the server.
src/main/java/com/divudi/bean/inward/InpatientClinicalDataController.java (1)
532-540: replaceVariablesInHtml is correct but tightly coupled to {...} key format

The implementation:
for (Map.Entry<String, String> replacement : replacements.entrySet()) {
    if (replacement.getValue() != null) {
        result = result.replace(
            "{{" + replacement.getKey().substring(1, replacement.getKey().length() - 1) + "}}",
            replacement.getValue()
        );
    }
}
assumes all replacement keys are of the form "{name}" and converts them to {{name}} for HTML templates. That matches the current createReplacementsMap keys and works as long as templates consistently use {{...}} placeholders.

If you want this utility to be more generally reusable and less brittle against future changes in key format, you could:

Store plain keys without braces in the map (e.g., "name") and let this method decide whether to look for {name} or {{name}}, or

Store the exact placeholder string (e.g., "{{name}}") as the key and just call result.replace(key, value).

Not a blocker, but it will make template evolution safer.

📜 Review details

Configuration used: Organization UI

Review profile: CHILL

Plan: Pro

📥 Commits

Reviewing files that changed from the base of the PR and between 0bc8dd7 and 3fc3fa0.

📒 Files selected for processing (3)

src/main/java/com/divudi/bean/inward/InpatientClinicalDataController.java
src/main/webapp/inward/admission_profile.xhtml
src/main/webapp/inward/clinical_data.xhtml

🧰 Additional context used

📓 Path-based instructions (6)

**/*.{xhtml,java}