Merge pull request #4585 from hmislk/Issue#4583

closes #4583
hmislk · Apr 15, 2024 · ab936cc · ab936cc
2 parents 6096442 + 8ed07b3
commit ab936cc
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 2 deletions.
diff --git a/src/main/java/com/divudi/bean/common/SearchController.java b/src/main/java/com/divudi/bean/common/SearchController.java
@@ -1755,7 +1755,12 @@ public void createPharmacyTableRe() {
             sql += " and  ((b.total) like :total )";
             m.put("total", "%" + getSearchKeyword().getTotal().trim().toUpperCase() + "%");
         }
-
+
+        if (getSearchKeyword().getPatientPhone() != null && !getSearchKeyword().getPatientPhone().trim().equals("")) {
+            sql += " and  ((b.patient.person.phone) like :phone )";
+            m.put("phone", "%" + getSearchKeyword().getPatientPhone().trim().toUpperCase() + "%");
+        }
+
         sql += " order by b.createdAt desc  ";
 //    
         //     //////System.out.println("sql = " + sql);

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/arogyaNew</jta-data-source>
+        <jta-data-source>jdbc/arogya</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/pharmacy/pharmacy_search_sale_pre_bill.xhtml b/src/main/webapp/pharmacy/pharmacy_search_sale_pre_bill.xhtml
@@ -45,6 +45,8 @@
                                 <p:inputText autocomplete="off"  value="#{searchController.searchKeyword.billNo}" class="w-100"/>
                                 <h:outputLabel value="Patient Name"/>   
                                 <p:inputText autocomplete="off" value="#{searchController.searchKeyword.patientName}" class="w-100"/>
+                                <h:outputLabel value="Patient Phone Number"/>   
+                                <p:inputText autocomplete="off" value="#{searchController.searchKeyword.patientPhone}" class="w-100"/>
                                 <h:outputLabel value="Department Name"/>   
                                 <p:inputText autocomplete="off"  value="#{searchController.searchKeyword.department}" class="w-100"/>
                                 <h:outputLabel value="Total"/>