Release 3.4.1

pom.xml

@@ -5,7 +5,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>com.iemr.tm-ui</groupId>
   <artifactId>tm-ui</artifactId>
-  <version>3.4.0</version>
+  <version>3.4.1</version>
   <name>TM-UI</name>
   <description>Piramal - tm: Module ui</description>
   <packaging>war</packaging>

src/app/app-modules/core/services/http-service.service.ts

@@ -21,8 +21,15 @@ export class HttpServiceService {
 
   constructor(
     private _http: HttpClient,
-    private http: HttpClient,
-  ) {}
+    private http: HttpClient
+  ) 
+  {
+    const storedLang = localStorage.getItem('appLanguage');
+    this.language = storedLang ? JSON.parse(storedLang) : null;
+
+    this.appCurrentLanguge = new BehaviorSubject(this.language);
+    this.currentLangugae$ = this.appCurrentLanguge.asObservable();
+  }
 
   fetchLanguageSet() {
     console.log('Here i come');
@@ -34,6 +41,8 @@ export class HttpServiceService {
   getCurrentLanguage(response: any) {
     console.log('here at one', response);
     this.language = response;
+    localStorage.setItem('appLanguage', JSON.stringify(response));
+
     console.log('teste', this.language);
     this.appCurrentLanguge.next(response);
     console.log('here at two', this.appCurrentLanguge.value);

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

@@ -189,7 +189,10 @@ export class GeneralOpdDiagnosisComponent
         (<FormGroup>diagnosisArrayList.at(i)).controls[
           'viewProvisionalDiagnosisProvided'
         ].disable();
-        this.addDiagnosis();
+
+        if (diagnosisArrayList.length < savedDiagnosisData.length) {
+          this.addDiagnosis();
+        }
       }
     }
   }

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

@@ -129,7 +129,7 @@ <h4>{{ current_language_set?.casesheet?.provisionalDiag }}</h4>
               <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
+                  formControlName="viewProvisionalDiagnosisProvided" minlength="3" maxlength="100" #diagnosisInput
                   [matAutocomplete]="autoDiagnosis" (keyup)="onDiagnosisInputKeyup(diagnosisInput.value, i)" />
               </mat-form-field>
 

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

@@ -181,7 +181,9 @@ export class NcdCareDiagnosisComponent implements OnInit, DoCheck {
         (<FormGroup>diagnosisArrayList.at(i)).controls[
           'viewProvisionalDiagnosisProvided'
         ].disable();
-        this.addDiagnosis();
+        if (diagnosisArrayList.length < savedDiagnosisData.length) {
+          this.addDiagnosis();
+        }
       }
     }
   }

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

@@ -22,7 +22,7 @@ <h4 *ngIf="!enableProvisionalDiag">
                 <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
+                    formControlName="viewProvisionalDiagnosisProvided" minlength="3" maxlength="100" #diagnosisInput
                     [matAutocomplete]="autoDiagnosis" (keyup)="onDiagnosisInputKeyup(diagnosisInput.value, i)" />
                 </mat-form-field>
 

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

@@ -220,7 +220,9 @@ export class NcdScreeningDiagnosisComponent
         (<FormGroup>diagnosisArrayList.at(i)).controls[
           'viewProvisionalDiagnosisProvided'
         ].disable();
-        this.addDiagnosis();
+        if (diagnosisArrayList.length < savedDiagnosisData.length) {
+          this.addDiagnosis();
+        }
       }
     }
   }

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

