AMM-2127 clinical observation search is not working.#264
Merged
snehar-nd merged 6 commits intorelease-3.6.2from Mar 25, 2026
Merged
AMM-2127 clinical observation search is not working.#264snehar-nd merged 6 commits intorelease-3.6.2from
snehar-nd merged 6 commits intorelease-3.6.2from
Conversation
* fix: aam-2159 changed text from advancesearch to advanced search * fix: amm-1979 validation for prescription * Correct spelling in 'advanceBeneficiarySearch' --------- Co-authored-by: 5Amogh <amoghavarsh@navadhiti.com> Co-authored-by: Amoghavarsh <93114621+5Amogh@users.noreply.github.com>
Contributor
|
Important Review skippedAuto reviews are disabled on base/target branches other than the default branch. Please check the settings in the CodeRabbit UI or the ⚙️ Run configurationConfiguration used: defaults Review profile: CHILL Plan: Pro Run ID: You can disable this status message by setting the Use the checkbox below for a quick retry:
📝 WalkthroughWalkthroughThe pull request refactors the findings component to replace custom directives with Angular Material autocomplete components for clinical observations and significant findings searches. Additionally, required attributes are removed from prescription form controls, doctor-only prescription validation is eliminated, and success alert messages are updated with optional chaining fallbacks. Changes
Sequence DiagramsequenceDiagram
participant User as User Input
participant Component as Findings Component
participant Service as Masterdata Service
participant Form as Reactive Form
User->>Component: onObservationInputKeyup(value, index)
Component->>Component: Trim & validate input (≥3 chars)
Component->>Service: searchDiagnosisBasedOnPageNo(term, 0)
Service-->>Component: results.data.sctMaster
Component->>Component: suggestedObservationsList[index] = results
User->>Component: Select option from dropdown
Component->>Component: onObservationSelected(selected, index)
Component->>Form: Patch FormGroup with conceptID, term, clinicalObservationsProvided
Form-->>Component: Form updated
Component->>Component: Update remove-button visibility check
User->>Component: onFindingsInputKeyup(value, index)
Component->>Component: Trim & validate input (≥3 chars)
Component->>Component: resetFindingsCheckbox(term)
Component->>Service: searchDiagnosisBasedOnPageNo(term, 0)
Service-->>Component: results.data.sctMaster
Component->>Component: suggestedFindingsSearchList[index] = results
User->>Component: Select option from dropdown
Component->>Component: onFindingsSelected(selected, index)
Component->>Form: Patch FormGroup with conceptID, term, significantFindingsProvided
Form-->>Component: Form updated
Estimated code review effort🎯 3 (Moderate) | ⏱️ ~22 minutes Poem
🚥 Pre-merge checks | ✅ 3✅ Passed checks (3 passed)
✏️ Tip: You can configure your own custom pre-merge checks in the settings. ✨ Finishing Touches🧪 Generate unit tests (beta)
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. Comment |
Contributor
Author
|
@CodeRabbit review |
Contributor
✅ Actions performedReview triggered.
|
![coderabbitai[bot]](https://avatars.githubusercontent.com/in/347564?s=60&v=4){kind=small}
Contributor
There was a problem hiding this comment.
Actionable comments posted: 4
🤖 Prompt for all review comments with AI agents
Verify each finding against the current code and only fix it if needed.
Inline comments:
In
`@src/app/app-modules/nurse-doctor/case-record/general-case-record/findings/findings.component.ts`:
- Around line 733-765: The code currently calls resetFindingsCheckbox(term) from
onFindingsInputKeyup and onFindingsSelected which derives enableIsHistory from
the transient input string and causes the checkbox state to follow the
last-edited row; instead, change resetFindingsCheckbox to recompute the checkbox
state from the form array contents (the FormArray 'significantFindingsList'
inside generalFindingsForm) by scanning its entries for existing findings/flags
(e.g., term, conceptID, or isForHistory) and set enableIsHistory/isForHistory
based on that aggregate state; update calls in onFindingsInputKeyup and
onFindingsSelected to pass nothing or the form array if needed and ensure
enableIsHistory is not derived from the single textbox value anymore.
- Around line 87-88: The autocomplete responses can overwrite newer input when
slower requests resolve later; update the component (where
suggestedObservationsList and suggestedFindingsSearchList are populated — the
search/request handlers used on keyup and the methods around the noted ranges)
to track the latest query per row (e.g. a map/array latestQueryByIndex keyed by
row index or suggestion id) and set latestQueryByIndex[index] = currentTerm
before firing the request; when the async response arrives, compare
response.term (or the original requested term) against latestQueryByIndex[index]
and only apply the results to suggestedObservationsList /
suggestedFindingsSearchList if they match; alternatively use per-request cancel
tokens (AbortController) or RxJS switchMap where available to ensure stale
responses are ignored.
- Around line 699-729: The selected option object is being stored into form
control clinicalObservationsProvided, causing the visible text and the SNOMED
pair (term/conceptID) to diverge when the user edits the text; change
onObservationSelected to store only the selected.term (string) into
clinicalObservationsProvided and still set conceptID and term controls from the
selected object (use selected?.term || '' for the visible field and
selected?.conceptID || null for conceptID), and update onObservationInputKeyup
to clear the associated conceptID/term when the user types (e.g., set
conceptID=null and term='' when term.length < 3 or when typing invalidates a
previous selection). Apply the same change to the corresponding
significantFindings handlers (the equivalent
onSignificantFindingSelected/onSignificantFindingInputKeyup functions) so the
visible text and SNOMED code stay in sync.
In `@src/app/app-modules/nurse-doctor/workarea/workarea.component.ts`:
- Around line 3903-3913: The post-save flow sometimes passes a string into
getHealthIDDetails that later interpolates
this.current_language_set.common.doYouWantToLinkCareContext without null-safety;
ensure every else branch (where you call getHealthIDDetails from the save
success blocks around the shown diffs and at lines referenced) builds a
null-safe prompt before calling confirmationService.confirmCareContext. Update
getHealthIDDetails to compute a fallback like const linkCareContextText =
this.current_language_set?.common?.doYouWantToLinkCareContext ?? 'Do you want to
link care context?'; and pass `${successResponseFromAPI}.
${linkCareContextText}` into confirmationService.confirmCareContext, and ensure
the confirmation subscribe handlers call fetchHealthIDDetailsOnConfirmation() or
basedOnRoleNavigateToWorklist()/navigateToSpecialistWorklist() as appropriate.
ℹ️ Review info
⚙️ Run configuration
Configuration used: defaults
Review profile: CHILL
Plan: Pro
Run ID: eca44946-d50b-478c-b2df-0bcf1d2daa13
📒 Files selected for processing (5)
src/app/app-modules/nurse-doctor/case-record/general-case-record/findings/findings.component.htmlsrc/app/app-modules/nurse-doctor/case-record/general-case-record/findings/findings.component.tssrc/app/app-modules/nurse-doctor/case-record/general-case-record/prescription/prescription.component.htmlsrc/app/app-modules/nurse-doctor/quick-consult/quick-consult.component.htmlsrc/app/app-modules/nurse-doctor/workarea/workarea.component.ts
💤 Files with no reviewable changes (2)
- src/app/app-modules/nurse-doctor/quick-consult/quick-consult.component.html
- src/app/app-modules/nurse-doctor/case-record/general-case-record/prescription/prescription.component.html
Comment on lines
+87
to
+88
| suggestedObservationsList: any = []; | ||
| suggestedFindingsSearchList: any = []; |
Contributor
There was a problem hiding this comment.
Prevent stale autocomplete responses from overwriting newer input.
Every keyup starts a fresh request, but the response handler never checks whether that row has already moved on to a different term. If a slower request returns last, it will repopulate the suggestions with an older prefix. The quick-consult search path already guards against this with a per-index latest-query check.
Also applies to: 699-710, 733-745
🤖 Prompt for AI Agents
Verify each finding against the current code and only fix it if needed.
In
`@src/app/app-modules/nurse-doctor/case-record/general-case-record/findings/findings.component.ts`
around lines 87 - 88, The autocomplete responses can overwrite newer input when
slower requests resolve later; update the component (where
suggestedObservationsList and suggestedFindingsSearchList are populated — the
search/request handlers used on keyup and the methods around the noted ranges)
to track the latest query per row (e.g. a map/array latestQueryByIndex keyed by
row index or suggestion id) and set latestQueryByIndex[index] = currentTerm
before firing the request; when the async response arrives, compare
response.term (or the original requested term) against latestQueryByIndex[index]
and only apply the results to suggestedObservationsList /
suggestedFindingsSearchList if they match; alternatively use per-request cancel
tokens (AbortController) or RxJS switchMap where available to ensure stale
responses are ignored.
Comment on lines
+699
to
+729
| onObservationInputKeyup(value: string, index: number) { | ||
| const term = (value || '').trim(); | ||
| if (term.length >= 3) { | ||
| this.masterdataService.searchDiagnosisBasedOnPageNo(term, 0).subscribe({ | ||
| next: (results: any) => { | ||
| this.suggestedObservationsList[index] = | ||
| results?.data?.sctMaster ?? []; | ||
| }, | ||
| error: () => { | ||
| console.error('Error fetching observation data'); | ||
| }, | ||
| }); | ||
| } else { | ||
| this.suggestedObservationsList[index] = []; | ||
| } | ||
| } | ||
|
|
||
| displayObservation(obs: any): string { | ||
| return typeof obs === 'string' ? obs : obs?.term || ''; | ||
| } | ||
|
|
||
| onObservationSelected(selected: any, index: number) { | ||
| const observationsFormArray = this.generalFindingsForm.get( | ||
| 'clinicalObservationsList', | ||
| ) as FormArray; | ||
| const observationsFormGroup = observationsFormArray.at(index) as FormGroup; | ||
| observationsFormGroup.patchValue({ | ||
| clinicalObservationsProvided: selected, | ||
| conceptID: selected?.conceptID || null, | ||
| term: selected?.term || null, | ||
| }); |
Contributor
There was a problem hiding this comment.
Keep the visible text and selected SNOMED code in sync.
These handlers now store the whole option object in clinicalObservationsProvided / significantFindingsProvided, and later typing does not clear the previously selected term/conceptID. That lets a row display edited text while still submitting the old code pair. The previous directive flow stored the term string in *Provided, not the full object.
Suggested fix
onObservationInputKeyup(value: string, index: number) {
const term = (value || '').trim();
+ const observationsFormGroup = (
+ (this.generalFindingsForm.get('clinicalObservationsList') as FormArray).at(
+ index,
+ ) as FormGroup
+ );
+ if ((observationsFormGroup.get('term')?.value ?? '') !== term) {
+ observationsFormGroup.patchValue(
+ {
+ term: null,
+ conceptID: null,
+ },
+ { emitEvent: false },
+ );
+ }
if (term.length >= 3) {
this.masterdataService.searchDiagnosisBasedOnPageNo(term, 0).subscribe({
next: (results: any) => {
this.suggestedObservationsList[index] =
results?.data?.sctMaster ?? [];
},
error: () => {
console.error('Error fetching observation data');
},
});
} else {
this.suggestedObservationsList[index] = [];
}
}
onObservationSelected(selected: any, index: number) {
const observationsFormArray = this.generalFindingsForm.get(
'clinicalObservationsList',
) as FormArray;
const observationsFormGroup = observationsFormArray.at(index) as FormGroup;
observationsFormGroup.patchValue({
- clinicalObservationsProvided: selected,
+ clinicalObservationsProvided: selected?.term || null,
conceptID: selected?.conceptID || null,
term: selected?.term || null,
});
}
onFindingsInputKeyup(value: string, index: number) {
const term = (value || '').trim();
+ const findingsFormGroup = (
+ (this.generalFindingsForm.get('significantFindingsList') as FormArray).at(
+ index,
+ ) as FormGroup
+ );
+ if ((findingsFormGroup.get('term')?.value ?? '') !== term) {
+ findingsFormGroup.patchValue(
+ {
+ term: null,
+ conceptID: null,
+ },
+ { emitEvent: false },
+ );
+ }
this.resetFindingsCheckbox(term);
if (term.length >= 3) {
this.masterdataService.searchDiagnosisBasedOnPageNo(term, 0).subscribe({
next: (results: any) => {
this.suggestedFindingsSearchList[index] =
results?.data?.sctMaster ?? [];
},
error: () => {
console.error('Error fetching findings data');
},
});
} else {
this.suggestedFindingsSearchList[index] = [];
}
}
onFindingsSelected(selected: any, index: number) {
const findingsFormArray = this.generalFindingsForm.get(
'significantFindingsList',
) as FormArray;
const findingsFormGroup = findingsFormArray.at(index) as FormGroup;
findingsFormGroup.patchValue({
- significantFindingsProvided: selected,
+ significantFindingsProvided: selected?.term || null,
conceptID: selected?.conceptID || null,
term: selected?.term || null,
});
this.resetFindingsCheckbox(selected?.term);
}Also applies to: 733-765
🤖 Prompt for AI Agents
Verify each finding against the current code and only fix it if needed.
In
`@src/app/app-modules/nurse-doctor/case-record/general-case-record/findings/findings.component.ts`
around lines 699 - 729, The selected option object is being stored into form
control clinicalObservationsProvided, causing the visible text and the SNOMED
pair (term/conceptID) to diverge when the user edits the text; change
onObservationSelected to store only the selected.term (string) into
clinicalObservationsProvided and still set conceptID and term controls from the
selected object (use selected?.term || '' for the visible field and
selected?.conceptID || null for conceptID), and update onObservationInputKeyup
to clear the associated conceptID/term when the user types (e.g., set
conceptID=null and term='' when term.length < 3 or when typing invalidates a
previous selection). Apply the same change to the corresponding
significantFindings handlers (the equivalent
onSignificantFindingSelected/onSignificantFindingInputKeyup functions) so the
visible text and SNOMED code stay in sync.
src/app/app-modules/nurse-doctor/case-record/general-case-record/findings/findings.component.ts
Outdated
Show resolved
Hide resolved
vishwab1
approved these changes
Mar 24, 2026
…care context - Fix race condition in clinical observations and significant findings autocomplete by tracking latest query per row index and discarding stale responses - Fix text/SNOMED code desync by storing only term string on selection and clearing conceptID/term fields on keyup before new selection - Fix checkbox visibility by scanning entire significantFindingsList array instead of relying on the last-edited row's transient state - Add null-safe optional chaining in getHealthIDDetails() before confirmCareContext() Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
|
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
📋 Description
JIRA ID:
AMM-2127
✅ Type of Change
Summary by CodeRabbit
New Features
Bug Fixes
Refactor