From 4356891cdba46a2c278203c200efea5c3e0acf1e Mon Sep 17 00:00:00 2001
From: SnehaRH <sneha@navadhiti.com>
Date: Mon, 13 Oct 2025 17:18:28 +0530
Subject: [PATCH 1/3] fix: aam 1895 reports tabular fix

---
 .../test-and-radiology.component.html            | 16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)

diff --git a/src/app/app-modules/nurse-doctor/case-record/general-case-record/test-and-radiology/test-and-radiology.component.html b/src/app/app-modules/nurse-doctor/case-record/general-case-record/test-and-radiology/test-and-radiology.component.html
index d730bff..cfbbac2 100644
--- a/src/app/app-modules/nurse-doctor/case-record/general-case-record/test-and-radiology/test-and-radiology.component.html
+++ b/src/app/app-modules/nurse-doctor/case-record/general-case-record/test-and-radiology/test-and-radiology.component.html
@@ -85,17 +85,23 @@ <h4 class="norecord">
                   vertical-align: middle;
                 "
               >
-                {{ component?.componentName }}
+                <div *ngFor="let component of element.componentList">
+                  {{ component?.componentName }}
+                </div>
               </td>
               <td
                 style="width: 110px; word-break: normal; vertical-align: middle"
               >
-                {{ component?.testResultValue }}
+                <div *ngFor="let component of element.componentList">
+                  {{ component?.testResultValue }}
+                </div>
               </td>
               <td
                 style="width: 150px; word-break: normal; vertical-align: middle"
               >
-                {{ component?.testResultUnit }}
+                <div *ngFor="let component of element.componentList">
+                  {{ component?.testResultUnit }}
+                </div>
               </td>
               <td
                 style="
@@ -104,7 +110,9 @@ <h4 class="norecord">
                   vertical-align: middle;
                 "
               >
-                {{ component?.remarks }}
+                <div *ngFor="let component of element.componentList">
+                  {{ component?.remarks }}
+                </div>
               </td>
             </tr>
           </ng-container>

From 13caf5cafd48b54b5bed5b4fb57e3c96899fa1a2 Mon Sep 17 00:00:00 2001
From: SnehaRH <sneha@navadhiti.com>
Date: Mon, 13 Oct 2025 19:39:22 +0530
Subject: [PATCH 2/3] fix: rovisional diagnosis fix

---
 .../general-opd-diagnosis.component.ts        |  5 ++++-
 .../ncd-care-diagnosis.component.ts           |  4 +++-
 .../ncd-screening-diagnosis.component.ts      |  4 +++-
 .../pnc-diagnosis/pnc-diagnosis.component.ts  | 22 +++++++++++++------
 .../test-and-radiology.component.html         | 10 +--------
 .../workarea/workarea.component.ts            |  2 +-
 6 files changed, 27 insertions(+), 20 deletions(-)

diff --git a/src/app/app-modules/nurse-doctor/case-record/general-case-record/diagnosis/general-opd-diagnosis/general-opd-diagnosis.component.ts b/src/app/app-modules/nurse-doctor/case-record/general-case-record/diagnosis/general-opd-diagnosis/general-opd-diagnosis.component.ts
index 6f1bb21..ca8cd55 100644
--- a/src/app/app-modules/nurse-doctor/case-record/general-case-record/diagnosis/general-opd-diagnosis/general-opd-diagnosis.component.ts
+++ b/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();
+        }
       }
     }
   }
diff --git a/src/app/app-modules/nurse-doctor/case-record/general-case-record/diagnosis/ncd-care-diagnosis/ncd-care-diagnosis.component.ts b/src/app/app-modules/nurse-doctor/case-record/general-case-record/diagnosis/ncd-care-diagnosis/ncd-care-diagnosis.component.ts
index 0bc6ef3..2a564e7 100644
--- a/src/app/app-modules/nurse-doctor/case-record/general-case-record/diagnosis/ncd-care-diagnosis/ncd-care-diagnosis.component.ts
+++ b/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();
+        }
       }
     }
   }
