Skip to content

fix: amm-1655 #71

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
snehar-nd merged 1 commit into from
Jul 29, 2025
Merged

fix: amm-1655 #71

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
41 changes: 14 additions & 27 deletions .../general-case-record/diagnosis/general-opd-diagnosis/general-opd-diagnosis.component.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,35 +14,22 @@ <h4>{{ current_language_set?.casesheet?.provisionalDiag }}*</h4>
"
>
<ng-container [formGroupName]="i">
<div class="col-9">
<mat-form-field class="input-full-width">
<input
matInput
allowText="inputFieldValidator"
appDiagnosisSearch
[diagnosisListForm]="diagnosis"
required
name="viewDiagnosisProvided"
formControlName="viewProvisionalDiagnosisProvided"
maxlength="100"
minlength="3"
required
[previousSelected]="
generalDiagnosisForm.value.provisionalDiagnosisList
"
/>
<mat-icon
class="search-btn cursorPointer"
matSuffix
appDiagnosisSearch
[diagnosisListForm]="diagnosis"
[previousSelected]="
generalDiagnosisForm.value.provisionalDiagnosisList
"
>search</mat-icon
>
<div class="col-xs-12 col-sm-8 col-md-9">
<mat-form-field class="input-full-width" appearance="fill">
<mat-label>{{ current_language_set?.casesheet?.provisionalDiag }}</mat-label>
<input matInput type="text" autocomplete="off" name="viewProvisionalDiagnosisProvided"
formControlName="viewProvisionalDiagnosisProvided" minlength="3" maxlength="100" required #diagnosisInput
[matAutocomplete]="autoDiagnosis" (keyup)="onDiagnosisInputKeyup(diagnosisInput.value, i)" />
</mat-form-field>

<mat-autocomplete #autoDiagnosis="matAutocomplete" autoActiveFirstOption [displayWith]="displayDiagnosis"
(optionSelected)="onDiagnosisSelected($event.option.value, i)">
<mat-option *ngFor="let diag of suggestedDiagnosisList[i]" [value]="diag">
{{ diag.term }}
</mat-option>
</mat-autocomplete>
</div>

<div class="col-xs-12 col-sm-3 m-t-10">
<button
mat-mini-fab
Expand Down
34 changes: 34 additions & 0 deletions ...rd/general-case-record/diagnosis/general-opd-diagnosis/general-opd-diagnosis.component.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,7 @@ export class GeneralOpdDiagnosisComponent
implements OnInit, OnChanges, DoCheck
{
utils = new GeneralUtils(this.fb, this.sessionstorage);
suggestedDiagnosisList: any = [];

@Input()
generalDiagnosisForm!: FormGroup;
Expand All @@ -56,12 +57,14 @@ export class GeneralOpdDiagnosisComponent
current_language_set: any;
designation: any;
specialist!: boolean;

constructor(
private fb: FormBuilder,
public httpServiceService: HttpServiceService,
private doctorService: DoctorService,
private confirmationService: ConfirmationService,
readonly sessionstorage: SessionStorageService,
private masterdataService: MasterdataService
) {}

ngOnInit() {
Expand Down Expand Up @@ -252,4 +255,35 @@ export class GeneralOpdDiagnosisComponent
return true;
}
}

onDiagnosisInputKeyup(value: string, index: number) {
if (value.length >= 3) {
this.masterdataService
.searchDiagnosisBasedOnPageNo(value, index)
.subscribe((results: any) => {
this.suggestedDiagnosisList[index] = results?.data?.sctMaster;
});
} else {
this.suggestedDiagnosisList[index] = [];
}
}

displayDiagnosis(diagnosis: any): string {
return diagnosis?.term || '';
}

onDiagnosisSelected(selected: any, index: number) {
// this.patientQuickConsultForm.get(['provisionalDiagnosisList', index])?.setValue(selected);
const diagnosisFormArray = this.generalDiagnosisForm.get(
'provisionalDiagnosisList'
) as FormArray;
const diagnosisFormGroup = diagnosisFormArray.at(index) as FormGroup;

// Set the nested and top-level fields
diagnosisFormGroup.patchValue({
viewProvisionalDiagnosisProvided: selected,
conceptID: selected?.conceptID || null,
term: selected?.term || null,
});
}
}
43 changes: 16 additions & 27 deletions ...record/general-case-record/diagnosis/ncd-care-diagnosis/ncd-care-diagnosis.component.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -125,33 +125,22 @@ <h4>{{ current_language_set?.casesheet?.provisionalDiag }}</h4>
>
<ng-container [formGroupName]="i">
<div class="row">
<div class="col-xs-12 col-sm-9">
<mat-form-field class="input-full-width">
<input
matInput
allowText="inputFieldValidator"
appDiagnosisSearch
[diagnosisListForm]="diagnosis"
name="viewDiagnosisProvided"
formControlName="viewProvisionalDiagnosisProvided"
maxlength="100"
minlength="3"
[previousSelected]="
generalDiagnosisForm.value.provisionalDiagnosisList
"
/>
<mat-icon
class="search-btn cursorPointer"
matSuffix
appDiagnosisSearch
[diagnosisListForm]="diagnosis"
[previousSelected]="
generalDiagnosisForm.value?.provisionalDiagnosisList
"
>search</mat-icon
>
</mat-form-field>
</div>
<div class="col-xs-12 col-sm-8 col-md-9">
<mat-form-field class="input-full-width" appearance="fill">
<mat-label>{{ current_language_set?.casesheet?.provisionalDiag }}</mat-label>
<input matInput type="text" autocomplete="off" name="viewProvisionalDiagnosisProvided"
formControlName="viewProvisionalDiagnosisProvided" minlength="3" maxlength="100" required #diagnosisInput
[matAutocomplete]="autoDiagnosis" (keyup)="onDiagnosisInputKeyup(diagnosisInput.value, i)" />
</mat-form-field>

