From c02d3deb49af9c7798f052443983c6b6d82cdd95 Mon Sep 17 00:00:00 2001
From: SnehaRH <sneha@navadhiti.com>
Date: Fri, 27 Feb 2026 16:19:01 +0530
Subject: [PATCH 1/2] fix: amm-2192 remove mandatory for prescription

---
 .../prescription/prescription.component.html  |  7 -----
 .../workarea/workarea.component.ts            | 28 +------------------
 2 files changed, 1 insertion(+), 34 deletions(-)

diff --git a/src/app/app-modules/nurse-doctor/case-record/general-case-record/prescription/prescription.component.html b/src/app/app-modules/nurse-doctor/case-record/general-case-record/prescription/prescription.component.html
index a018ddb..ecd338d 100644
--- a/src/app/app-modules/nurse-doctor/case-record/general-case-record/prescription/prescription.component.html
+++ b/src/app/app-modules/nurse-doctor/case-record/general-case-record/prescription/prescription.component.html
@@ -45,7 +45,6 @@
           name="form"
           [(ngModel)]="currentPrescription.formName"
           (selectionChange)="getFormValueChanged()"
-          required
         >
           <mat-option
             *ngFor="let item of drugFormMaster"
@@ -70,7 +69,6 @@
           [(ngModel)]="tempDrugName"
           (keyup)="filterMedicine(tempDrugName)"
           (blur)="reEnterMedicine()"
-          required
           [matAutocomplete]="autoGroup"
         />
         <mat-autocomplete
@@ -94,7 +92,6 @@
           name="dose"
           [(ngModel)]="currentPrescription.dose"
           [disabled]="!currentPrescription.drugID"
-          required
         >
           <mat-option
             *ngFor="let item of filteredDrugDoseMaster"
@@ -116,7 +113,6 @@
           name="frequency"
           [(ngModel)]="currentPrescription.frequency"
           [disabled]="!currentPrescription.drugID"
-          required
         >
           <mat-option
             *ngFor="let item of drugFrequencyMaster"
@@ -140,7 +136,6 @@
           name="duration"
           [(ngModel)]="currentPrescription.duration"
           [disabled]="!currentPrescription.drugID"
-          required
         >
           <mat-option *ngFor="let item of drugDurationMaster" [value]="item">
             {{ item }}
@@ -157,7 +152,6 @@
           name="unit"
           [(ngModel)]="currentPrescription.unit"
           [disabled]="!currentPrescription.drugID"
-          required
         >
           <mat-option
             *ngFor="let item of drugDurationUnitMaster"
@@ -186,7 +180,6 @@
           name="quantity"
           [(ngModel)]="currentPrescription.qtyPrescribed"
           [disabled]="!currentPrescription.drugID"
-          required
         >
           <mat-option
             *ngFor="let item of drugDurationMaster | slice: 0 : 5"
diff --git a/src/app/app-modules/nurse-doctor/workarea/workarea.component.ts b/src/app/app-modules/nurse-doctor/workarea/workarea.component.ts
index 740fad9..6869b38 100644
--- a/src/app/app-modules/nurse-doctor/workarea/workarea.component.ts
+++ b/src/app/app-modules/nurse-doctor/workarea/workarea.component.ts
@@ -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,

From d4106b935c29a7387ceba224f71ce23a41c00551 Mon Sep 17 00:00:00 2001
From: SnehaRH <77656297+snehar-nd@users.noreply.github.com>
Date: Wed, 18 Mar 2026 20:36:13 +0530
Subject: [PATCH 2/2] fix: removed prescription data is required condition
 (#130)

---
 .../quick-consult.component.html              |  8 +----
 .../workarea/workarea.component.ts            | 31 -------------------
 2 files changed, 1 insertion(+), 38 deletions(-)

diff --git a/src/app/app-modules/nurse-doctor/quick-consult/quick-consult.component.html b/src/app/app-modules/nurse-doctor/quick-consult/quick-consult.component.html
index 81a8c18..03a6483 100644
--- a/src/app/app-modules/nurse-doctor/quick-consult/quick-consult.component.html
+++ b/src/app/app-modules/nurse-doctor/quick-consult/quick-consult.component.html
@@ -786,7 +786,7 @@ <h4>
                       name="form"
                       [(ngModel)]="tempform"
                       (selectionChange)="getFormValueChanged()"
-                      required
+
                     >
                       <mat-option
                         *ngFor="let item of drugFormMaster"
@@ -811,7 +811,6 @@ <h4>
                       [(ngModel)]="tempDrugName"
                       (keyup)="filterMedicine(tempDrugName)"
                       (blur)="reEnterMedicine()"
-                      required
                       [matAutocomplete]="autoGroup"
                     />
                     <mat-autocomplete
@@ -844,7 +843,6 @@ <h4>
                       name="dose"
                       [(ngModel)]="currentPrescription.dose"
                       [disabled]="!currentPrescription.drugID"
-                      required
                     >
                       <mat-option
                         *ngFor="let item of filteredDrugDoseMaster"
@@ -865,7 +863,6 @@ <h4>
                       name="frequency"
                       [(ngModel)]="currentPrescription.frequency"
                       [disabled]="!currentPrescription.drugID"
-                      required
                     >
                       <mat-option
                         *ngFor="let item of drugFrequencyMaster"
@@ -889,7 +886,6 @@ <h4>
                       name="duration"
                       [(ngModel)]="currentPrescription.duration"
                       [disabled]="!currentPrescription.drugID"
-                      required
                     >
                       <mat-option
                         *ngFor="let item of drugDurationMaster"
@@ -910,7 +906,6 @@ <h4>
                       name="unit"
                       [(ngModel)]="currentPrescription.unit"
                       [disabled]="!currentPrescription.drugID"
-                      required
                     >
                       <mat-option
                         *ngFor="let item of drugDurationUnitMaster"
@@ -938,7 +933,6 @@ <h4>
                       name="quantity"
                       [(ngModel)]="currentPrescription.qtyPrescribed"
                       [disabled]="!currentPrescription.drugID"
-                      required
                     >
                       <mat-option
                         *ngFor="let item of drugDurationMaster | slice: 0 : 5"
diff --git a/src/app/app-modules/nurse-doctor/workarea/workarea.component.ts b/src/app/app-modules/nurse-doctor/workarea/workarea.component.ts
index 6869b38..038a3d3 100644
--- a/src/app/app-modules/nurse-doctor/workarea/workarea.component.ts
+++ b/src/app/app-modules/nurse-doctor/workarea/workarea.component.ts
@@ -2682,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,