diff --git a/src/app/app-modules/nurse-doctor/case-record/general-case-record/diagnosis/ncd-screening-diagnosis/ncd-screening-diagnosis.component.ts b/src/app/app-modules/nurse-doctor/case-record/general-case-record/diagnosis/ncd-screening-diagnosis/ncd-screening-diagnosis.component.ts
index 02e6e2b..ac20b76 100644
--- a/src/app/app-modules/nurse-doctor/case-record/general-case-record/diagnosis/ncd-screening-diagnosis/ncd-screening-diagnosis.component.ts
+++ b/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();
+        }
       }
     }
   }
diff --git a/src/app/app-modules/nurse-doctor/case-record/general-case-record/diagnosis/pnc-diagnosis/pnc-diagnosis.component.ts b/src/app/app-modules/nurse-doctor/case-record/general-case-record/diagnosis/pnc-diagnosis/pnc-diagnosis.component.ts
index 34c8e7d..1880b06 100644
--- a/src/app/app-modules/nurse-doctor/case-record/general-case-record/diagnosis/pnc-diagnosis/pnc-diagnosis.component.ts
+++ b/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,8 +317,13 @@ 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,
@@ -324,14 +331,17 @@ export class PncDiagnosisComponent
       (<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();
     }
   }
diff --git a/src/app/app-modules/nurse-doctor/case-record/general-case-record/test-and-radiology/test-and-radiology.component.html b/src/app/app-modules/nurse-doctor/case-record/general-case-record/test-and-radiology/test-and-radiology.component.html
index cfbbac2..29addd1 100644
--- a/src/app/app-modules/nurse-doctor/case-record/general-case-record/test-and-radiology/test-and-radiology.component.html
+++ b/src/app/app-modules/nurse-doctor/case-record/general-case-record/test-and-radiology/test-and-radiology.component.html
@@ -85,23 +85,17 @@ <h4 class="norecord">
                   vertical-align: middle;
                 "
               >
-                <div *ngFor="let component of element.componentList">
                   {{ component?.componentName }}
-                </div>
               </td>
               <td
                 style="width: 110px; word-break: normal; vertical-align: middle"
               >
-                <div *ngFor="let component of element.componentList">
                   {{ component?.testResultValue }}
-                </div>
               </td>
               <td
                 style="width: 150px; word-break: normal; vertical-align: middle"
               >
-                <div *ngFor="let component of element.componentList">
                   {{ component?.testResultUnit }}
-                </div>
               </td>
               <td
                 style="
@@ -110,9 +104,7 @@ <h4 class="norecord">
                   vertical-align: middle;
                 "
               >
-                <div *ngFor="let component of element.componentList">
-                  {{ component?.remarks }}
-                </div>
+                {{ component?.remarks }}
               </td>
             </tr>
           </ng-container>
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 b353b73..558c691 100644
--- a/src/app/app-modules/nurse-doctor/workarea/workarea.component.ts
+++ b/src/app/app-modules/nurse-doctor/workarea/workarea.component.ts
@@ -1679,7 +1679,7 @@ export class WorkareaComponent
       );
 
       const diagForm3 = <FormGroup>diagForm2.controls[0];
-      if (diagForm3.controls['provisionalDiagnosis'].errors) {  
+      if (diagForm3.controls['viewProvisionalDiagnosisProvided'].errors) {  
           required.push(  
             this.current_language_set.DiagnosisDetails.provisionaldiagnosis  
           );  

From 2dbe70254eb942e2bab2ebc303a6e210f97de239 Mon Sep 17 00:00:00 2001
From: SnehaRH <77656297+snehar-nd@users.noreply.github.com>
Date: Mon, 13 Oct 2025 19:48:30 +0530
Subject: [PATCH 3/3] Update pom.xml

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 266eeac..76e173a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -5,7 +5,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>com.iemr.tm-ui</groupId>
   <artifactId>tm-ui</artifactId>
-  <version>3.5.1</version>
+  <version>3.4.1</version>
   <name>TM-UI</name>
   <description>Piramal - tm: Module ui</description>
   <packaging>war</packaging>