Skip to content

Updating 3.6.2 branch with 3.6.1 code #132

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 4 commits into from
Mar 24, 2026
+2 −72
Merged

Updating 3.6.2 branch with 3.6.1 code #132

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
320d5f3
Merge pull request #126 from PSMRI/release-3.6.2
vanitha1822 Feb 27, 2026
c02d3de
fix: amm-2192 remove mandatory for prescription
snehar-nd Feb 27, 2026
e3324ec
Merge pull request #127 from PSMRI/sn/3.6.2
snehar-nd Feb 27, 2026
d4106b9
fix: removed prescription data is required condition (#130)
snehar-nd Mar 18, 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
7 changes: 0 additions & 7 deletions ...les/nurse-doctor/case-record/general-case-record/prescription/prescription.component.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,6 @@
name="form"
[(ngModel)]="currentPrescription.formName"
(selectionChange)="getFormValueChanged()"
required
>
<mat-option
*ngFor="let item of drugFormMaster"
Expand All @@ -70,7 +69,6 @@
[(ngModel)]="tempDrugName"
(keyup)="filterMedicine(tempDrugName)"
(blur)="reEnterMedicine()"
required
[matAutocomplete]="autoGroup"
/>
<mat-autocomplete
Expand All @@ -94,7 +92,6 @@
name="dose"
[(ngModel)]="currentPrescription.dose"
[disabled]="!currentPrescription.drugID"
required
>
<mat-option
*ngFor="let item of filteredDrugDoseMaster"
Expand All @@ -116,7 +113,6 @@
name="frequency"
[(ngModel)]="currentPrescription.frequency"
[disabled]="!currentPrescription.drugID"
required
>
<mat-option
*ngFor="let item of drugFrequencyMaster"
Expand All @@ -140,7 +136,6 @@
name="duration"
[(ngModel)]="currentPrescription.duration"
[disabled]="!currentPrescription.drugID"
required
>
<mat-option *ngFor="let item of drugDurationMaster" [value]="item">
{{ item }}
Expand All @@ -157,7 +152,6 @@
name="unit"
[(ngModel)]="currentPrescription.unit"
[disabled]="!currentPrescription.drugID"
required
>
<mat-option
*ngFor="let item of drugDurationUnitMaster"
Expand Down Expand Up @@ -186,7 +180,6 @@
name="quantity"
[(ngModel)]="currentPrescription.qtyPrescribed"
[disabled]="!currentPrescription.drugID"
required
>
<mat-option
*ngFor="let item of drugDurationMaster | slice: 0 : 5"
Expand Down
8 changes: 1 addition & 7 deletions src/app/app-modules/nurse-doctor/quick-consult/quick-consult.component.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -786,7 +786,7 @@ <h4>
name="form"
[(ngModel)]="tempform"
(selectionChange)="getFormValueChanged()"
required

>
<mat-option
*ngFor="let item of drugFormMaster"
Expand All @@ -811,7 +811,6 @@ <h4>
[(ngModel)]="tempDrugName"
(keyup)="filterMedicine(tempDrugName)"
(blur)="reEnterMedicine()"
required
[matAutocomplete]="autoGroup"
/>
<mat-autocomplete
Expand Down Expand Up @@ -844,7 +843,6 @@ <h4>
name="dose"
[(ngModel)]="currentPrescription.dose"
[disabled]="!currentPrescription.drugID"
required
>
<mat-option
*ngFor="let item of filteredDrugDoseMaster"
Expand All @@ -865,7 +863,6 @@ <h4>
name="frequency"
[(ngModel)]="currentPrescription.frequency"
[disabled]="!currentPrescription.drugID"
required
>
<mat-option
*ngFor="let item of drugFrequencyMaster"
Expand All @@ -889,7 +886,6 @@ <h4>
name="duration"
[(ngModel)]="currentPrescription.duration"
[disabled]="!currentPrescription.drugID"
required
>
<mat-option
*ngFor="let item of drugDurationMaster"
Expand All @@ -910,7 +906,6 @@ <h4>
name="unit"
[(ngModel)]="currentPrescription.unit"
[disabled]="!currentPrescription.drugID"
required
>
<mat-option
*ngFor="let item of drugDurationUnitMaster"
Expand Down Expand Up @@ -938,7 +933,6 @@ <h4>
name="quantity"
[(ngModel)]="currentPrescription.qtyPrescribed"
[disabled]="!currentPrescription.drugID"
required
>
<mat-option
*ngFor="let item of drugDurationMaster | slice: 0 : 5"
Expand Down
59 changes: 1 addition & 58 deletions src/app/app-modules/nurse-doctor/workarea/workarea.component.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2123,33 +2123,7 @@ export class WorkareaComponent
}
}

// Ensure doctor has added at least one prescription
if (this.attendant === 'doctor') {
try {
const drugPrescriptionForm = <FormGroup>(
(caseRecordForm && caseRecordForm.controls
? caseRecordForm.controls['drugPrescriptionForm']
: null)
);
if (drugPrescriptionForm) {
let prescribedDrugs =
drugPrescriptionForm.value &&
drugPrescriptionForm.value.prescribedDrugs
? drugPrescriptionForm.value.prescribedDrugs
: [];
prescribedDrugs = prescribedDrugs.filter((d: any) => !!d.createdBy);
if (!prescribedDrugs || prescribedDrugs.length === 0) {
required.push(
this.current_language_set?.Prescription?.prescriptionRequired ||
'Please add at least one prescription',
);
}
}
} catch (err) {
console.warn('Error validating prescription presence', err);
}
}


if (required.length) {
this.confirmationService.notify(
this.current_language_set.alerts.info.belowFields,
Expand Down Expand Up @@ -2708,37 +2682,6 @@ export class WorkareaComponent
}
}

// For quick consult doctor flow, ensure at least one prescription exists
if (this.attendant === 'doctor') {
try {
const caseRecordForm = <FormGroup>(
this.patientMedicalForm.controls['patientCaseRecordForm']
);
const prescription =
caseRecordForm && caseRecordForm.controls
? caseRecordForm.controls['drugPrescriptionForm']
: null;
if (prescription) {
let prescribedDrugs =
prescription.value && prescription.value.prescribedDrugs
? prescription.value.prescribedDrugs
: [];
prescribedDrugs = prescribedDrugs.filter((d: any) => !!d.createdBy);
if (!prescribedDrugs || prescribedDrugs.length === 0) {
required.push(
this.current_language_set?.Prescription?.prescriptionRequired ||
'Please add at least one prescription',
);
}
}
} catch (err) {
console.warn(
'Error validating quick consult prescription presence',
err,
);
}
}

if (required.length) {
this.confirmationService.notify(
this.current_language_set.alerts.info.belowFields,
Expand Down
Loading