@@ -281,9 +281,9 @@ export class PncDiagnosisComponent
       .subscribe((res: any) => {
         if (res && res.statusCode === 200 && res.data && res.data.diagnosis) {
           this.generalDiagnosisForm.patchValue(res.data.diagnosis);
-          if (res.data.diagnosis.provisionalDiagnosisList) {
+          if (res.data.diagnosis) {
             this.patchDiagnosisDetails(
-              res.data.diagnosis.provisionalDiagnosisList,
+              res.data.diagnosis
             );
           }
         }
@@ -297,6 +297,8 @@ export class PncDiagnosisComponent
     this.handleDiagnosisData(diagnosis);
   }
   handleDiagnosisData(diagnosis: any) {
+        console.log("provisionalDiagnosisDataList dia", diagnosis.provisionalDiagnosisList);
+
     if (
       diagnosis.provisionalDiagnosisList &&
       diagnosis.provisionalDiagnosisList.length > 0
@@ -315,23 +317,31 @@ export class PncDiagnosisComponent
     const provisionalDiagnosisList = this.generalDiagnosisForm.controls[
       'provisionalDiagnosisList'
     ] as FormArray;
+
+    console.log("provisionalDiagnosisDataList", provisionalDiagnosisDataList);
+
+
     for (let i = 0; i < provisionalDiagnosisDataList.length; i++) {
       provisionalDiagnosisList.at(i).patchValue({
+        provisionalDiagnosis: provisionalDiagnosisDataList[i].term,
         viewProvisionalDiagnosisProvided: provisionalDiagnosisDataList[i].term,
         term: provisionalDiagnosisDataList[i].term,
         conceptID: provisionalDiagnosisDataList[i].conceptID,
       });
       (<FormGroup>provisionalDiagnosisList.at(i)).controls[
         'viewProvisionalDiagnosisProvided'
       ].disable();
-      this.addProvisionalDiagnosis();
-    }
+      if (provisionalDiagnosisList.length < provisionalDiagnosisDataList.length)
+        this.addProvisionalDiagnosis();
+     }
   }
 
   handleConfirmatoryDiagnosisData(confirmatoryDiagnosisDataList: any) {
     const confirmatoryDiagnosisList = this.generalDiagnosisForm.controls[
       'confirmatoryDiagnosisList'
     ] as FormArray;
+        console.log("confirmatoryDiagnosisDataList", confirmatoryDiagnosisDataList);
+
     for (let i = 0; i < confirmatoryDiagnosisDataList.length; i++) {
       confirmatoryDiagnosisList.at(i).patchValue({
         viewConfirmatoryDiagnosisProvided:
@@ -342,9 +352,7 @@ export class PncDiagnosisComponent
       (<FormGroup>confirmatoryDiagnosisList.at(i)).controls[
         'viewConfirmatoryDiagnosisProvided'
       ].disable();
-      if (
-        confirmatoryDiagnosisList.length < confirmatoryDiagnosisDataList.length
-      )
+      if (confirmatoryDiagnosisList.length < confirmatoryDiagnosisDataList.length)
         this.addConfirmatoryDiagnosis();
     }
   }
@@ -448,6 +456,7 @@ export class PncDiagnosisComponent
 
     // Set the nested and top-level fields
     diagnosisFormGroup.patchValue({
+      provisionalDiagnosis: selected?.term || null,
       viewProvisionalDiagnosisProvided: selected,
       conceptID: selected?.conceptID || null,
       term: selected?.term || null,

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

@@ -204,27 +204,30 @@ export class FindingsComponent implements OnInit, OnDestroy, DoCheck {
   }
 
   doctorMasterDataSubscription: any;
-  getDoctorMasterData() {
+  getDoctorMasterData() {    
     this.doctorMasterDataSubscription =
       this.masterdataService.nurseMasterData$.subscribe((masterData) => {
         if (masterData) {
           this.chiefComplaintMaster = masterData.chiefComplaintMaster.slice();
           this.chiefComplaintTemporarayList[0] =
             this.chiefComplaintMaster.slice();
 
-          if (this.caseRecordMode === 'view') {
+          if (String(this.caseRecordMode) === 'view') {
             this.beneficiaryRegID =
               this.sessionstorage.getItem('beneficiaryRegID');
             this.visitID = this.sessionstorage.getItem('visitID');
             this.visitCategory = this.sessionstorage.getItem('visitCategory');
 
             const specialistFlagString =
               this.sessionstorage.getItem('specialist_flag');
+
             if (
               this.sessionstorage.getItem('referredVisitCode') ===
                 'undefined' ||
-              this.sessionstorage.getItem('referredVisitCode') === null
+              this.sessionstorage.getItem('referredVisitCode') === null ||
+              this.sessionstorage.getItem('referredVisitCode') === ''
             ) {
+
               this.getFindingDetails(
                 this.beneficiaryRegID,
                 this.visitID,

src/app/app-modules/nurse-doctor/case-record/general-case-record/test-and-radiology/test-and-radiology.component.html

@@ -52,7 +52,9 @@ <h4 class="norecord">
           </tr>
         </tbody>
         <tbody *ngIf="filteredLabResults?.length > 0">
-          <ng-container *ngFor="let test of currentLabPagedList; let i = index">
+          <ng-container *ngFor="let test of filteredLabResults 
+                        | paginate: { itemsPerPage: currentLabRowsPerPage, currentPage: currentLabActivePage }; let i = index">
+
             <tr>
               <td
                 [attr.rowspan]="test?.componentList.length + 1"
@@ -85,17 +87,17 @@ <h4 class="norecord">
                   vertical-align: middle;
                 "
               >
-                {{ component?.componentName }}
+                  {{ component?.componentName }}
               </td>
               <td
                 style="width: 110px; word-break: normal; vertical-align: middle"
               >
-                {{ component?.testResultValue }}
+                  {{ component?.testResultValue }}
               </td>
               <td
                 style="width: 150px; word-break: normal; vertical-align: middle"
               >
-                {{ component?.testResultUnit }}
+                  {{ component?.testResultUnit }}
               </td>
               <td
                 style="
@@ -120,7 +122,7 @@ <h4 class="norecord">
             <td colspan="7">
               <pagination-controls
                 class="pull-right"
-                (pageChanged)="currentLabPageChanged($event)"
+               (pageChange)="currentLabActivePage = $event"
                 *ngIf="filteredLabResults.length"
                 previousText="&lsaquo;"
                 nextText="&rsaquo;"

src/app/app-modules/nurse-doctor/case-sheet/cancer-case-sheet/cancer-doctor-diagnosis-case-sheet/cancer-doctor-diagnosis-case-sheet.component.ts

@@ -177,20 +177,19 @@ export class CancerDoctorDiagnosisCaseSheetComponent
     return len > 0 ? new Array(len).join('0') + this : this;
   }
   downloadSign() {
-    if (this.beneficiaryDetails && this.beneficiaryDetails.tCSpecialistUserID) {
-      const tCSpecialistUserID = this.beneficiaryDetails.tCSpecialistUserID;
-      this.doctorService.downloadSign(tCSpecialistUserID).subscribe(
-        (response) => {
-          const blob = new Blob([response], { type: response.type });
-          this.showSign(blob);
-        },
-        (err) => {
-          console.log('error');
-        },
-      );
-    } else {
-      console.log('No tCSpecialistUserID found');
-    }
+   const userId =
+      this.beneficiaryDetails?.tCSpecialistUserID ??
+      this.sessionstorage.getItem('userID');
+
+    this.doctorService.downloadSign(userId).subscribe(
+      (response: any) => {
+        const blob = new Blob([response], { type: response.type });
+        this.showSign(blob);
+      },
+      (err: any) => {
+        console.error('Error downloading signature:', err);
+      }
+    );
   }
   showSign(blob: any) {
     const reader = new FileReader();

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

@@ -29,6 +29,7 @@ import { RegistrarService } from 'src/app/app-modules/registrar/shared/services/
 import { NurseService, MasterdataService } from '../../../shared/services';
 import * as moment from 'moment';
 import { SessionStorageService } from 'Common-UI/src/registrar/services/session-storage.service';
+import { map, Observable } from 'rxjs';
 
 @Component({
   selector: 'app-doctor-diagnosis-case-sheet',
@@ -100,6 +101,7 @@ export class DoctorDiagnosisCaseSheetComponent
   serviceList = '';
   referralReasonList = '';
   isCovidVaccinationStatusVisible = false;
+  userName: any;
 
   constructor(
     private doctorService: DoctorService,
@@ -122,17 +124,18 @@ export class DoctorDiagnosisCaseSheetComponent
   ngDoCheck() {
     this.assignSelectedLanguage();
   }
+
   assignSelectedLanguage() {
     const getLanguageJson = new SetLanguageComponent(this.httpServiceService);
     getLanguageJson.setLanguage();
     this.current_language_set = getLanguageJson.currentLanguageObject;
   }
 
   ngOnChanges() {
+
     this.ncdScreeningCondition = null;
     if (this.casesheetData) {
-      console.log('cases');
-      console.log(this.casesheetData);
+      this.userName = this.casesheetData?.doctorData?.diagnosis?.createdBy;
       const temp2 = this.casesheetData.nurseData.covidDetails;
       if (this.casesheetData.doctorData.diagnosis.doctorDiagnonsis) {
         this.doctorDiagnosis =
@@ -379,22 +382,30 @@ export class DoctorDiagnosisCaseSheetComponent
     const len = String(10).length - String(this).length + 1;
     return len > 0 ? new Array(len).join('0') + this : this;
   }
-  downloadSign() {
-    if (this.beneficiaryDetails && this.beneficiaryDetails.tCSpecialistUserID) {
-      const tCSpecialistUserID = this.beneficiaryDetails.tCSpecialistUserID;
-      this.doctorService.downloadSign(tCSpecialistUserID).subscribe(
-        (response) => {
+
+   downloadSign() {
+    this.getUserId().subscribe((userId) => {
+      const tcSpecId = this.beneficiaryDetails?.tCSpecialistUserID;
+      const userIdToUse = tcSpecId && tcSpecId !== 0 ? tcSpecId : userId;
+      this.doctorService.downloadSign(userIdToUse).subscribe(
+        (response: any) => {
           const blob = new Blob([response], { type: response.type });
           this.showSign(blob);
         },
-        (err) => {
-          console.log('error');
+        (err: any) => {
+          console.error('Error downloading signature:', err);
         },
       );
-    } else {
-      console.log('No tCSpecialistUserID found');
-    }
+    });
+
+  }
+
+  getUserId(): Observable<any> {
+    return this.doctorService
+      .getUserId(this.userName)
+      .pipe(map((res: any) => res?.userId || null));
   }
+
   showSign(blob: any) {
     const reader = new FileReader();
     reader.readAsDataURL(blob);

src/app/app-modules/nurse-doctor/shared/services/doctor.service.ts

@@ -2843,10 +2843,16 @@ export class DoctorService {
   }
   /* Doctor Signature download */
   downloadSign(userID: any) {
-    return this.http
-      .get(environment.downloadSignUrl + userID, { responseType: 'blob' })
-      .pipe(map((res: any) => <Blob>res.blob()));
+    return this.http.get(environment.downloadSignUrl + userID, {
+      responseType: 'blob' as 'json',
+    });
+  }
+
+  /* Get UserID using UserName */
+  getUserId(userName: any) {
+    return this.http.get(environment.getUserId + userName);
   }
+
   getIDRSDetails(beneficiaryID: string, visitID: string): Observable<any> {
     const visitCategory = this.sessionstorage.getItem('visitCategory');
     const otherDetails = Object.assign({

src/app/app-modules/nurse-doctor/workarea/workarea.component.ts

@@ -1679,6 +1679,11 @@ export class WorkareaComponent
       );
 
       const diagForm3 = <FormGroup>diagForm2.controls[0];
+      if (diagForm3.controls['viewProvisionalDiagnosisProvided'].errors) {  
+          required.push(  
+            this.current_language_set.DiagnosisDetails.provisionaldiagnosis  
+          );  
+        }
 
       if (!diagForm3.controls['viewProvisionalDiagnosisProvided'].errors) {
         diagForm2.value.filter((item: any) => {

src/environments/environment.ci.ts.template

@@ -38,7 +38,7 @@ const ADMIN_API = '<%= ADMIN_API_BASE %>';
 const biologicalScreeningDeviceAPI = `${ADMIN_API}/diagnostics/biologicalScreeningDevice`;
 const IOT_API = '<%= IOT_API_BASE %>';
 const FHIR_API = '<%= FHIR_API_BASE %>';
-const mmuUICasesheet = '<%= TM_API_BASE %>';
+const mmuUICasesheet = '<%= TM_UI %>';
 const SCHEDULER_UI =  '<%= SCHEDULER_UI_BASE %>';
 const INVENTORY_UI =  '<%= INVENTORY_UI %>';
 const IDENTITY_API = `<%= IDENTITY_API_BASE %>`;
@@ -495,4 +495,6 @@ export const environment = {
   siteKey: siteKey,
   captchaChallengeURL: captchaChallengeURL,
   enableCaptcha: enableCaptcha,
+
+  getUserId: `${COMMON_API}user/userName/`,
 };