nurse doctor changes

PSMRI · Apr 10, 2024 · 18f395a · 18f395a
1 parent 4dad219
commit 18f395a
Show file tree

Hide file tree

Showing 12 changed files with 244 additions and 130 deletions.
diff --git a/src/app/app-modules/core/directives/open-modal.directive.ts b/src/app/app-modules/core/directives/open-modal.directive.ts
@@ -73,7 +73,8 @@ export class OpenModalDirective implements OnInit, DoCheck {
   }
 
   openDialog(): void {
-    const searchTerm = this.diagnosisListForm.value.provisionalDiagnosis;
+    const searchTerm =
+      this.diagnosisListForm.value.viewProvisionalDiagnosisProvided;
     if (searchTerm.length > 2) {
       const dialogRef = this.dialog.open(DiagnosisSearchComponent, {
         width: '800px',

diff --git a/...record/general-case-record/diagnosis/ncd-care-diagnosis/ncd-care-diagnosis.component.html b/...record/general-case-record/diagnosis/ncd-care-diagnosis/ncd-care-diagnosis.component.html
@@ -1,6 +1,10 @@
 <div class="m-t-10" [formGroup]="generalDiagnosisForm">
   <div class="row">
-    <div class="col-xs-12 col-xs-6 box" *ngIf="enableNCDCondition">
+    <div
+      class="col-xs-12 col-xs-6 box"
+      style="width: 300px"
+      *ngIf="enableNCDCondition"
+    >
       <mat-label class="mat-label-text"
         >{{ current_language_set?.casesheet?.ncdCondition }}*</mat-label
       >
@@ -20,7 +24,11 @@
         >
       </mat-select>
     </div>
-    <div class="col-xs-12 col-xs-6 box" *ngIf="!enableNCDCondition">
+    <div
+      class="col-xs-12 col-xs-6 box"
+      style="width: 300px"
+      *ngIf="!enableNCDCondition"
+    >
       <mat-label class="mat-label-text">{{
         current_language_set?.casesheet?.ncdCondition
       }}</mat-label>
@@ -40,7 +48,11 @@
         >
       </mat-select>
     </div>
-    <div class="col-xs-12" *ngIf="isNcdScreeningConditionOther">
+    <div
+      class="col-xs-12"
+      style="width: 300px"
+      *ngIf="isNcdScreeningConditionOther"
+    >
       <mat-form-field class="input-full-width">
         <mat-label class="mat-label-text">{{
           current_language_set?.ncdConditionOther
@@ -57,7 +69,7 @@
         </textarea>
       </mat-form-field>
     </div>
-    <div class="col-xs-12 col-xs-6 box">
+    <div class="col-xs-12 col-xs-6 box" style="width: 300px">
       <mat-label class="mat-label-text">{{
         current_language_set?.casesheet?.typeOfNcd
       }}</mat-label>
@@ -106,63 +118,67 @@ <h4>{{ current_language_set?.casesheet?.provisionalDiag }}</h4>
           "
         >
           <ng-container [formGroupName]="i">
-            <div class="col-xs-12 col-sm-9">
-              <mat-form-field class="input-full-width">
-                <input
-                  matInput
-                  allowText="inputFieldValidator"
-                  appDiagnosisSearch
-                  [diagnosisListForm]="diagnosis"
-                  name="viewProvisionalDiagnosisProvided"
-                  formControlName="viewProvisionalDiagnosisProvided"
-                  maxlength="100"
-                  minlength="3"
-                  [addedDiagnosis]="
-                    generalDiagnosisForm.value.provisionalDiagnosisList
-                  "
-                />
-                <mat-icon
-                  class="search-btn cursorPointer"
-                  matSuffix
-                  appDiagnosisSearch
-                  [diagnosisListForm]="diagnosis"
-                  [addedDiagnosis]="
-                    generalDiagnosisForm.value?.provisionalDiagnosisList
+            <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="viewProvisionalDiagnosisProvided"
+                    formControlName="viewProvisionalDiagnosisProvided"
+                    maxlength="100"
+                    minlength="3"
+                    [addedDiagnosis]="
+                      generalDiagnosisForm.value.provisionalDiagnosisList
+                    "
+                  />
+                  <mat-icon
+                    class="search-btn cursorPointer"
+                    matSuffix
+                    appDiagnosisSearch
+                    [diagnosisListForm]="diagnosis"
+                    [addedDiagnosis]="
+                      generalDiagnosisForm.value?.provisionalDiagnosisList
+                    "
+                    >search</mat-icon
+                  >
+                </mat-form-field>
+              </div>
+              <div class="col-xs-12 col-sm-3 m-t-10">
+                <button
+                  mat-mini-fab
+                  type="button"
+                  color="warn"
+                  class="mat_warn_circle"
+                  style="margin-right: 5px"
+                  *ngIf="
+                    diagnosis.get('viewProvisionalDiagnosisProvided')
+                      ?.disabled ||
+                    i !== 0 ||
+                    (i === 0 &&
+                      generalDiagnosisForm.get('provisionalDiagnosisList')
+                        ?.value.viewProvisionalDiagnosisProvided !== null &&
+                      generalDiagnosisForm.get('provisionalDiagnosisList')
+                        ?.value.viewProvisionalDiagnosisProvided !== '')
                   "
-                  >search</mat-icon
+                  (click)="removeDiagnosisFromList(i, diagnosis)"
                 >
-              </mat-form-field>
-            </div>
-            <div class="col-xs-12 col-sm-3 m-t-10">
-              <button
-                mat-mini-fab
-                type="button"
-                color="warn"
-                class="mat_warn_circle"
-                *ngIf="
-                  diagnosis.get('viewProvisionalDiagnosisProvided')?.disabled ||
-                  i !== 0 ||
-                  (i === 0 &&
-                    generalDiagnosisForm.get('provisionalDiagnosisList')?.value
-                      .viewProvisionalDiagnosisProvided !== null &&
-                    generalDiagnosisForm.get('provisionalDiagnosisList')?.value
-                      .viewProvisionalDiagnosisProvided !== '')
-                "
-                (click)="removeDiagnosisFromList(i, diagnosis)"
-              >
-                <mat-icon>close</mat-icon>
-              </button>
-              <button
-                mat-mini-fab
-                type="button"
-                class="mat_blue_circle"
-                color="primary"
-                *ngIf="isLast"
-                [disabled]="checkProvisionalDiagnosisValidity(diagnosis)"
-                (click)="addDiagnosis()"
-              >
-                <mat-icon>add</mat-icon>
-              </button>
+                  <mat-icon>close</mat-icon>
+                </button>
+                <button
+                  mat-mini-fab
+                  type="button"
+                  class="mat_blue_circle"
+                  color="primary"
+                  *ngIf="isLast"
+                  [disabled]="checkProvisionalDiagnosisValidity(diagnosis)"
+                  (click)="addDiagnosis()"
+                >
+                  <mat-icon>add</mat-icon>
+                </button>
+              </div>
             </div>
           </ng-container>
         </div>

diff --git a/...app-modules/nurse-doctor/case-record/general-case-record/findings/findings.component.html b/...app-modules/nurse-doctor/case-record/general-case-record/findings/findings.component.html
@@ -176,7 +176,7 @@
             </mat-form-field>
           </div>
           <div class="col-xs-12 col-sm-6 col-md-4 col-lg-4 box">
-            <mat-form-field class="mat_label_fix">
+            <mat-form-field class="mat_label_fix" style="width: 260px">
               <mat-label class="mat-label-text">{{
                 current_language_set?.nurseData?.chiefComplaintsDetails
                   ?.selectunitOfDuration

diff --git a/...examination/systemic-examination/obstetric-examination/obstetric-examination.component.ts b/...examination/systemic-examination/obstetric-examination/obstetric-examination.component.ts
@@ -277,6 +277,7 @@ export class ObstetricExaminationComponent
 
       const serviceLineDetails: any =
         localStorage.getItem('serviceLineDetails');
+      const providerServiceID: any = localStorage.getItem('providerServiceID');
       const reqObj = {
         beneficiaryRegID: this.beneficiary.beneficiaryRegID,
         benFlowID: this.beneficiary.benFlowID,
@@ -286,7 +287,7 @@ export class ObstetricExaminationComponent
         foetalMonitorTestId: testId,
         testName: testName,
         vanID: JSON.parse(serviceLineDetails).vanID,
-        parkingPlaceID: JSON.parse(serviceLineDetails).parkingPlaceID,
+        ProviderServiceMapID: JSON.parse(providerServiceID),
         createdBy: localStorage.getItem('userName'),
       };
 

diff --git a/...or/history/general-opd-history/past-obsteric-history/past-obsteric-history.component.html b/...or/history/general-opd-history/past-obsteric-history/past-obsteric-history.component.html
@@ -54,7 +54,7 @@
           formControlName="value"
           class="checkbox"
           color="primary"
-          (selectionChange)="togglePastObstericHistory($event, i + 1)"
+          (chnage)="togglePastObstericHistory($event, i + 1)"
         >
           {{ i + 1 }}
         </mat-checkbox>
@@ -76,7 +76,7 @@
           <div class="col-xs-12 col-sm-6 col-md-4 col-lg-4 box">
             <mat-form-field class="input-full-width mat_form_field_width">
               <mat-label class="mat-label-text">{{
-                currentLanguageSet?.historyData?.opdNCDPNCHistory?.obstetric
+                currentLanguageSet?.historyData?.opd_NCD_PNCHistory?.obstetric
                   ?.number
               }}</mat-label>
               <input
@@ -116,10 +116,12 @@
                       [disabled]="
                         !complicationOptionConstraints[i]
                           .showAllPregComplication &&
-                        ((complication?.pregComplicationType === 'None' &&
+                        (((complication?.pregComplicationType === 'None' ||
+                          complication?.pregComplicationType === 'Nil') &&
                           complicationOptionConstraints[i]
                             ?.disableNonePregnancyComplication) ||
-                          (complication?.pregComplicationType !== 'None' &&
+                          ((complication?.pregComplicationType !== 'None' ||
+                            complication?.pregComplicationType !== 'Nil') &&
                             !complicationOptionConstraints[i]
                               .disableNonePregnancyComplication))
                       "

diff --git a/src/app/app-modules/nurse-doctor/oncologist-worklist/oncologist-worklist.component.ts b/src/app/app-modules/nurse-doctor/oncologist-worklist/oncologist-worklist.component.ts
@@ -185,12 +185,6 @@ export class OncologistWorklistComponent implements OnInit, DoCheck {
         }
       });
     }
-    this.activePage = 1;
-    this.pageChanged({
-      page: 1,
-      itemsPerPage: this.rowsPerPage,
-    });
-    this.currentPage = 1;
   }
 
   patientImageView(benregID: any) {

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
@@ -161,6 +161,7 @@ <h4>
                   mat-mini-fab
                   color="warn"
                   class="mat_warn_circle"
+                  style="margin-right: 5px"
                   [id]="'removeBtn' + i"
                   *ngIf="
                     i !== 0 ||
@@ -185,11 +186,11 @@ <h4>
                 <button
                   class="mat_blue_circle"
                   *ngIf="isLast"
+                  [id]="'addBtn' + i"
+                  [disabled]="checkComplaintFormValidity(chiefComplaint)"
                   type="button"
                   mat-mini-fab
                   color="primary"
-                  [id]="'addBtn' + i"
-                  [disabled]="checkComplaintFormValidity(chiefComplaint)"
                   (click)="addChiefComplaint()"
                 >
                   <span class="material-icons">add</span>
@@ -606,7 +607,7 @@ <h4>
                   <h4>
                     {{
                       currentLanguageSet?.DiagnosisDetails
-                        ?.viewProvisionalDiagnosisProvided
+                        ?.provisionaldiagnosis
                     }}*
                   </h4>
                 </header>
@@ -808,9 +809,7 @@ <h4>
                       <mat-option
                         *ngFor="let item of subFilteredDrugMaster"
                         [value]="item"
-                        (onSelectionselectionChange)="
-                          selectMedicineObject($event)
-                        "
+                        (onSelectionChange)="selectMedicineObject($event)"
                       >
                         {{ item.itemName }} {{ item.strength
                         }}{{ item.unitOfMeasurement }}
@@ -828,7 +827,7 @@ <h4>
                     currentLanguageSet?.Prescription?.dosage
                   }}</mat-label>
                   <mat-select
-                    class="input-full-width"
+                    class="input-full-width-select"
                     name="dose"
                     [(ngModel)]="currentPrescription.dose"
                     [disabled]="!currentPrescription.drugID"
@@ -847,7 +846,7 @@ <h4>
                     currentLanguageSet?.Prescription?.frequency
                   }}</mat-label>
                   <mat-select
-                    class="input-full-width"
+                    class="input-full-width-select"
                     name="frequency"
                     [(ngModel)]="currentPrescription.frequency"
                     [disabled]="!currentPrescription.drugID"
@@ -869,7 +868,7 @@ <h4>
                       ?.duration
                   }}</mat-label>
                   <mat-select
-                    class="input-full-width"
+                    class="input-full-width-select"
                     name="duration"
                     [(ngModel)]="currentPrescription.duration"
                     [disabled]="!currentPrescription.drugID"
@@ -888,7 +887,7 @@ <h4>
                     currentLanguageSet?.Prescription?.unit
                   }}</mat-label>
                   <mat-select
