Merge pull request #11354 from hmislk/11329-improvements-in-laboratory-order-report---outpatient

11329 improvements in laboratory order report   outpatient

Author: GSMgeeth

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

@@ -2868,6 +2868,8 @@ private List<BillItem> cancelBillItems(Bill originalBill, Bill cancellationBill,
             b.setHospitalFee(0 - nB.getHospitalFee());
             b.setCollectingCentreFee(0 - nB.getCollectingCentreFee());
             b.setStaffFee(0 - nB.getStaffFee());
+            b.setReagentFee(0 - nB.getReagentFee());
+            b.setOtherFee(0 - nB.getOtherFee());
 
             b.setNetValue(0 - nB.getNetValue());
             b.setGrossValue(0 - nB.getGrossValue());

src/main/java/com/divudi/bean/lab/LaborataryReportController.java

@@ -302,7 +302,7 @@ public void processLaboratoryOrderReport() {
                     IncomeRow billItemIncomeRow = new IncomeRow(billItem);
                     bundle.getRows().add(billItemIncomeRow);
                     checkInInvestigationBillItem = true;
-                    totalHospitalFee += billItem.getHospitalFee();
+                    totalHospitalFee += (billItem.getHospitalFee() - billItem.getReagentFee()- billItem.getOtherFee());
                     totalReagentFee += billItem.getReagentFee();
                     totalOtherFee += billItem.getOtherFee();
                     totalNetTotal += billItem.getNetValue();
@@ -314,7 +314,6 @@ public void processLaboratoryOrderReport() {
             } else {
                 bundle.getRows().remove(billIncomeRow);
             }
-
         }
     }
 

src/main/webapp/reportLab/lab_inward_order_report.xhtml

@@ -251,7 +251,7 @@
                                 </p:commandButton>
                             </div>
                             <p:commandButton 
-                                value="Clesr" 
+                                value="Clear" 
                                 ajax="false"
                                 action="#{laborataryReportController.resetAllFiltersExceptDateRange()}" 
                                 class="ui-button-danger m-1" 
@@ -260,7 +260,6 @@
                             </p:commandButton>
                         </div>
 
-
                         <p:dataTable
                             id="tbl"
                             style="padding: 2px!important; margin-top: 10px!important; margin: 0px!important; font-size: 20px!important;" 
@@ -322,7 +321,6 @@
                                             </h:outputText>
                                         </div>
                                     </div>
-
                                 </div>
                             </f:facet>
 
@@ -370,7 +368,6 @@
                                             </h:outputText>
                                         </div>
                                     </h:panelGroup>
-
                                 </div>
 
                                 <h:outputText 
@@ -390,7 +387,7 @@
                             <p:column headerText="Hos. Fee" width="8em" class="text-end" style="padding: 6px!important; margin: 2px!important;" >
                                 <h:outputText 
                                     rendered="#{row.rowType eq 'BillItem'}"
-                                    value="#{row.billItem.hospitalFee}">
+                                    value="#{row.billItem.hospitalFee - (row.billItem.reagentFee + row.billItem.otherFee)}">
                                     <f:convertNumber pattern="#,##0.00" />
                                 </h:outputText>
                                 <f:facet name="footer" >

src/main/webapp/reports/index.xhtml

@@ -440,13 +440,6 @@
                                     <p:commandButton   class="w-100"  ajax="false" value="Lab Register" action="#{reportController.navigateToLabRegisterReport()}"/>
                                     <p:commandButton   class="w-100"  ajax="false" value="Collection center statement" action="#{reportController.navigateToCollectionCenterStatement()}"/>
 
-                                    <p:commandButton
-                                        class="w-100"
-                                        ajax="false" 
-                                        value="Laboratory Income Report" 
-                                        action="#{laborataryReportController.navigateToLaboratoryIncomeReportFromReport()}">
-                                    </p:commandButton>
-                                    
                                 </div>
                             </p:tab>