<mat-autocomplete #autoDiagnosis="matAutocomplete" autoActiveFirstOption [displayWith]="displayDiagnosis"
(optionSelected)="onDiagnosisSelected($event.option.value, i)">
<mat-option *ngFor="let diag of suggestedDiagnosisList[i]" [value]="diag">
{{ diag.term }}
</mat-option>
</mat-autocomplete>
</div>

<div class="col-xs-12 col-sm-3 m-t-10">
<button
mat-mini-fab
Expand Down
34 changes: 34 additions & 0 deletions ...e-record/general-case-record/diagnosis/ncd-care-diagnosis/ncd-care-diagnosis.component.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,9 @@ export class NcdCareDiagnosisComponent implements OnInit, DoCheck {
visitCategory: any;
attendantType: any;
enableNCDCondition = false;
suggestedDiagnosisList: any = [];


constructor(
private fb: FormBuilder,
private masterdataService: MasterdataService,
Expand Down Expand Up @@ -268,4 +271,35 @@ export class NcdCareDiagnosisComponent implements OnInit, DoCheck {
value,
);
}

onDiagnosisInputKeyup(value: string, index: number) {
if (value.length >= 3) {
this.masterdataService
.searchDiagnosisBasedOnPageNo(value, index)
.subscribe((results: any) => {
this.suggestedDiagnosisList[index] = results?.data?.sctMaster;
});
} else {
this.suggestedDiagnosisList[index] = [];
}
}

displayDiagnosis(diagnosis: any): string {
return diagnosis?.term || '';
}

onDiagnosisSelected(selected: any, index: number) {
// this.patientQuickConsultForm.get(['provisionalDiagnosisList', index])?.setValue(selected);
const diagnosisFormArray = this.generalDiagnosisForm.get(
'provisionalDiagnosisList'
) as FormArray;
const diagnosisFormGroup = diagnosisFormArray.at(index) as FormGroup;

// Set the nested and top-level fields
diagnosisFormGroup.patchValue({
viewProvisionalDiagnosisProvided: selected,
conceptID: selected?.conceptID || null,
term: selected?.term || null,
});
}
}
42 changes: 15 additions & 27 deletions ...eral-case-record/diagnosis/ncd-screening-diagnosis/ncd-screening-diagnosis.component.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,33 +18,21 @@ <h4 *ngIf="!enableProvisionalDiag">
"
>
<ng-container [formGroupName]="i">
<div class="col-9">
<mat-form-field class="input-full-width">
<input
matInput
allowText="inputFieldValidator"
appDiagnosisSearch
[diagnosisListForm]="diagnosis"
name="viewDiagnosisProvided"
formControlName="viewProvisionalDiagnosisProvided"
maxlength="100"
minlength="3"
[previousSelected]="
generalDiagnosisForm.value.provisionalDiagnosisList
"
/>
<mat-icon
class="search-btn cursorPointer"
matSuffix
appDiagnosisSearch
[diagnosisListForm]="diagnosis"
[previousSelected]="
generalDiagnosisForm.value.provisionalDiagnosisList
"
>search</mat-icon
>
</mat-form-field>
</div>
<div class="col-xs-12 col-sm-8 col-md-9">
<mat-form-field class="input-full-width" appearance="fill">
<mat-label>{{ current_language_set?.casesheet?.provisionalDiag }}</mat-label>
<input matInput type="text" autocomplete="off" name="viewProvisionalDiagnosisProvided"
formControlName="viewProvisionalDiagnosisProvided" minlength="3" maxlength="100" required #diagnosisInput
[matAutocomplete]="autoDiagnosis" (keyup)="onDiagnosisInputKeyup(diagnosisInput.value, i)" />
</mat-form-field>

