Merge pull request #569 from mozzy11/2.8

innital work on cytology report
I-TECH-UW · Oct 19, 2023 · 87583f0 · 87583f0
2 parents 6a81b9b + 3b6c3ab
commit 87583f0
Show file tree

Hide file tree

Showing 8 changed files with 1,169 additions and 3 deletions.
diff --git a/frontend/src/components/cytology/CytologyCaseView.js b/frontend/src/components/cytology/CytologyCaseView.js
@@ -821,7 +821,7 @@ function CytologyCaseView() {
                         }}
                       />
                     </Column>
-                    <Column lg={4}>
+                    <Column lg={2}>
                       {
                         reportTypes.filter(
                           (type) => type.id === report.reportType,
@@ -849,7 +849,23 @@ function CytologyCaseView() {
                         </>
                       )}
                     </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=PatientCytologyReport&programSampleId=" +
+                              cytologySampleId,
+                            "_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/src/main/java/org/openelisglobal/reports/action/implementation/PatientCytologyReport.java b/src/main/java/org/openelisglobal/reports/action/implementation/PatientCytologyReport.java
@@ -0,0 +1,42 @@
+package org.openelisglobal.reports.action.implementation;
+import java.util.ArrayList;
+import java.util.List;
+
+import org.openelisglobal.program.service.cytology.CytologySampleService;
+import org.openelisglobal.program.valueholder.cytology.CytologySample;
+import org.openelisglobal.reports.form.ReportForm;
+import org.openelisglobal.spring.util.SpringContext;
+
+public class PatientCytologyReport extends PatientProgramReport {
+
+    protected  CytologySampleService cytologySampleService = SpringContext.getBean(CytologySampleService.class);
+    private CytologySample cytologySample;
+
+    @Override
+    protected String getReportName() {
+        return "PatientCytologyReport";
+    }
+
+    @Override
+    protected void setAdditionalReportItems() {
+        data.setSpecimenAdequacy("Dummy specimenn");
+        data.setDiagnosis("NEGATIVE DIAGNOSIS");
+
+        List<String> stringList = new ArrayList<>();
+        stringList.add("dummy diagnosis");
+        stringList.add("sample diagnosis");
+        stringList.add("example diagnosis");
+
+        data.setEpithelialCellAbnomalities(stringList);
+        data.setReactiveCellularChanges(stringList);
+        data.setOrganisms(stringList);
+        data.setOtherDiagnoses(stringList);
+    }
+
+    @Override
+    protected void innitializeSample(ReportForm form) {
+        cytologySample = cytologySampleService.get(Integer.valueOf(form.getProgramSampleId()));
+        sample = cytologySample.getSample();
+    }
+
+}
diff --git a/...in/java/org/openelisglobal/reports/action/implementation/ReportImplementationFactory.java b/...in/java/org/openelisglobal/reports/action/implementation/ReportImplementationFactory.java
@@ -279,6 +279,9 @@ else if (report.equals("covidResultsReport")) {
             }else if (report.equals("PatientPathologyReport")){
                return new PatientPathologyReport();
             }
+            else if(report.equals("PatientCytologyReport")){
+               return new PatientCytologyReport();
+            }
         }
 
         return null;

diff --git a/...org/openelisglobal/reports/action/implementation/reportBeans/ProgramSampleReportData.java b/...org/openelisglobal/reports/action/implementation/reportBeans/ProgramSampleReportData.java
@@ -1,5 +1,7 @@
 package org.openelisglobal.reports.action.implementation.reportBeans;
 
