Skip to content

Update with main #174

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
helenKaryamsetty merged 2 commits into from
Aug 22, 2025
Merged

Update with main #174

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
92935d7
fix: aam-1725 provisional diagnosis rendering issue fix and performan…
5Amogh Jul 31, 2025
9add7a8
Merge pull request #168 from PSMRI/release-3.2.1
drtechie Aug 13, 2025
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
2 changes: 1 addition & 1 deletion .../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 @@ -26,7 +26,7 @@
</header>
<ng-container formArrayName="provisionalDiagnosisList">
<div class="row align-items-center m-t-10"
*ngFor="let diagnosis of getProvisionalDiagnosisList(); let i = index; let isLast = last">
*ngFor="let diagnosis of provisionalDiagnosisControls; let i = index; let isLast = last">
<ng-container [formGroupName]="i">
<!-- Diagnosis Input -->
<div class="col-xs-12 col-sm-8 col-md-9">
Expand Down
16 changes: 7 additions & 9 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 @@ -94,13 +94,11 @@ export class GeneralOpdDiagnosisComponent
this.current_language_set = getLanguageJson.currentLanguageObject;
}

getProvisionalDiagnosisList(): AbstractControl[] | null {
const provisionalDiagnosisListControl = this.generalDiagnosisForm.get(
'provisionalDiagnosisList',
get provisionalDiagnosisControls(): AbstractControl[] {
return (
(this.generalDiagnosisForm.get('provisionalDiagnosisList') as FormArray)
?.controls || []
);
return provisionalDiagnosisListControl instanceof FormArray
? provisionalDiagnosisListControl.controls
: null;
}

get specialistDaignosis() {
Expand Down Expand Up @@ -203,8 +201,8 @@ export class GeneralOpdDiagnosisComponent
(<FormGroup>diagnosisArrayList.at(i)).controls[
'viewProvisionalDiagnosisProvided'
].disable();
if (diagnosisArrayList.length < savedDiagnosisData.length)
this.addDiagnosis();
// if (diagnosisArrayList.length < savedDiagnosisData.length)
this.addDiagnosis();
}
}
}
Expand Down Expand Up @@ -280,7 +278,7 @@ export class GeneralOpdDiagnosisComponent
}

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

onDiagnosisSelected(selected: any, index: number) {
Expand Down
2 changes: 1 addition & 1 deletion ...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 @@ -106,7 +106,7 @@ <h4>{{ current_language_set?.casesheet?.provisionalDiag }}</h4>
</header>
<ng-container formArrayName="provisionalDiagnosisList">
<div class="row align-items-center m-t-10"
*ngFor="let diagnosis of getProvisionalDiagnosisList(); let i = index; let isLast = last">
*ngFor="let diagnosis of provisionalDiagnosisControls; let i = index; let isLast = last">
<ng-container [formGroupName]="i">
<!-- Diagnosis Input -->
<div class="col-xs-12 col-sm-8 col-md-9">
Expand Down
16 changes: 7 additions & 9 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 @@ -104,13 +104,11 @@ export class NcdCareDiagnosisComponent implements OnInit, DoCheck, OnDestroy {
this.current_language_set = getLanguageJson.currentLanguageObject;
}

getProvisionalDiagnosisList(): AbstractControl[] | null {
const provisionalDiagnosisListControl = this.generalDiagnosisForm.get(
'provisionalDiagnosisList',
get provisionalDiagnosisControls(): AbstractControl[] {
return (
(this.generalDiagnosisForm.get('provisionalDiagnosisList') as FormArray)
?.controls || []
);
return provisionalDiagnosisListControl instanceof FormArray
? provisionalDiagnosisListControl.controls
: null;
}

getDoctorMasterData() {
Expand Down Expand Up @@ -207,8 +205,8 @@ export class NcdCareDiagnosisComponent implements OnInit, DoCheck, OnDestroy {
(<FormGroup>diagnosisArrayList.at(i)).controls[
'viewProvisionalDiagnosisProvided'
].disable();
if (diagnosisArrayList.length < savedDiagnosisData.length)
this.addDiagnosis();
// if (diagnosisArrayList.length < savedDiagnosisData.length)
this.addDiagnosis();
}
}
}
Expand Down Expand Up @@ -305,7 +303,7 @@ export class NcdCareDiagnosisComponent implements OnInit, DoCheck, OnDestroy {
}

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

onDiagnosisSelected(selected: any, index: number) {
Expand Down
2 changes: 1 addition & 1 deletion ...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 @@ -10,7 +10,7 @@ <h4 *ngIf="!enableProvisionalDiag">
</header>
<ng-container formArrayName="provisionalDiagnosisList">
<div class="row align-items-center m-t-10"
*ngFor="let diagnosis of getProvisionalDiagnosisList(); let i = index; let isLast = last">
*ngFor="let diagnosis of provisionalDiagnosisControls; let i = index; let isLast = last">
<ng-container [formGroupName]="i">
<!-- Diagnosis Input -->
<div class="col-xs-12 col-sm-8 col-md-9">
Expand Down
16 changes: 7 additions & 9 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 @@ -153,13 +153,11 @@ export class NcdScreeningDiagnosisComponent
});
}