<mat-autocomplete #autoDiagnosis="matAutocomplete" autoActiveFirstOption [displayWith]="displayDiagnosis"
(optionSelected)="onDiagnosisSelected($event.option.value, i)">
<mat-option *ngFor="let diag of suggestedDiagnosisList[i]" [value]="diag">
{{ diag.term }}
</mat-option>
</mat-autocomplete>
</div>
<div class="col-xs-12 col-sm-3 m-t-10">
<button
mat-mini-fab
Expand Down
34 changes: 34 additions & 0 deletions ...eneral-case-record/diagnosis/ncd-screening-diagnosis/ncd-screening-diagnosis.component.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@ import { SetLanguageComponent } from 'src/app/app-modules/core/components/set-la
import { HttpServiceService } from 'src/app/app-modules/core/services/http-service.service';
import {
DoctorService,
MasterdataService,
NurseService,
} from 'src/app/app-modules/nurse-doctor/shared/services';
import { IdrsscoreService } from 'src/app/app-modules/nurse-doctor/shared/services/idrsscore.service';
Expand Down Expand Up @@ -63,6 +64,7 @@ export class NcdScreeningDiagnosisComponent
confirmDisease = [];
confirmHyperTensionDisease = [];
enableProvisionalDiag!: boolean;
suggestedDiagnosisList: any = [];
constructor(
private fb: FormBuilder,
private doctorService: DoctorService,
Expand All @@ -71,6 +73,7 @@ export class NcdScreeningDiagnosisComponent
private idrsScoreService: IdrsscoreService,
private nurseService: NurseService,
readonly sessionstorage: SessionStorageService,
private masterdataService: MasterdataService
) {}

ngOnInit() {
Expand Down Expand Up @@ -324,4 +327,35 @@ export class NcdScreeningDiagnosisComponent
addHyperTensionToConfirmDisease(hyperConfirmation: any) {
this.idrsScoreService.finalDiagnosisHypertensionConfirm(hyperConfirmation);
}

onDiagnosisInputKeyup(value: string, index: number) {
if (value.length >= 3) {
this.masterdataService
.searchDiagnosisBasedOnPageNo(value, index)
.subscribe((results: any) => {
this.suggestedDiagnosisList[index] = results?.data?.sctMaster;
});
} else {
this.suggestedDiagnosisList[index] = [];
}
}

displayDiagnosis(diagnosis: any): string {
return diagnosis?.term || '';
}

onDiagnosisSelected(selected: any, index: number) {
// this.patientQuickConsultForm.get(['provisionalDiagnosisList', index])?.setValue(selected);
const diagnosisFormArray = this.generalDiagnosisForm.get(
'provisionalDiagnosisList'
) as FormArray;
const diagnosisFormGroup = diagnosisFormArray.at(index) as FormGroup;

// Set the nested and top-level fields
diagnosisFormGroup.patchValue({
viewProvisionalDiagnosisProvided: selected,
conceptID: selected?.conceptID || null,
term: selected?.term || null,
});
}
}
43 changes: 16 additions & 27 deletions ...ctor/case-record/general-case-record/diagnosis/pnc-diagnosis/pnc-diagnosis.component.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,33 +16,22 @@ <h4>{{ current_language_set?.casesheet?.provisionalDiag }}</h4>
>
<ng-container [formGroupName]="i">
<div class="row">
<div class="col-xs-12 col-sm-9 box">
<mat-form-field class="input-full-width">
<input
matInput
allowText="inputFieldValidator"
appDiagnosisSearch
name="viewProvisionalDiagnosisProvided"
formControlName="viewProvisionalDiagnosisProvided"
[diagnosisListForm]="diagnosis"
maxlength="100"
minlength="3"
[previousSelected]="
generalDiagnosisForm.value.provisionalDiagnosisList
"
/>
<mat-icon
class="search-btn"
matSuffix
appDiagnosisSearch
[diagnosisListForm]="diagnosis"
[previousSelected]="
generalDiagnosisForm.value.provisionalDiagnosisList
"
>search</mat-icon
>
</mat-form-field>
</div>
<div class="col-xs-12 col-sm-8 col-md-9">
<mat-form-field class="input-full-width" appearance="fill">
<mat-label>{{ current_language_set?.casesheet?.provisionalDiag }}</mat-label>
<input matInput type="text" autocomplete="off" name="viewProvisionalDiagnosisProvided"
formControlName="viewProvisionalDiagnosisProvided" minlength="3" maxlength="100" required #diagnosisInput
[matAutocomplete]="autoDiagnosis" (keyup)="onDiagnosisInputKeyup(diagnosisInput.value, i)" />
</mat-form-field>

<mat-autocomplete #autoDiagnosis="matAutocomplete" autoActiveFirstOption [displayWith]="displayDiagnosis"
(optionSelected)="onDiagnosisSelected($event.option.value, i)">
<mat-option *ngFor="let diag of suggestedDiagnosisList[i]" [value]="diag">
{{ diag.term }}
</mat-option>
</mat-autocomplete>
</div>

<div class="col-xs-12 col-sm-3 box pull-right">
<button
mat-mini-fab
Expand Down
Loading