add Generate Pathology report

I-TECH-UW · Oct 18, 2023 · 927d2c1 · 927d2c1
1 parent 2f75005
commit 927d2c1
Show file tree

Hide file tree

Showing 15 changed files with 2,148 additions and 5 deletions.
diff --git a/frontend/src/components/pathology/PathologyCaseView.js b/frontend/src/components/pathology/PathologyCaseView.js
@@ -522,7 +522,7 @@ function PathologyCaseView() {
                         }}
                       />
                     </Column>
-                    <Column lg={4}>
+                    <Column lg={2}>
                       <FormattedMessage id="pathology.label.report" />
                     </Column>
                     <Column lg={2} md={1} sm={2}>
@@ -546,7 +546,23 @@ function PathologyCaseView() {
                         </>
                       )}
                     </Column>
-                    <Column lg={3} md={5} sm={3} />
+                    <Column lg={1} md={2} sm={2}/>
+                    <Column lg={3} md={2} sm={2}>
+                      <Button
+                        onClick={(e) => {
+                          window.open(
+                            config.serverBaseUrl +
+                              "/rest/ReportPrint?report=PatientPathologyReport&programSampleId=" +
+                              pathologySampleId,
+                            "_blank",
+                          );
+                        }}
+                      >
+                        {" "}
+                        <FormattedMessage id="button.label.genarateReport" />
+                      </Button>
+                    </Column>
+                    <Column lg={3} md={2} sm={2}/>
                     <Column lg={16} md={8} sm={4}>
                       <div> &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;</div>
                     </Column>

diff --git a/frontend/src/languages/en.json b/frontend/src/languages/en.json
@@ -303,6 +303,7 @@
     "label.button.remove.report": "Remove Report",
     "pathology.label.block.number": "Block number",
     "pathology.label.block.add.number": "Number of Blocks to add",
-    "pathology.label.slide.add.number": "Number of Slides to add"
+    "pathology.label.slide.add.number": "Number of Slides to add",
+    "button.label.genarateReport" : "Generate Report"
 
 }
diff --git a/frontend/src/languages/fr.json b/frontend/src/languages/fr.json
@@ -299,5 +299,6 @@
     "label.button.remove.slide": "Supprimer la Diapositive",
     "label.button.remove.block": "Supprimer le Bloc",
     "label.button.remove.report": "Supprimer le Rapport",
-    "pathology.label.block.number": "Numéro du Bloc"
+    "pathology.label.block.number": "Numéro du Bloc" ,
+    "button.label.genarateReport" : "Générer un rapport"
 }
diff --git a/src/main/java/org/openelisglobal/program/service/PathologyDisplayService.java b/src/main/java/org/openelisglobal/program/service/PathologyDisplayService.java
@@ -2,10 +2,13 @@
 
 import org.openelisglobal.program.valueholder.pathology.PathologyCaseViewDisplayItem;
 import org.openelisglobal.program.valueholder.pathology.PathologyDisplayItem;
+import org.openelisglobal.program.valueholder.pathology.PathologySample;
 
 public interface PathologyDisplayService {
 
     PathologyCaseViewDisplayItem convertToCaseDisplayItem(Integer pathologySampleId);
 
     PathologyDisplayItem convertToDisplayItem(Integer pathologySampleId);
+
+    PathologySample getPathologySampleWithLoadedAtttributes(Integer pathologySampleId);
 }
diff --git a/src/main/java/org/openelisglobal/program/service/PathologyDisplayServiceImpl.java b/src/main/java/org/openelisglobal/program/service/PathologyDisplayServiceImpl.java
@@ -137,4 +137,14 @@ public PathologyCaseViewDisplayItem convertToCaseDisplayItem(Integer pathologySa
         return displayItem;
     }
 
+    @Override
+    @Transactional
+    public PathologySample getPathologySampleWithLoadedAtttributes(Integer pathologySampleId) {
+       PathologySample pathologySample = pathologySampleService.get(pathologySampleId);
+       pathologySample.getBlocks().size();
+       pathologySample.getSlides().size();
+       pathologySample.getConclusions().size();
+       return pathologySample;
+    }
+
 }
diff --git a/src/main/java/org/openelisglobal/reports/action/implementation/PatientPathologyReport.java b/src/main/java/org/openelisglobal/reports/action/implementation/PatientPathologyReport.java
@@ -0,0 +1,46 @@
+package org.openelisglobal.reports.action.implementation;
+
+import java.util.List;
+import java.util.Optional;
+import java.util.stream.Collectors;
+
+import org.openelisglobal.program.service.PathologyDisplayService;
+import org.openelisglobal.program.valueholder.pathology.PathologyConclusion;
+import org.openelisglobal.program.valueholder.pathology.PathologyConclusion.ConclusionType;
+import org.openelisglobal.program.valueholder.pathology.PathologySample;
+import org.openelisglobal.reports.form.ReportForm;
+import org.openelisglobal.spring.util.SpringContext;
+
+public class PatientPathologyReport extends PatientProgramReport{
+    protected  PathologyDisplayService pathologyDisplayService = SpringContext.getBean(PathologyDisplayService.class);
+
+     private PathologySample pathologySample;
+
+    @Override
+    protected String getReportName() {
+        return "PatientPathologyReport";
+    }
+
+    @Override
+    protected void setAdditionalReportItems() {
+        data.setGrossExam(pathologySample.getGrossExam());
+        data.setMicroExam(pathologySample.getMicroscopyExam());
+        pathologySample.getConclusions().size();
+        Optional<PathologyConclusion> conclusion = pathologySample.getConclusions().stream()
+                .filter(e -> e.getType() == ConclusionType.TEXT).findFirst();
+        data.setTextConclusion(conclusion.get().getValue());
+
+        List<String> codedConclusions =  pathologySample.getConclusions().stream().filter(e -> e.getType() == ConclusionType.DICTIONARY)
+        .map(e -> dictionaryService.get(e.getValue()).getLocalizedName())
+        .collect(Collectors.toList());
+        String commaSeparatedString = String.join(", ", codedConclusions);
+        data.setCodedConclusion(commaSeparatedString);
+    }
+
+    @Override
+    protected void innitializeSample(ReportForm form) {
+        pathologySample = pathologyDisplayService.getPathologySampleWithLoadedAtttributes(Integer.valueOf(form.getProgramSampleId()));
+        sample = pathologySample.getSample();
+    }
+
+}