Release 3.4.0

pom.xml

@@ -5,7 +5,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>com.iemr.tm-ui</groupId>
   <artifactId>tm-ui</artifactId>
-  <version>3.0.0</version>
+  <version>3.4.0</version>
   <name>TM-UI</name>
   <description>Piramal - tm: Module ui</description>
   <packaging>war</packaging>
@@ -94,7 +94,7 @@
       <plugin>
         <groupId>org.codehaus.mojo</groupId>
         <artifactId>exec-maven-plugin</artifactId>
-        <version>3.1.0</version>
+        <version>3.4.0</version>
         <executions>
           <execution>
             <id>npm-install</id>

src/app/app-modules/core/components/beneficiary-details/beneficiary-details.component.html

@@ -19,6 +19,34 @@
       <tr style="color: #595959; font-size: 14px">
         <td>{{ beneficiary?.beneficiaryName }}</td>
       </tr>
+      <ng-container *ngIf="beneficiary?.fatherName">
+        <tr style="font-size: 14px; color: #000000">
+          <th id="fatherName">
+            {{ current_language_set?.bendetails?.fatherName }}:
+          </th>
+        </tr>
+        <tr style="color: #595959; font-size: 14px">
+          <td>{{ beneficiary?.fatherName }}</td>
+        </tr>
+      </ng-container>
+      <ng-container *ngIf="beneficiary?.lastName">
+        <tr style="font-size: 14px; color: #000000">
+          <th id="lastName">
+            {{ current_language_set?.bendetails?.lastName }}:
+          </th>
+        </tr>
+        <tr style="color: #595959; font-size: 14px">
+          <td>{{ beneficiary?.lastName }}</td>
+        </tr>
+      </ng-container>
+      <ng-container *ngIf="beneficiary?.preferredPhoneNum">
+        <tr style="font-size: 14px; color: #000000">
+          <th id="phoneNo">{{ current_language_set?.bendetails?.phoneNo }}:</th>
+        </tr>
+        <tr style="color: #595959; font-size: 14px">
+          <td>{{ beneficiary?.preferredPhoneNum }}</td>
+        </tr>
+      </ng-container>
       <tr style="font-size: 14px; color: #000000">
         <th id="gender">
           {{ current_language_set?.bendetails?.gender }} /

src/app/app-modules/nurse-doctor/case-record/general-case-record/diagnosis/general-opd-diagnosis/general-opd-diagnosis.component.html

@@ -8,41 +8,28 @@ <h4>{{ current_language_set?.casesheet?.provisionalDiag }}*</h4>
         <div
           class="col-12 row"
           *ngFor="
-            let diagnosis of getProvisionalDiagnosisList();
+            let diagnosis of provisionalDiagnosisControls;
             let i = index;
             let isLast = last
           "
         >
           <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

src/app/app-modules/nurse-doctor/case-record/general-case-record/diagnosis/general-opd-diagnosis/general-opd-diagnosis.component.ts

@@ -47,6 +47,7 @@
   implements OnInit, OnChanges, DoCheck
 {
   utils = new GeneralUtils(this.fb, this.sessionstorage);
+  suggestedDiagnosisList: any = [];
 
   @Input()
   generalDiagnosisForm!: FormGroup;
@@ -56,12 +57,14 @@
   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() {
@@ -186,8 +189,7 @@
         (<FormGroup>diagnosisArrayList.at(i)).controls[
           'viewProvisionalDiagnosisProvided'
         ].disable();
-        if (diagnosisArrayList.length < savedDiagnosisData.length)
-          this.addDiagnosis();
+        this.addDiagnosis();
       }
     }
   }
@@ -204,13 +206,11 @@
       );
     }
   }
-  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;
   }
 
   removeDiagnosisFromList(
@@ -252,4 +252,35 @@
       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 typeof diagnosis === 'string' ? diagnosis : 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,
+    });
+  }
 }

src/app/app-modules/nurse-doctor/case-record/general-case-record/diagnosis/ncd-care-diagnosis/ncd-care-diagnosis.component.html

@@ -118,40 +118,29 @@ <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
           "
         >
           <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

src/app/app-modules/nurse-doctor/case-record/general-case-record/diagnosis/ncd-care-diagnosis/ncd-care-diagnosis.component.ts

@@ -59,6 +59,9 @@
   visitCategory: any;
   attendantType: any;
   enableNCDCondition = false;
+  suggestedDiagnosisList: any = [];
+
+
   constructor(
     private fb: FormBuilder,
     private masterdataService: MasterdataService,
@@ -178,8 +181,7 @@
         (<FormGroup>diagnosisArrayList.at(i)).controls[
           'viewProvisionalDiagnosisProvided'
         ].disable();
-        if (diagnosisArrayList.length < savedDiagnosisData.length)
-          this.addDiagnosis();
+        this.addDiagnosis();
       }
     }
   }
@@ -197,13 +199,11 @@
     }
   }
 
-  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;
   }
 
   removeDiagnosisFromList(
@@ -268,4 +268,35 @@
       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 typeof diagnosis === 'string' ? diagnosis : 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,
+    });
+  }
 }

src/app/app-modules/nurse-doctor/case-record/general-case-record/diagnosis/ncd-screening-diagnosis/ncd-screening-diagnosis.component.html

@@ -12,39 +12,27 @@ <h4 *ngIf="!enableProvisionalDiag">
       <ng-container formArrayName="provisionalDiagnosisList">
         <div
           *ngFor="
-            let diagnosis of getProvisionalDiagnosisList();
+            let diagnosis of provisionalDiagnosisControls;
             let i = index;
             let isLast = last
           "
         >
           <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