Merge pull request #4577 from hmislk/Issue#4576

closes #4576
hmislk · Apr 10, 2024 · 963c2bf · 963c2bf
2 parents b0f6315 + d04f280
commit 963c2bf
Show file tree

Hide file tree

Showing 4 changed files with 46 additions and 1 deletion.
diff --git a/src/main/java/com/divudi/bean/clinical/PatientEncounterController.java b/src/main/java/com/divudi/bean/clinical/PatientEncounterController.java
@@ -1264,6 +1264,7 @@ public void fillCurrentPatientLists(Patient patient) {
         channelBills = searchController.fillBills(BillType.Channel, null, null, patient, 10);
         patientAllergies = new ArrayList<>();
         patientDiagnoses = new ArrayList<>();
+        patientProcedures = new ArrayList<>();
         patientImages = new ArrayList<>();
         patientDiagnosticImages = new ArrayList<>();
         patientMedicines = new ArrayList<>();
@@ -1292,6 +1293,9 @@ public void fillCurrentPatientLists(Patient patient) {
                 case PatientMedicine:
                     patientMedicines.add(tcfv);
                     break;
+                case PatientProcedure:
+                    patientProcedures.add(tcfv);
+                    break;
             }
         }
     }

diff --git a/src/main/resources/META-INF/persistence.xml b/src/main/resources/META-INF/persistence.xml
@@ -2,7 +2,7 @@
 <persistence version="2.2" xmlns="http://java.sun.com/xml/ns/persistence" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/persistence http://xmlns.jcp.org/xml/ns/persistence/persistence_2_2.xsd">
     <persistence-unit name="hmisPU" transaction-type="JTA">
         <provider>org.eclipse.persistence.jpa.PersistenceProvider</provider>
-        <jta-data-source>jdbc/arogya</jta-data-source>
+        <jta-data-source>jdbc/arogyaNew</jta-data-source>
         <exclude-unlisted-classes>false</exclude-unlisted-classes>
         <properties>
             <property name="eclipselink.logging.level.sql" value="SEVERE"/>

diff --git a/src/main/webapp/emr/opd_visit.xhtml b/src/main/webapp/emr/opd_visit.xhtml
@@ -93,6 +93,9 @@
                                                     conditions="#{patientEncounterController.patientDiagnoses}"
                                                     editable="true">
                                                 </emr:patient_conditions>
+                                                <emr:patient_procedures
+                                                    procedures="#{patientEncounterController.patientProcedures}"
+                                                    editable="true"/>
                                                 <emr:patient_medicines 
                                                     editable="true"
                                                     medicines="#{patientEncounterController.patientMedicines}">

diff --git a/src/main/webapp/resources/ezcomp/emr/patient_procedures.xhtml b/src/main/webapp/resources/ezcomp/emr/patient_procedures.xhtml
@@ -0,0 +1,38 @@
+<?xml version='1.0' encoding='UTF-8' ?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml"
+      xmlns:cc="http://xmlns.jcp.org/jsf/composite"
+      xmlns:f="http://xmlns.jcp.org/jsf/core"
+      xmlns:h="http://xmlns.jcp.org/jsf/html"
+      xmlns:p="http://primefaces.org/ui">
+
+    <!-- INTERFACE -->
+    <cc:interface>
+        <cc:attribute name="procedures" />
+        <cc:attribute name="editable" type="boolean" default="false" />
+    </cc:interface>
+
+    <!-- IMPLEMENTATION -->
+    <cc:implementation>
+        <p:dataTable
+            id="tblPrc"
+            value="#{cc.attrs.procedures}"
+            var="pr">
+
+            <p:column headerText="Procedure">
+                <p:outputLabel value="#{pr.itemValue.name}" />
+                <h:outputText value="#{not empty pr.stringValue ? ' - '.concat(pr.stringValue) : ''}" />
+                <p:spacer height="1" width="20" ></p:spacer>
+                <p:commandButton 
+                    rendered="#{cc.attrs.editable}"
+                    icon="pi pi-times" 
+                    styleClass="ui-button-danger float-right"
+                    process="@this"
+                    update="tblPrc"
+                    onclick="if (!confirm('Are you sure you want to delete this diagnosis?')) return false;"
+                    action="#{patientEncounterController.removeClinicalFindingValueForComposite(cc.attrs.procedures, pr)}">
+                </p:commandButton>
+            </p:column>
+        </p:dataTable>
+    </cc:implementation>
+</html>