+import java.util.List;
+
 public final class ProgramSampleReportData {
 
     private String patientName = "";
@@ -94,6 +96,7 @@ public final class ProgramSampleReportData {
 
     private String labOrderType = "";
 
+    //Pathology data
     private String grossExam;
 
     private String microExam;
@@ -102,6 +105,21 @@ public final class ProgramSampleReportData {
 
     private String textConclusion;
 
+    //Cytology data
+    private String specimenAdequacy;
+
+    private String diagnosis;
+
+    private List<String> nonNeoplasticCellularVariations;
+
+    private List<String> reactiveCellularChanges;
+
+    private List<String> organisms;
+
+    private List<String> epithelialCellAbnomalities;
+
+    private List<String> otherDiagnoses;
+
     public ProgramSampleReportData() {
     }
 
@@ -569,4 +587,59 @@ public void setTextConclusion(String textConclusion) {
         this.textConclusion = textConclusion;
     }
 
+    public String getSpecimenAdequacy() {
+        return specimenAdequacy;
+    }
+
+    public void setSpecimenAdequacy(String specimenAdequacy) {
+        this.specimenAdequacy = specimenAdequacy;
+    }
+
+    public String getDiagnosis() {
+        return diagnosis;
+    }
+
+    public void setDiagnosis(String diagnosis) {
+        this.diagnosis = diagnosis;
+    }
+
+    public List<String> getNonNeoplasticCellularVariations() {
+        return nonNeoplasticCellularVariations;
+    }
+
+    public void setNonNeoplasticCellularVariations(List<String> nonNeoplasticCellularVariations) {
+        this.nonNeoplasticCellularVariations = nonNeoplasticCellularVariations;
+    }
+
+    public List<String> getReactiveCellularChanges() {
+        return reactiveCellularChanges;
+    }
+
+    public void setReactiveCellularChanges(List<String> reactiveCellularChanges) {
+        this.reactiveCellularChanges = reactiveCellularChanges;
+    }
+
+    public List<String> getOrganisms() {
+        return organisms;
+    }
+
+    public void setOrganisms(List<String> organisms) {
+        this.organisms = organisms;
+    }
+
+    public List<String> getEpithelialCellAbnomalities() {
+        return epithelialCellAbnomalities;
+    }
+
+    public void setEpithelialCellAbnomalities(List<String> epithelialCellAbnomalities) {
+        this.epithelialCellAbnomalities = epithelialCellAbnomalities;
+    }
+
+    public List<String> getOtherDiagnoses() {
+        return otherDiagnoses;
+    }
+
+    public void setOtherDiagnoses(List<String> otherDiagnoses) {
+        this.otherDiagnoses = otherDiagnoses;
+    }
 }
diff --git a/src/main/resources/languages/message_en.properties b/src/main/resources/languages/message_en.properties
@@ -7812,4 +7812,15 @@ pathology.label.grossexam = Gross Exam
 pathology.label.microexam = Microscopy Exam
 pathology.label.conclusion = Conclusion
 pathology.label.textconclusion = Text Conclusion    
-pathology.label.report  = HistoPathology Report                           
+pathology.label.report  = HistoPathology Report 
+cytology.label.specimen = Specimen Adequacy
+cytology.label.negative =  Negative For Intraepithelial Lesion or Malignancy 
+cytology.label.cellabnomality =  Epithelial Cell Abnomality
+cytology.label.other =  Other Malignant Neoplasms
+cytology.label.neoplastic =  Non-neoplastic cellular variations
+cytology.label.reactive =  Reactive cellular changes
+cytology.label.organisms =  Organisms
+cytology.label.otherResult =  Other Diagnosis Result 
+cytology.label.diagnosis =  Diagnosis/Impression
+cytology.label.papsmear =  PAP SMEAR REPORT
+
diff --git a/src/main/resources/languages/message_fr.properties b/src/main/resources/languages/message_fr.properties
@@ -7309,3 +7309,14 @@ pathology.label.microexam = Examen Macroscopique
 pathology.label.conclusion = Conclusion
 pathology.label.textconclusion = Conclusion Textuelle   
 pathology.label.report  = Rapport d'histopathologie
+pathology.label.report  = Rapport d'histopathologie
+cytology.label.specimen = Adéquation de spécimen
+cytology.label.negative = Négatif pour des lésions intraépithéliales ou malignes
+cytology.label.cellabnormality = Anomalie des cellules épithéliales
+cytology.label.other = Autres néoplasmes malins
+cytology.label.neoplastic = Variations cellulaires non néoplasiques
+cytology.label.reactive = Changements cellulaires réactifs
+cytology.label.organisms = Organismes
+cytology.label.otherResult = Autre résultat de diagnostic
+cytology.label.diagnosis = Diagnostic/Impression
+cytology.label.papsmear = Rapport du frottis de PAP
diff --git a/src/main/resources/reports/PatientCytologyReport.jasper b/src/main/resources/reports/PatientCytologyReport.jasper