-                    class="input-full-width"
+                    class="input-full-width-select"
                     name="unit"
                     [(ngModel)]="currentPrescription.unit"
                     [disabled]="!currentPrescription.drugID"
@@ -914,7 +913,7 @@ <h4>
                     currentLanguageSet?.Prescription?.quantity
                   }}</mat-label>
                   <mat-select
-                    class="input-full-width"
+                    class="input-full-width-select"
                     name="quantity"
                     [(ngModel)]="currentPrescription.qtyPrescribed"
                     [disabled]="!currentPrescription.drugID"
@@ -943,7 +942,7 @@ <h4>
                     currentLanguageSet?.Prescription?.Route
                   }}</mat-label>
                   <mat-select
-                    class="input-full-width"
+                    class="input-full-width-select"
                     name="route"
                     [(ngModel)]="currentPrescription.route"
                     [disabled]="!currentPrescription.drugID"
@@ -983,6 +982,7 @@ <h4>
                     [disabled]="prescriptionForm.invalid"
                     mat-raised-button
                     color="primary"
+                    class="mat_blue"
                     type="button"
                     (click)="submitForUpload()"
                   >
@@ -1015,11 +1015,7 @@ <h4>
                         <legend>
                           {{ drug.value.drugName }}
                           {{ drug.value.drugStrength }}
-                          {{
-                            drug.value.isEDL
-                              ? ""
-                              : currentLanguageSet?.nonEDLMedicine
-                          }}
+                          {{ drug.value.isEDL ? "" : "- (Non-EDL) Medicine" }}
                         </legend>
                         <div class="row">
                           <div class="col-md-1 right-padding-remove-desktop">
@@ -1103,7 +1099,6 @@ <h4>
                                 readonly="true"
                                 type="text"
                                 matInput
-                                allowText="textAreaValidator"
                                 formControlName="instructions"
                               />
                             </mat-form-field>
@@ -1112,9 +1107,9 @@ <h4>
                             <button
                               mat-mini-fab
                               id="deleteMedicine"
-                              style="margin-right: 3px"
                               (click)="deleteMedicine(j, drug.value.id)"
                               color="warn"
+                              class="mat_warn_circle"
                             >
                               <span class="material-icons">close</span>
                             </button>