closes#6343

.github/counter.txt

@@ -1 +1 @@
-9
+2

.github/last_date.txt

@@ -1 +1 @@
-20240709
+20240710

README.md

@@ -18,7 +18,7 @@ Developed using Java Enterprise Edition, the system offers both a web applicatio
 
 ## Current Version
 
-Current Version: 3.0.0.20240709.9 (This line will be automatically updated to reflect the latest version)
+Current Version: 3.0.0.20240710.2 (This line will be automatically updated to reflect the latest version)
 
 ## History
 

src/main/java/com/divudi/bean/collectingCentre/CollectingCentreBillController.java

@@ -1529,6 +1529,14 @@ public String navigateToCollectingCenterBillingromMenu() {
 
     public String navigateToCollectingCenterBillingromCollectingCenterBilling() {
         prepareNewBillKeepingCollectingCenter();
+        fillAvailableAgentReferanceNumbers(collectingCentre);
+        setPatient(getPatient());
+        return "/collecting_centre/bill?faces-redirect=true";
+    }
+
+    public String navigateToCollectingCenterBillingfromBillPriview() {
+        prepareNewBillKeepingCollectingCenter();
+        fillAvailableAgentReferanceNumbers(collectingCentre);
         setPatient(getPatient());
         return "/collecting_centre/bill?faces-redirect=true";
     }

src/main/java/com/divudi/bean/common/EnumController.java

@@ -484,7 +484,9 @@ public InwardChargeType[] getInwardChargeTypesForSetting() {
             InwardChargeType.Procedure,
             InwardChargeType.Radiology,
             InwardChargeType.ReportingCharges,
-            InwardChargeType.WardProcedure};
+            InwardChargeType.WardProcedure,
+            InwardChargeType.BabyCare,
+        };
 
         return b;
     }

src/main/java/com/divudi/bean/common/SearchController.java

@@ -6884,6 +6884,16 @@ public void createCCBillTableByKeyword(BillType billType, Institution ins, Depar
             sql += " and bill.department=:dep ";
             temMap.put("dep", dep);
         }
+
+        if (getInstitution() != null) {
+            sql += " and  ((bill.fromInstitution) =:ccName )";
+            temMap.put("ccName", getInstitution());
+        }
+
+        if (getSearchKeyword().getCode()!= null && !getSearchKeyword().getCode().trim().equals("")) {
+            sql += " and  ((bill.fromInstitution.institutionCode) like :code )";
+            temMap.put("code", "%" + getSearchKeyword().getCode().trim().toUpperCase() + "%");
+        }
 
         if (getSearchKeyword().getPatientName() != null && !getSearchKeyword().getPatientName().trim().equals("")) {
             sql += " and  ((bill.patient.person.name) like :patientName )";

src/main/java/com/divudi/data/inward/InwardChargeType.java

@@ -65,8 +65,7 @@ public enum InwardChargeType {
     @Deprecated
     MedicalCare("MedicalCare"),
 
-
-
+    BabyCare("BabyCare Charges"),
 
     // New enum values
     Andrology("Andrology"),

src/main/java/com/divudi/entity/pharmacy/Stock.java

@@ -51,9 +51,7 @@ public class Stock implements Serializable {
     @Transient
     private Double transItemStockQty;
 
-    @Transient
-    private Double transItemStockQty;
-
+
     public List<Stock> getChildStocks() {
         return childStocks;
     }

src/main/resources/META-INF/persistence.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <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">
-        <jta-data-source>jdbc/digasiri</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"/>
@@ -10,7 +10,7 @@
         </properties>
     </persistence-unit>
     <persistence-unit name="hmisAuditPU" transaction-type="JTA">
-        <jta-data-source>jdbc/digasiriAudit</jta-data-source>
+        <jta-data-source>jdbc/arogyaAudit</jta-data-source>
         <class>com.divudi.entity.AuditEvent</class>
         <exclude-unlisted-classes>true</exclude-unlisted-classes>
         <properties>

src/main/resources/VERSION.txt

@@ -1 +1 @@
-3.0.0.20240709.9
+3.0.0.20240710.2

src/main/webapp/admin/institutions/collecting_centre.xhtml

@@ -64,6 +64,10 @@
                                 <p:inputText autocomplete="off" id="txtChqPrnName" 
                                              class="w-100"
                                              value="#{collectingCentreController.current.chequePrintingName}" ></p:inputText>
+
+                                <h:outputText value="Institution Code"  ></h:outputText>
+                                            <p:inputText autocomplete="off" class="w-100 form-control m-1"
+                                                         value="#{collectingCentreController.current.institutionCode}"></p:inputText>
 
                                 <h:outputText value="Code" >                                        
                                 </h:outputText>

src/main/webapp/collecting_centre/bill.xhtml

@@ -564,7 +564,7 @@
                                     class="ui-button-success m-1"
                                     icon="fa fa-plus-circle"
                                     ajax="false" 
-                                    action="#{collectingCentreBillController.prepareNewBillKeepingCollectingCenter()}" >
+                                    action="#{collectingCentreBillController.navigateToCollectingCenterBillingfromBillPriview()}" >
                                 </p:commandButton>
                                 <p:commandButton 
                                     ajax="false" 

src/main/webapp/collecting_centre/collecting_centre_search_bill_own.xhtml

@@ -25,9 +25,33 @@
                                 </p:calendar>
                                 <p:spacer height="10"/>
                                 <div class="d-grid gap-2">
-                                    <p:commandButton id="btnSearch" class="ui-button-warning" icon="fas fa-search" ajax="false" value="Search" action="#{searchController.createCollectingCentreBillSearch}"/>
+                                    <p:commandButton 
+                                        id="btnSearch" 
+                                        class="ui-button-warning" 
+                                        icon="fas fa-search" 
+                                        ajax="false" 
+                                        value="Search" 
+                                        action="#{searchController.createCollectingCentreBillSearch}"/>
 
                                 </div>
+                                <h:outputLabel value="Collecting Center Name"/>
+                                <p:autoComplete 
+                                    converter="deal" 
+                                    value="#{searchController.institution}" 
+                                    forceSelection="true" 
+                                    id="acColl"
+                                    completeMethod="#{institutionController.completeCollectingCenter}" 
+                                    var="vt" 
+                                    itemLabel="#{vt.name}" 
+                                    itemValue="#{vt}" 
+                                    maxResults="20"
+                                    class="w-100 mb-1"
+                                    inputStyleClass="form-control">
+                                    <p:column style="padding: 4px;">#{vt.institutionCode}</p:column>
+                                    <p:column style="padding: 4px;">#{vt.name}</p:column>
+                                </p:autoComplete>
+                                <h:outputLabel value="Collecting Center Code"/>
+                                <p:inputText autocomplete="off" value="#{searchController.searchKeyword.code}" class="w-100"/>
                                 <h:outputLabel value="Bill No"/>
                                 <p:inputText autocomplete="off"  value="#{searchController.searchKeyword.billNo}" class="w-100" />
                                 <h:outputLabel value="Patient Name"/>