getProvisionalDiagnosisList(): AbstractControl[] | null {
const provisionalDiagnosisListControl = this.generalDiagnosisForm.get(
'provisionalDiagnosisList',
get provisionalDiagnosisControls(): AbstractControl[] {
return (
(this.generalDiagnosisForm.get('provisionalDiagnosisList') as FormArray)
?.controls || []
);
return provisionalDiagnosisListControl instanceof FormArray
? provisionalDiagnosisListControl.controls
: null;
}

ngDoCheck() {
Expand Down Expand Up @@ -342,8 +340,8 @@ export class NcdScreeningDiagnosisComponent
(<FormGroup>diagnosisArrayList.at(i)).controls[
'viewProvisionalDiagnosisProvided'
].disable();
if (diagnosisArrayList.length < savedDiagnosisData.length)
this.addDiagnosis();
//if (diagnosisArrayList.length < savedDiagnosisData.length)
this.addDiagnosis();
}
}
}
Expand Down Expand Up @@ -556,7 +554,7 @@ export class NcdScreeningDiagnosisComponent
}

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

onDiagnosisSelected(selected: any, index: number) {
Expand Down
2 changes: 1 addition & 1 deletion ...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 @@ -8,7 +8,7 @@ <h4>{{ current_language_set?.casesheet?.provisionalDiag }}</h4>
<ng-container formArrayName="provisionalDiagnosisList">
<div
*ngFor="
let diagnosis of getProvisionalDiagnosisList();
let diagnosis of provisionalDiagnosisControls;
let i = index;
let isLast = last
"
Expand Down
14 changes: 6 additions & 8 deletions ...doctor/case-record/general-case-record/diagnosis/pnc-diagnosis/pnc-diagnosis.component.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -177,13 +177,11 @@ export class PncDiagnosisComponent
}
}

getProvisionalDiagnosisList(): AbstractControl[] | null {
const provisionalDiagnosisListControl = this.generalDiagnosisForm.get(
'provisionalDiagnosisList',
get provisionalDiagnosisControls(): AbstractControl[] {
return (
(this.generalDiagnosisForm.get('provisionalDiagnosisList') as FormArray)
?.controls || []
);
return provisionalDiagnosisListControl instanceof FormArray
? provisionalDiagnosisListControl.controls
: null;
}

getConfirmatoryDiagnosisList(): AbstractControl[] | null {
Expand Down Expand Up @@ -332,8 +330,8 @@ export class PncDiagnosisComponent
(<FormGroup>provisionalDiagnosisList.at(i)).controls[
'viewProvisionalDiagnosisProvided'
].disable();
if (provisionalDiagnosisList.length < provisionalDiagnosisDataList.length)
this.addProvisionalDiagnosis();
//if (provisionalDiagnosisList.length < provisionalDiagnosisDataList.length)
this.addProvisionalDiagnosis();
}
}

Expand Down
5 changes: 2 additions & 3 deletions src/app/app-modules/nurse-doctor/quick-consult/quick-consult.component.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -680,8 +680,7 @@ export class QuickConsultComponent
(<FormGroup>diagnosisArrayList.at(i)).controls[
'viewProvisionalDiagnosisProvided'
].disable();
if (diagnosisArrayList.length < savedDiagnosisData.length)
this.addDiagnosis();
this.addDiagnosis();
}
}
this.patchPrescriptionDetails(response.prescription);
Expand Down Expand Up @@ -1372,7 +1371,7 @@ export class QuickConsultComponent
}

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

onDiagnosisSelected(selected: any, index: number) {
Expand Down
Loading