From bc8c76fabc0e4cef3aff411d5a6af0fa82a434ab Mon Sep 17 00:00:00 2001
From: "H.K. Damith Deshan" <108138918+DamithDeshan@users.noreply.github.com>
Date: Fri, 24 Jan 2025 15:42:10 +0530
Subject: [PATCH] closes #10195 (#10213)

Signed-off-by: DamithDeshan <hkddrajapaksha@gmail.com>
---
 src/main/webapp/lab/patient_report.xhtml      | 755 ++++++++----------
 .../resources/template/not_authorize.xhtml    |   2 +-
 2 files changed, 350 insertions(+), 407 deletions(-)

diff --git a/src/main/webapp/lab/patient_report.xhtml b/src/main/webapp/lab/patient_report.xhtml
index e1b4ac10b4..1a7b08cf52 100644
--- a/src/main/webapp/lab/patient_report.xhtml
+++ b/src/main/webapp/lab/patient_report.xhtml
@@ -31,98 +31,97 @@
                                     </h:panelGrid>
                                 </div>
                                 <div class="col-8">
-                                    <div class="d-flex align-items-center ">
-                                        <p:commandButton 
-                                            rendered="#{webUserController.hasPrivilege('LabDataentry') eq true and patientReportController.currentPatientReport.approved ne true}"  
-                                            value="Save" 
-                                            icon="fa-solid fa-floppy-disk"
-                                            class="ui-button-warning"
-                                            action="#{patientReportController.savePatientReport()}" ajax="false"   >
-                                        </p:commandButton>
-                                        <p:commandButton 
-                                            ajax="false" 
-                                            class="mx-1"
-                                            process="tblVals"
-                                            icon="fa-solid fa-calculator"
-                                            update=":#{p:resolveFirstComponentWithId('tblCals',view).clientId} :#{p:resolveFirstComponentWithId('tblFlags',view).clientId} :#{p:resolveFirstComponentWithId('divPrint',view).clientId}"  
-                                            value="Calculate" 
-                                            action="#{patientReportController.calculate}">
-                                        </p:commandButton>
-                                        <p:commandButton 
-                                            id="btnApprove"  
-                                            class=" ui-button-success"
-                                            icon="fa-solid fa-check"
-                                            disabled ="#{!(webUserController.hasPrivilege('LabAutherizing') eq true and patientReportController.currentPatientReport.dataEntered eq true)}"   
-                                            value="Approve" 
-                                            action="#{patientReportController.approvePatientReport()}" 
-                                            ajax="false"   >
-                                        </p:commandButton>
-                                        <p:commandButton 
-                                            rendered="true"  
-                                            icon="fa-solid fa-message"
-                                            class="mx-1 ui-button-secondary"
-                                            id="btnSms"  
-                                            disabled ="#{!(webUserController.hasPrivilege('LabDataentry') eq true and patientReportController.currentPatientReport.approved eq true)}"   
-                                            value="Sent SMS"             
-                                            action="#{patientReportController.sendSmsForPatientReport()}" ajax="false"   >
-                                        </p:commandButton>
-                                        <p:commandButton   
-                                            id="btnCancelApproval"  
-                                            rendered ="#{(webUserController.hasPrivilege('LabDeAutherizing') eq true and patientReportController.currentPatientReport.approved eq true)}"   
-                                            value="Cancel Approval"
-                                            icon="fa-solid fa-times"
-                                            class=" ui-button-danger"
-                                            action="#{patientReportController.reverseApprovalOfPatientReport()}" ajax="false"   >
-                                        </p:commandButton>
-                                        <p:commandButton   
-                                            ajax="false" 
-                                            icon="fa-solid fa-print"
-                                            class="mx-1 ui-button-info"
-                                            rendered="#{!sessionController.departmentPreference.partialPaymentOfOpdBillsAllowed}"
-                                            value="Print" 
-                                            onclick="#{patientReportController.printPatientReport()}"
-                                            disabled="#{!patientReportController.currentPatientReport.approved or userPreferenceController.userPreference.canPrintWithoutPermission}">
-                                            <p:printer target="divPrint" />
-                                        </p:commandButton>
-                                        <p:commandButton   
-                                            ajax="false" 
-                                            icon="fa-solid fa-print"
-                                            class="mx-1 ui-button-info"
-                                            rendered="#{sessionController.departmentPreference.partialPaymentOfOpdBillsAllowed}"
-                                            value="Print" 
-                                            disabled="#{!patientReportController.currentPatientReport.approved or userPreferenceController.userPreference.canPrintWithoutPermission or patientReportController.currentPtIx.billItem.bill.backwardReferenceBill.balance ne 0}"
-                                            onclick="#{patientReportController.printPatientReport()}">
-                                            <p:printer target="divPrint" />
-                                        </p:commandButton>
-                                        <p:spacer width="80" ></p:spacer>
-                                        <p:commandButton    
-                                            value="Back to Report Search" 
-                                            action="/lab/search_for_reporting_ondemand?faces-redirect=true" 
-                                            icon="fa-solid fa-arrow-left"
-                                            class="mx-1 ui-button-secondary"
-                                            ajax="false"   >
-                                        </p:commandButton>
-                                        <p:commandButton    
-                                            value="Patient Report Search" 
-                                            icon="fa-solid fa-search"
-                                            class=" ui-button-warning"
-                                            action="#{patientReportController.patientReportSearch}" ajax="false" >
-                                        </p:commandButton>
-
-                                        <p:commandButton    
-                                            value="To Approve List" 
-                                            icon="fa-solid fa-list"
-                                            class="mx-1 ui-button-success"
-                                            action="#{searchController.listReportsAwaitingApproval()}" ajax="false"   >
-                                        </p:commandButton>
-                                        <p:commandButton  
-                                            ajax="false" 
-                                            value="Back"
-                                            action="/lab/generate_barcode_p?faces-redirect=true"
-                                            icon="fa-solid fa-arrow-left"
-                                            class=""
-                                            style="float: right;"  >
-                                        </p:commandButton>
+                                    <div class="d-flex justify-content-between">
+                                        <div class="d-flex gap-2">
+                                            <p:commandButton 
+                                                rendered="#{webUserController.hasPrivilege('LabDataentry') eq true and patientReportController.currentPatientReport.approved ne true}"  
+                                                value="Save" 
+                                                icon="fa-solid fa-floppy-disk"
+                                                class="ui-button-warning"
+                                                action="#{patientReportController.savePatientReport()}" 
+                                                ajax="false">
+                                            </p:commandButton>
+                                            <p:commandButton 
+                                                ajax="false" 
+                                                class="mx-1"
+                                                process="tblVals"
+                                                rendered="#{!patientReportController.currentPatientReport.approved}"
+                                                icon="fa-solid fa-calculator"
+                                                update=":#{p:resolveFirstComponentWithId('tblCals',view).clientId} :#{p:resolveFirstComponentWithId('tblFlags',view).clientId} :#{p:resolveFirstComponentWithId('divPrint',view).clientId}"  
+                                                value="Calculate" 
+                                                action="#{patientReportController.calculate}">
+                                            </p:commandButton>
+                                            <p:commandButton 
+                                                id="btnApprove"  
+                                                class=" ui-button-success"
+                                                rendered="#{!patientReportController.currentPatientReport.approved}"
+                                                icon="fa-solid fa-check"
+                                                disabled ="#{!(webUserController.hasPrivilege('LabAutherizing') eq true and patientReportController.currentPatientReport.dataEntered eq true)}"   
+                                                value="Approve" 
+                                                action="#{patientReportController.approvePatientReport()}" 
+                                                ajax="false"   >
+                                            </p:commandButton>
+                                            <p:commandButton 
+                                                rendered="true"  
+                                                icon="fa-solid fa-message"
+                                                class="mx-1 ui-button-secondary"
+                                                id="btnSms"  
+                                                disabled ="#{!(webUserController.hasPrivilege('LabDataentry') eq true and patientReportController.currentPatientReport.approved eq true)}"   
+                                                value="Sent SMS"             
+                                                action="#{patientReportController.sendSmsForPatientReport()}" ajax="false"   >
+                                            </p:commandButton>
+                                            <p:commandButton   
+                                                id="btnCancelApproval"  
+                                                rendered ="#{(webUserController.hasPrivilege('LabDeAutherizing') eq true and patientReportController.currentPatientReport.approved eq true)}"   
+                                                value="Cancel Approval"
+                                                icon="fa-solid fa-times"
+                                                class=" ui-button-danger"
+                                                action="#{patientReportController.reverseApprovalOfPatientReport()}" ajax="false"   >
+                                            </p:commandButton>
+                                        </div>
+
+                                        <div class="d-flex gap-2">
+
+                                            <p:commandButton   
+                                                ajax="false" 
+                                                icon="fa-solid fa-print"
+                                                class="mx-1 ui-button-info"
+                                                rendered="#{!sessionController.departmentPreference.partialPaymentOfOpdBillsAllowed}"
+                                                value="Print" 
+                                                onclick="#{patientReportController.printPatientReport()}"
+                                                disabled="#{!patientReportController.currentPatientReport.approved or userPreferenceController.userPreference.canPrintWithoutPermission}">
+                                                <p:printer target="divPrint" />
+                                            </p:commandButton>
+
+                                            <p:commandButton   
+                                                ajax="false" 
+                                                icon="fa-solid fa-print"
+                                                class="mx-1 ui-button-info"
+                                                rendered="#{sessionController.departmentPreference.partialPaymentOfOpdBillsAllowed}"
+                                                value="Print" 
+                                                disabled="#{!patientReportController.currentPatientReport.approved or userPreferenceController.userPreference.canPrintWithoutPermission or patientReportController.currentPtIx.billItem.bill.backwardReferenceBill.balance ne 0}"
+                                                onclick="#{patientReportController.printPatientReport()}">
+                                                <p:printer target="divPrint" />
+                                            </p:commandButton>
+
+                                            <p:commandButton    
+                                                value="Patient Report Search" 
+                                                icon="fa-solid fa-search"
+                                                class=" ui-button-warning"
+                                                action="/lab/patient_reports_search?faces-redirect=true" 
+                                                ajax="false" >
+                                            </p:commandButton>
+
+                                            <p:commandButton  
+                                                ajax="false" 
+                                                value="Back"
+                                                action="/lab/generate_barcode_p?faces-redirect=true"
+                                                icon="fa-solid fa-arrow-left"
+                                                style="float: right;"  >
+                                            </p:commandButton>
+
+                                        </div>
+
                                     </div>
                                 </div>
                             </div>
@@ -131,7 +130,7 @@
                         <p:growl id="messages" showDetail="false"/> 
                         <div class="row">
 
-                            <div class="col-4">
+                            <div class="col-5">
                                 <p:panel header="Enter Values"  
                                          rendered="#{patientReportController.currentPatientReport.transInvestigation.reportType ne 'Microbiology' and patientReportController.currentPatientReport.containValues eq true}" >
                                     <table >
@@ -485,78 +484,13 @@
                                 </p:panel>
 
                             </div>
-                            <div class="col-8 ">
+                            <div class="col-7 ">
                                 <div class="my-1 row w-100" >
-                                    <div>
-                                        <h:panelGrid columns="8" class="w-100">
-                                            <h:panelGroup rendered="false" >
-                                                <p:commandButton 
-                                                    value="To Print" 
-                                                    icon="ui-icon-print" 
-                                                    action="#{patientReportController.printPatientLabReport()}" 
-                                                    rendered="#{patientReportController.currentPatientReport.approved or userPreferenceController.userPreference.canPrintWithoutPermission }">
-                                                    <p:printer target="divPrint" />
-                                                </p:commandButton>
-
-                                            </h:panelGroup>
-                                            <p:commandButton 
-                                                value="To Print" 
-                                                ajax="false" 
-                                                rendered="#{!sessionController.departmentPreference.partialPaymentOfOpdBillsAllowed}"
-                                                icon="fa-solid fa-print"
-                                                class="mx-1 ui-button-info"
-                                                onclick="#{patientReportController.printPatientLabReport()}"
-                                                disabled="#{!patientReportController.currentPatientReport.approved or userPreferenceController.userPreference.canPrintWithoutPermission }" >
-                                                <f:setPropertyActionListener target="#{patientReportController.showBackground}" value="false"/>
-                                                <p:printer target="divPrint" />
-                                            </p:commandButton>
-                                            <p:commandButton 
-                                                value="To Print" 
-                                                ajax="false" 
-                                                rendered="#{sessionController.departmentPreference.partialPaymentOfOpdBillsAllowed}"
-                                                onclick="#{patientReportController.printPatientLabReport()}"
-                                                icon="fa-solid fa-print"
-                                                class="mx-1 ui-button-info"
-                                                disabled="#{!patientReportController.currentPatientReport.approved or userPreferenceController.userPreference.canPrintWithoutPermission or patientReportController.currentPtIx.billItem.bill.backwardReferenceBill.balance ne 0}" >
-                                                <f:setPropertyActionListener target="#{patientReportController.showBackground}" value="false"/>
-                                                <p:printer target="divPrint" />
-                                            </p:commandButton>
-
-                                            <p:commandButton  
-                                                ajax="false" 
-                                                rendered="false"
-                                                value="Process" 
-                                                icon="fa-solid fa-file-pdf"
-                                                class="ui-button-danger"
-                                                >
-                                            </p:commandButton>
-
-                                            <p:commandButton  
-                                                ajax="false" 
-                                                value="PDF" 
-                                                icon="fa-solid fa-file-pdf"
-                                                class="mx-1 ui-button-danger"
-                                                action="#{patientReportController.createPDFAndSaveAsaFile()}" 
-                                                rendered="#{(patientReportController.currentPatientReport.approved or userPreferenceController.userPreference.canPrintWithoutPermission)}" >
-                                            </p:commandButton>
-
-                                            <h:panelGrid columns="2">
-                                                <h:outputLabel value="Show Background" class="mx-1" style="font-weight: bold; font-size: 20px;"></h:outputLabel>
-                                                <p:selectBooleanButton class="mt-1 mx-4" offLabel="No" onLabel="Yes"  value="#{patientReportController.showBackground}" >
-                                                    <p:ajax process="@this" update="divPrint" event="change"/>
-                                                </p:selectBooleanButton>
-                                            </h:panelGrid>
-                                        </h:panelGrid>
-                                        <div>
-                                            <p:panel class="my-2 mx-2" header="Patient details" >
-                                                <ezcommon:patient patient="#{patientReportController.currentPatientReport.patientInvestigation.patient}" ></ezcommon:patient>
-                                            </p:panel>
-                                        </div>
-                                    </div>
-
+                                    <p:panel class="mx-2" header="Patient details" >
+                                        <ezcommon:patient patient="#{patientReportController.currentPatientReport.patientInvestigation.patient}" ></ezcommon:patient>
+                                    </p:panel>
                                 </div>
 
-
                                 <style>
                                     @media print {
                                         .labReport {
@@ -570,279 +504,288 @@
 
                                 </style>
 
-                                <h:panelGroup  id="divPrint" >
-
-                                    <!--HtmlTemplate-->
-                                    <h:panelGroup rendered="#{patientReportController.currentPatientReport.item.reportType eq 'HtmlTemplate'}"  >
-                                        <div id="divReport"  class="labReport" >
-                                            <ez:common_report commonReportFormat="#{patientReportController.currentPatientReport.reportFormat}"
-                                                              patientReport="#{patientReportController.currentPatientReport}"/>
-                                            <ui:repeat  value="#{patientReportController.currentPatientReport.patientReportItemValues}" var="prv" >
-                                                <div style="#{prv.investigationItem.cssStyle}; position:absolute;">
-                                                    <h:outputLabel value="#{prv.lobValue}" rendered="#{prv.investigationItem.ixItemType eq 'Html' and prv.investigationItem.retired ne true}"  escape="false" />
-                                                </div>
-                                            </ui:repeat>
-                                        </div>
-                                    </h:panelGroup>
+                                <div class="d-flex justify-content-end m-3">
+                                    <h:outputLabel value="Show Background" class="mt-2" style="font-weight: bold; font-size: 20px;"></h:outputLabel>
+                                    <p:selectBooleanButton class="mt-1 mx-4" offLabel="No" onLabel="Yes"  value="#{patientReportController.showBackground}" >
+                                        <p:ajax process="@this" update="divPrint" event="change"/>
+                                    </p:selectBooleanButton>
+                                </div>
 
-                                    <!--General-->
-                                    <h:panelGroup rendered="#{patientReportController.currentPatientReport.item.reportType eq 'General'}"  >
-                                        <div id="divReport"  class="labReport"  >
-                                            <ez:common_report 
-                                                showBackground="#{patientReportController.showBackground}"
-                                                commonReportFormat="#{patientReportController.currentPatientReport.reportFormat}"
-                                                patientReport="#{patientReportController.currentPatientReport}"/>
-
-                                            <ui:repeat value="#{patientReportController.currentPatientReport.item.reportItems}" var="myIi" >
-                                                <h:panelGroup
-                                                    rendered="#{myIi.retired ne true}"
-                                                    layout="block" 
-                                                    style="#{myIi.cssStyle}; position:absolute;">
-                                                    <h:outputText rendered="#{myIi.retired ne true and myIi.ixItemType eq 'Label' }" 
-                                                                  style="z-index: 100;"
-                                                                  value="#{myIi.htmltext}" 
-                                                                  escape="false" ></h:outputText>
-                                                </h:panelGroup>
-                                            </ui:repeat>
+                                <div class="d-flex justify-content-center">
+                                    <h:panelGroup  id="divPrint" >
+
+                                        <!--HtmlTemplate-->
+                                        <h:panelGroup rendered="#{patientReportController.currentPatientReport.item.reportType eq 'HtmlTemplate'}"  >
+                                            <div id="divReport"  class="labReport" >
+                                                <ez:common_report commonReportFormat="#{patientReportController.currentPatientReport.reportFormat}"
+                                                                  patientReport="#{patientReportController.currentPatientReport}"/>
+                                                <ui:repeat  value="#{patientReportController.currentPatientReport.patientReportItemValues}" var="prv" >
+                                                    <div style="#{prv.investigationItem.cssStyle}; position:absolute;">
+                                                        <h:outputLabel value="#{prv.lobValue}" rendered="#{prv.investigationItem.ixItemType eq 'Html' and prv.investigationItem.retired ne true}"  escape="false" />
+                                                    </div>
+                                                </ui:repeat>
+                                            </div>
+                                        </h:panelGroup>
 
-                                            <ui:repeat  value="#{patientReportController.currentPatientReport.patientReportItemValues}" var="prv" >
-                                                <h:panelGroup
-                                                    rendered="#{prv.investigationItem.retired ne true}"
-                                                    layout="block" 
-                                                    style="#{prv.investigationItem.cssStyle}; position:absolute;">
-                                                    <h:outputLabel value="#{prv.lobValue}" 
-                                                                   style="z-index: 1000;"
-                                                                   rendered="#{prv.investigationItem.ixItemType eq 'Value' and prv.investigationItem.ixItemValueType eq 'Memo' and prv.investigationItem.retired ne true}"  
-                                                                   escape="false" />
-                                                </h:panelGroup>
-                                            </ui:repeat>
-                                            <ui:repeat  value="#{patientReportController.currentPatientReport.patientReportItemValues}" var="prv" >
-                                                <h:panelGroup
-                                                    rendered="#{prv.investigationItem.retired ne true}"
-                                                    layout="block" 
-                                                    style="#{prv.investigationItem.cssStyle}; position:absolute;">
-                                                    <h:outputLabel value="#{prv.lobValue}" rendered="#{prv.investigationItem.ixItemType eq 'Template' and prv.investigationItem.retired ne true}"  escape="false" />
-                                                </h:panelGroup>
-                                            </ui:repeat>
-                                            <ui:repeat  value="#{patientReportController.currentPatientReport.patientReportItemValues}" var="prv" >
-                                                <h:panelGroup 
-                                                    rendered="#{prv.investigationItem.retired ne true}"
-                                                    layout="block" 
-                                                    style="#{prv.investigationItem.cssStyle}; position:absolute; ">
-                                                    <h:outputLabel value="#{prv.strValue}"
-                                                                   style="z-index: 1000;"
-                                                                   rendered="#{prv.investigationItem.ixItemType eq 'Value' and prv.investigationItem.ixItemValueType eq 'Varchar'}" 
-                                                                   escape="false" />
-                                                </h:panelGroup>
-                                            </ui:repeat>
-                                            <ui:repeat  value="#{patientReportController.currentPatientReport.patientReportItemValues}" var="prv" >
-                                                <h:panelGroup
-                                                    rendered="#{prv.investigationItem.retired ne true}"
-                                                    layout="block" 
-                                                    style="#{prv.investigationItem.cssStyle}; position:absolute; ">
-                                                    <h:outputLabel value="#{prv.displayValue}" 
-                                                                   style="z-index: 1000;"
-
-                                                                   rendered="#{prv.investigationItem.ixItemType eq 'Value' and prv.investigationItem.ixItemValueType eq 'Double' and prv.investigationItem.retired ne true}" 
-                                                                   escape="false" />
-                                                </h:panelGroup>
-                                            </ui:repeat>
-                                            <ui:repeat  value="#{patientReportController.currentPatientReport.patientReportItemValues}" var="prv" >
-                                                <h:panelGroup 
-                                                    rendered="#{prv.investigationItem.retired ne true}"
-                                                    layout="block" 
-                                                    style="#{prv.investigationItem.cssStyle}; position:absolute;">
-                                                    <h:outputLabel value="#{prv.strValue}" 
-                                                                   style="z-index: 1000;"
-                                                                   rendered="#{prv.investigationItem.ixItemType eq 'DynamicLabel'}" escape="false" />
-                                                </h:panelGroup>
-                                            </ui:repeat>
-                                            <ui:repeat  value="#{patientReportController.currentPatientReport.patientReportItemValues}" var="prv" >
-                                                <h:panelGroup 
-                                                    rendered="#{prv.investigationItem.retired ne true}"
-                                                    layout="block" 
-                                                    style="#{prv.investigationItem.cssStyle}; position:absolute;">
-                                                    <h:outputLabel value="#{prv.strValue}" 
-                                                                   style="z-index: 1000;"
-                                                                   rendered="#{prv.investigationItem.ixItemType eq 'Flag'}" escape="false" />
-                                                </h:panelGroup>
-                                            </ui:repeat>
-                                            <ui:repeat  value="#{patientReportController.currentPatientReport.patientReportItemValues}" var="prv" >
-                                                <h:panelGroup 
-                                                    rendered="#{prv.investigationItem.retired ne true}"
-                                                    layout="block" 
-                                                    style="#{prv.investigationItem.cssStyle}; position:absolute;">
-                                                    <h:outputLabel value="#{prv.displayValue}"
-                                                                   style="z-index: 1000;"
-                                                                   rendered="#{prv.investigationItem.ixItemType eq 'Calculation' }" escape="false" >
-                                                    </h:outputLabel>
-                                                </h:panelGroup>
-                                            </ui:repeat>
-                                            <ui:repeat  value="#{patientReportController.currentPatientReport.patientReportItemValues}" var="prv" >
-                                                <h:panelGroup 
-
-                                                    layout="block" style="#{prv.investigationItem.cssStyle}; position:absolute;" rendered="#{prv.investigationItem.ixItemType eq 'Image'}" >
-                                                    <img style="height: 350px; width: 350px; z-index: 100;" src="#{prv.investigationItem.htmltext}" ></img>
-                                                    <p:graphicImage
-                                                        value="#{prv.lobValue}"
-                                                        style="width: #{prv.investigationItem.wtPix};overflow: visible; display: block; z-index: 800; " 
-                                                        height="#{prv.investigationItem.htPix}"
-
-                                                        width="#{prv.investigationItem.wtPix}">
-                                                    </p:graphicImage>
-                                                </h:panelGroup>
-                                            </ui:repeat>
+                                        <!--General-->
+                                        <h:panelGroup rendered="#{patientReportController.currentPatientReport.item.reportType eq 'General'}"  >
+                                            <div id="divReport"  class="labReport"  >
+                                                <ez:common_report 
+                                                    showBackground="#{patientReportController.showBackground}"
+                                                    commonReportFormat="#{patientReportController.currentPatientReport.reportFormat}"
+                                                    patientReport="#{patientReportController.currentPatientReport}"/>
+
+                                                <ui:repeat value="#{patientReportController.currentPatientReport.item.reportItems}" var="myIi" >
+                                                    <h:panelGroup
+                                                        rendered="#{myIi.retired ne true}"
+                                                        layout="block" 
+                                                        style="#{myIi.cssStyle}; position:absolute;">
+                                                        <h:outputText rendered="#{myIi.retired ne true and myIi.ixItemType eq 'Label' }" 
+                                                                      style="z-index: 100;"
+                                                                      value="#{myIi.htmltext}" 
+                                                                      escape="false" ></h:outputText>
+                                                    </h:panelGroup>
+                                                </ui:repeat>
 
-                                        </div>
-                                    </h:panelGroup>
+                                                <ui:repeat  value="#{patientReportController.currentPatientReport.patientReportItemValues}" var="prv" >
+                                                    <h:panelGroup
+                                                        rendered="#{prv.investigationItem.retired ne true}"
+                                                        layout="block" 
+                                                        style="#{prv.investigationItem.cssStyle}; position:absolute;">
+                                                        <h:outputLabel value="#{prv.lobValue}" 
+                                                                       style="z-index: 1000;"
+                                                                       rendered="#{prv.investigationItem.ixItemType eq 'Value' and prv.investigationItem.ixItemValueType eq 'Memo' and prv.investigationItem.retired ne true}"  
+                                                                       escape="false" />
+                                                    </h:panelGroup>
+                                                </ui:repeat>
+                                                <ui:repeat  value="#{patientReportController.currentPatientReport.patientReportItemValues}" var="prv" >
+                                                    <h:panelGroup
+                                                        rendered="#{prv.investigationItem.retired ne true}"
+                                                        layout="block" 
+                                                        style="#{prv.investigationItem.cssStyle}; position:absolute;">
+                                                        <h:outputLabel value="#{prv.lobValue}" rendered="#{prv.investigationItem.ixItemType eq 'Template' and prv.investigationItem.retired ne true}"  escape="false" />
+                                                    </h:panelGroup>
+                                                </ui:repeat>
+                                                <ui:repeat  value="#{patientReportController.currentPatientReport.patientReportItemValues}" var="prv" >
+                                                    <h:panelGroup 
+                                                        rendered="#{prv.investigationItem.retired ne true}"
+                                                        layout="block" 
+                                                        style="#{prv.investigationItem.cssStyle}; position:absolute; ">
+                                                        <h:outputLabel value="#{prv.strValue}"
+                                                                       style="z-index: 1000;"
+                                                                       rendered="#{prv.investigationItem.ixItemType eq 'Value' and prv.investigationItem.ixItemValueType eq 'Varchar'}" 
+                                                                       escape="false" />
+                                                    </h:panelGroup>
+                                                </ui:repeat>
+                                                <ui:repeat  value="#{patientReportController.currentPatientReport.patientReportItemValues}" var="prv" >
+                                                    <h:panelGroup
+                                                        rendered="#{prv.investigationItem.retired ne true}"
+                                                        layout="block" 
+                                                        style="#{prv.investigationItem.cssStyle}; position:absolute; ">
+                                                        <h:outputLabel value="#{prv.displayValue}" 
+                                                                       style="z-index: 1000;"
+
+                                                                       rendered="#{prv.investigationItem.ixItemType eq 'Value' and prv.investigationItem.ixItemValueType eq 'Double' and prv.investigationItem.retired ne true}" 
+                                                                       escape="false" />
+                                                    </h:panelGroup>
+                                                </ui:repeat>
+                                                <ui:repeat  value="#{patientReportController.currentPatientReport.patientReportItemValues}" var="prv" >
+                                                    <h:panelGroup 
+                                                        rendered="#{prv.investigationItem.retired ne true}"
+                                                        layout="block" 
+                                                        style="#{prv.investigationItem.cssStyle}; position:absolute;">
+                                                        <h:outputLabel value="#{prv.strValue}" 
+                                                                       style="z-index: 1000;"
+                                                                       rendered="#{prv.investigationItem.ixItemType eq 'DynamicLabel'}" escape="false" />
+                                                    </h:panelGroup>
+                                                </ui:repeat>
+                                                <ui:repeat  value="#{patientReportController.currentPatientReport.patientReportItemValues}" var="prv" >
+                                                    <h:panelGroup 
+                                                        rendered="#{prv.investigationItem.retired ne true}"
+                                                        layout="block" 
+                                                        style="#{prv.investigationItem.cssStyle}; position:absolute;">
+                                                        <h:outputLabel value="#{prv.strValue}" 
+                                                                       style="z-index: 1000;"
+                                                                       rendered="#{prv.investigationItem.ixItemType eq 'Flag'}" escape="false" />
+                                                    </h:panelGroup>
+                                                </ui:repeat>
+                                                <ui:repeat  value="#{patientReportController.currentPatientReport.patientReportItemValues}" var="prv" >
+                                                    <h:panelGroup 
+                                                        rendered="#{prv.investigationItem.retired ne true}"
+                                                        layout="block" 
+                                                        style="#{prv.investigationItem.cssStyle}; position:absolute;">
+                                                        <h:outputLabel value="#{prv.displayValue}"
+                                                                       style="z-index: 1000;"
+                                                                       rendered="#{prv.investigationItem.ixItemType eq 'Calculation' }" escape="false" >
+                                                        </h:outputLabel>
+                                                    </h:panelGroup>
+                                                </ui:repeat>
+                                                <ui:repeat  value="#{patientReportController.currentPatientReport.patientReportItemValues}" var="prv" >
+                                                    <h:panelGroup 
+
+                                                        layout="block" style="#{prv.investigationItem.cssStyle}; position:absolute;" rendered="#{prv.investigationItem.ixItemType eq 'Image'}" >
+                                                        <img style="height: 350px; width: 350px; z-index: 100;" src="#{prv.investigationItem.htmltext}" ></img>
+                                                        <p:graphicImage
+                                                            value="#{prv.lobValue}"
+                                                            style="width: #{prv.investigationItem.wtPix};overflow: visible; display: block; z-index: 800; " 
+                                                            height="#{prv.investigationItem.htPix}"
+
+                                                            width="#{prv.investigationItem.wtPix}">
+                                                        </p:graphicImage>
+                                                    </h:panelGroup>
+                                                </ui:repeat>
 
-                                    <!--Microbiology-->
-                                    <h:panelGroup rendered="#{patientReportController.currentPatientReport.item.reportType eq 'Microbiology'}"  >
-                                        <div id="divReportM"  class="labReport"   >
-                                            <ez:common_report showBackground="#{patientReportController.showBackground}" commonReportFormat="#{patientReportController.currentPatientReport.reportFormat}"
-                                                              patientReport="#{patientReportController.currentPatientReport}"/>
-                                            <div style="position: absolute; top: #{configOptionApplicationController.getShortTextValueByKey('Microbiology Lab Report Height')}%; width: 97%; left: 1%; text-align: center; font-family:Cambria, Georgia, serif; font-size: 14px; height: 70%; vertical-align: top;" >
-                                                <div id="ixName" >
-                                                    <h:outputLabel value="#{patientReportController.currentPatientReport.patientInvestigation.investigation.printName}" 
-                                                                   style="font-weight: bold;font-size: 21px!important; "/>
-                                                </div>
-                                                <div id="labelsAndValues" style="left:5%; margin-top: 7px; width: 90%; display: inline-block; vertical-align: top; " >
-                                                    <div style="vertical-align: top; width: 100%; padding: 1px;margin: auto;display: inline-block;">
-                                                        <ui:repeat  value="#{patientReportController.currentPatientReport.patientReportItemValues}" var="prv" >
-                                                            <h:panelGroup style="display: inline-block; clear: left; float: left; width: 100%; vertical-align: top; font-size: 15px;" layout="block"  rendered="#{prv.investigationItem.ixItemType eq 'Value' and prv.investigationItem.ixItemValueType eq 'Memo' and prv.investigationItem.retired ne true and prv.lobValue ne '' and prv.lobValue ne null and prv.investigationItem.riTop lt 50 }" >
-                                                                <div style="display: inline-block; float: left; width: 1%; clear: left; " ></div>
-                                                                <div style="display: inline-block; top: 0px; float: left; width: 30%; text-align: left; padding-top: 0.1%; padding-bottom: 0.1%; ">
-                                                                    <h:outputLabel value="#{prv.investigationItem.name}"   escape="false"/>
-                                                                </div>
-                                                                <div style="display: inline-block; float: left; width: 3%; " ></div>
-                                                                <div style="display: inline-block; text-align: left; float:left; width: 60%; padding-top: 0.1%; padding-bottom: 0.1%; ">
-                                                                    <h:outputLabel value="#{fn:replace(prv.lobValue,'\\n','&lt;br/&gt;')}"   escape="false"   />
-                                                                </div>
-                                                            </h:panelGroup>
-                                                        </ui:repeat>
-                                                    </div>
+                                            </div>
+                                        </h:panelGroup>
 
-                                                    <div style="vertical-align: top; text-align: left;  padding-top: 1%; padding-bottom: 0%; clear: left;">
-                                                        <h:outputLabel value="Antibiotic Sensitivity Test" 
-                                                                       rendered="#{patientReportController.currentPatientReport.transHasAbst}"
-                                                                       style="font-size: 135%; margin-top: 5px; font-weight: bold;"></h:outputLabel>
+                                        <!--Microbiology-->
+                                        <h:panelGroup rendered="#{patientReportController.currentPatientReport.item.reportType eq 'Microbiology'}"  >
+                                            <div id="divReportM"  class="labReport"   >
+                                                <ez:common_report showBackground="#{patientReportController.showBackground}" commonReportFormat="#{patientReportController.currentPatientReport.reportFormat}"
+                                                                  patientReport="#{patientReportController.currentPatientReport}"/>
+                                                <div style="position: absolute; top: #{configOptionApplicationController.getShortTextValueByKey('Microbiology Lab Report Height')}%; width: 97%; left: 1%; text-align: center; font-family:Cambria, Georgia, serif; font-size: 14px; height: 70%; vertical-align: top;" >
+                                                    <div id="ixName" >
+                                                        <h:outputLabel value="#{patientReportController.currentPatientReport.patientInvestigation.investigation.printName}" 
+                                                                       style="font-weight: bold;font-size: 21px!important; "/>
                                                     </div>
-                                                    <h:outputLabel 
-                                                        value="#{patientInvestigationController.findAntibioticForMicrobiologyReport(patientReportController.currentPatientReport.patientReportItemValues)}"
-                                                        style="display:none;"/>
-
-                                                    <div class="row">
-                                                        <div class="col-6">
-                                                            <ui:repeat  
-                                                                value="#{patientInvestigationController.column1AntibioticList}" 
-                                                                var="prv" >
-                                                                <h:panelGroup 
-                                                                    style="font-size: 15px;"
-                                                                    rendered="#{prv.investigationItem.ixItemType eq 'Antibiotic' and prv.investigationItem.retired ne true and prv.strValue ne '' and prv.strValue ne null  }" >
-                                                                    <div style="float: left;width: 5%; clear: left;" ></div>
-                                                                    <div style=" float: left; text-align: left; width: 70%; padding-left: 1px; padding-right: 1px; padding-top: 2px; vertical-align: top;">
-                                                                        <h:outputLabel value="#{prv.investigationItem.name}"  escape="false" />
+                                                    <div id="labelsAndValues" style="left:5%; margin-top: 7px; width: 90%; display: inline-block; vertical-align: top; " >
+                                                        <div style="vertical-align: top; width: 100%; padding: 1px;margin: auto;display: inline-block;">
+                                                            <ui:repeat  value="#{patientReportController.currentPatientReport.patientReportItemValues}" var="prv" >
+                                                                <h:panelGroup style="display: inline-block; clear: left; float: left; width: 100%; vertical-align: top; font-size: 15px;" layout="block"  rendered="#{prv.investigationItem.ixItemType eq 'Value' and prv.investigationItem.ixItemValueType eq 'Memo' and prv.investigationItem.retired ne true and prv.lobValue ne '' and prv.lobValue ne null and prv.investigationItem.riTop lt 50 }" >
+                                                                    <div style="display: inline-block; float: left; width: 1%; clear: left; " ></div>
+                                                                    <div style="display: inline-block; top: 0px; float: left; width: 30%; text-align: left; padding-top: 0.1%; padding-bottom: 0.1%; ">
+                                                                        <h:outputLabel value="#{prv.investigationItem.name}"   escape="false"/>
                                                                     </div>
-                                                                    <div style="float: left;width: 2%;  " ></div>
-                                                                    <div style=" text-align: left; float:left;width: 30%;padding-left: 1px; padding-right: 1px; padding-top: 2px; vertical-align: top;">
-                                                                        <h:outputLabel value="#{prv.strValue}" escape="false"
-                                                                                       style="#{prv.strValue eq 'SENSITIVE' ? 'font-weight: bold;' : ''} text-transform: uppercase;" />
+                                                                    <div style="display: inline-block; float: left; width: 3%; " ></div>
+                                                                    <div style="display: inline-block; text-align: left; float:left; width: 60%; padding-top: 0.1%; padding-bottom: 0.1%; ">
+                                                                        <h:outputLabel value="#{fn:replace(prv.lobValue,'\\n','&lt;br/&gt;')}"   escape="false"   />
                                                                     </div>
-
                                                                 </h:panelGroup>
                                                             </ui:repeat>
                                                         </div>
 
-                                                        <div class="col-6">
-                                                            <ui:repeat  
-                                                                value="#{patientInvestigationController.column2AntibioticList}" 
-                                                                var="prv" >
-                                                                <h:panelGroup 
-                                                                    style="font-size: 16px;"
-                                                                    rendered="#{prv.investigationItem.ixItemType eq 'Antibiotic' and prv.investigationItem.retired ne true and prv.strValue ne '' and prv.strValue ne null  }" >
-                                                                    <div style="float: left;width: 5%; clear: left;" ></div>
-                                                                    <div style=" float: left; text-align: left; width: 70%; padding-left: 1px; padding-right: 1px; padding-top: 2px; vertical-align: top;">
+                                                        <div style="vertical-align: top; text-align: left;  padding-top: 1%; padding-bottom: 0%; clear: left;">
+                                                            <h:outputLabel value="Antibiotic Sensitivity Test" 
+                                                                           rendered="#{patientReportController.currentPatientReport.transHasAbst}"
+                                                                           style="font-size: 135%; margin-top: 5px; font-weight: bold;"></h:outputLabel>
+                                                        </div>
+                                                        <h:outputLabel 
+                                                            value="#{patientInvestigationController.findAntibioticForMicrobiologyReport(patientReportController.currentPatientReport.patientReportItemValues)}"
+                                                            style="display:none;"/>
+
+                                                        <div class="row">
+                                                            <div class="col-6">
+                                                                <ui:repeat  
+                                                                    value="#{patientInvestigationController.column1AntibioticList}" 
+                                                                    var="prv" >
+                                                                    <h:panelGroup 
+                                                                        style="font-size: 15px;"
+                                                                        rendered="#{prv.investigationItem.ixItemType eq 'Antibiotic' and prv.investigationItem.retired ne true and prv.strValue ne '' and prv.strValue ne null  }" >
+                                                                        <div style="float: left;width: 5%; clear: left;" ></div>
+                                                                        <div style=" float: left; text-align: left; width: 70%; padding-left: 1px; padding-right: 1px; padding-top: 2px; vertical-align: top;">
+                                                                            <h:outputLabel value="#{prv.investigationItem.name}"  escape="false" />
+                                                                        </div>
+                                                                        <div style="float: left;width: 2%;  " ></div>
+                                                                        <div style=" text-align: left; float:left;width: 30%;padding-left: 1px; padding-right: 1px; padding-top: 2px; vertical-align: top;">
+                                                                            <h:outputLabel value="#{prv.strValue}" escape="false"
+                                                                                           style="#{prv.strValue eq 'SENSITIVE' ? 'font-weight: bold;' : ''} text-transform: uppercase;" />
+                                                                        </div>
+
+                                                                    </h:panelGroup>
+                                                                </ui:repeat>
+                                                            </div>
+
+                                                            <div class="col-6">
+                                                                <ui:repeat  
+                                                                    value="#{patientInvestigationController.column2AntibioticList}" 
+                                                                    var="prv" >
+                                                                    <h:panelGroup 
+                                                                        style="font-size: 16px;"
+                                                                        rendered="#{prv.investigationItem.ixItemType eq 'Antibiotic' and prv.investigationItem.retired ne true and prv.strValue ne '' and prv.strValue ne null  }" >
+                                                                        <div style="float: left;width: 5%; clear: left;" ></div>
+                                                                        <div style=" float: left; text-align: left; width: 70%; padding-left: 1px; padding-right: 1px; padding-top: 2px; vertical-align: top;">
+                                                                            <h:outputLabel value="#{prv.investigationItem.name}"  escape="false" />
+                                                                        </div>
+                                                                        <div style="float: left;width: 2%;  " ></div>
+                                                                        <div style=" text-align: left; float:left;width: 30%;padding-left: 1px; padding-right: 1px; padding-top: 2px; vertical-align: top;">
+                                                                            <h:outputLabel value="#{prv.strValue}" escape="false"
+                                                                                           style="#{prv.strValue eq 'SENSITIVE' ? 'font-weight: bold;' : ''} text-transform: uppercase;" />
+                                                                        </div>
+
+                                                                    </h:panelGroup>
+                                                                </ui:repeat>
+                                                            </div>
+                                                        </div>
+
+                                                        <div style="vertical-align: top; text-align: left; padding-top: 3px; clear: left;">
+                                                            <h:panelGroup rendered="#{patientReportController.currentPatientReport.patientReportItemValues.size()gt 0}">
+                                                                <hr/>
+                                                            </h:panelGroup>
+                                                        </div>
+
+                                                        <div style="vertical-align: top; text-align: left; font-size: 16px;  padding-top: 0%; padding-bottom: 0%; clear: left;">
+                                                            <ui:repeat  value="#{patientReportController.currentPatientReport.patientReportItemValues}" var="prv" >
+                                                                <h:panelGroup rendered="#{prv.investigationItem.ixItemType eq 'Value' and prv.investigationItem.ixItemValueType eq 'Memo' and prv.investigationItem.retired ne true and prv.lobValue ne '' and prv.lobValue ne null and prv.investigationItem.riTop gt 50 }" >
+                                                                    <div style="float: left;width: 5%; " ></div>
+                                                                    <div style=" float: left; text-align: left; width: 20%;padding-left: 1px; padding-right: 1px; padding-top: 1px; vertical-align: top;">
                                                                         <h:outputLabel value="#{prv.investigationItem.name}"  escape="false" />
                                                                     </div>
-                                                                    <div style="float: left;width: 2%;  " ></div>
-                                                                    <div style=" text-align: left; float:left;width: 30%;padding-left: 1px; padding-right: 1px; padding-top: 2px; vertical-align: top;">
-                                                                        <h:outputLabel value="#{prv.strValue}" escape="false"
-                                                                                       style="#{prv.strValue eq 'SENSITIVE' ? 'font-weight: bold;' : ''} text-transform: uppercase;" />
+                                                                    <div style="float: left;width: 5%;  " ></div>
+                                                                    <div style=" text-align: left; float:left;width: 60%;padding-left: 1px; padding-right: 1px; padding-top: 1px; vertical-align: top;">
+                                                                        <h:outputLabel value="#{fn:replace(prv.lobValue,'\\n','&lt;br/&gt;')}"    escape="false" />
                                                                     </div>
-
                                                                 </h:panelGroup>
                                                             </ui:repeat>
                                                         </div>
-                                                    </div>
 
-                                                    <div style="vertical-align: top; text-align: left; padding-top: 3px; clear: left;">
-                                                        <h:panelGroup rendered="#{patientReportController.currentPatientReport.patientReportItemValues.size()gt 0}">
-                                                            <hr/>
-                                                        </h:panelGroup>
-                                                    </div>
-
-                                                    <div style="vertical-align: top; text-align: left; font-size: 16px;  padding-top: 0%; padding-bottom: 0%; clear: left;">
                                                         <ui:repeat  value="#{patientReportController.currentPatientReport.patientReportItemValues}" var="prv" >
-                                                            <h:panelGroup rendered="#{prv.investigationItem.ixItemType eq 'Value' and prv.investigationItem.ixItemValueType eq 'Memo' and prv.investigationItem.retired ne true and prv.lobValue ne '' and prv.lobValue ne null and prv.investigationItem.riTop gt 50 }" >
-                                                                <div style="float: left;width: 5%; " ></div>
-                                                                <div style=" float: left; text-align: left; width: 20%;padding-left: 1px; padding-right: 1px; padding-top: 1px; vertical-align: top;">
-                                                                    <h:outputLabel value="#{prv.investigationItem.name}"  escape="false" />
-                                                                </div>
-                                                                <div style="float: left;width: 5%;  " ></div>
-                                                                <div style=" text-align: left; float:left;width: 60%;padding-left: 1px; padding-right: 1px; padding-top: 1px; vertical-align: top;">
-                                                                    <h:outputLabel value="#{fn:replace(prv.lobValue,'\\n','&lt;br/&gt;')}"    escape="false" />
-                                                                </div>
-                                                            </h:panelGroup>
+                                                            <div style="#{prv.investigationItem.cssStyle}; position:absolute;">
+                                                                <p:graphicImage value="https://upload.wikimedia.org/wikipedia/en/e/e2/IMG_Academy_Logo.svg"
+                                                                                style="width: #{prv.investigationItem.wtPix};overflow: visible; display: block;" 
+                                                                                height="#{prv.investigationItem.htPix}"
+
+                                                                                width="#{prv.investigationItem.wtPix}">
+                                                                </p:graphicImage>
+                                                            </div>
                                                         </ui:repeat>
-                                                    </div>
-
-                                                    <ui:repeat  value="#{patientReportController.currentPatientReport.patientReportItemValues}" var="prv" >
-                                                        <div style="#{prv.investigationItem.cssStyle}; position:absolute;">
-                                                            <p:graphicImage value="https://upload.wikimedia.org/wikipedia/en/e/e2/IMG_Academy_Logo.svg"
-                                                                            style="width: #{prv.investigationItem.wtPix};overflow: visible; display: block;" 
-                                                                            height="#{prv.investigationItem.htPix}"
 
-                                                                            width="#{prv.investigationItem.wtPix}">
-                                                            </p:graphicImage>
-                                                        </div>
-                                                    </ui:repeat>
-
-                                                </div>
-                                                <div style="clear: left;padding-top: 2%;">
-                                                    <h:outputLabel value="--- End of Report ---" style="font-size: 16px; font-weight: bold; "></h:outputLabel>
+                                                    </div>
+                                                    <div style="clear: left;padding-top: 2%;">
+                                                        <h:outputLabel value="--- End of Report ---" style="font-size: 16px; font-weight: bold; "></h:outputLabel>
+                                                    </div>
                                                 </div>
                                             </div>
-                                        </div>
-                                    </h:panelGroup>
+                                        </h:panelGroup>
 
-                                    <!--PathologyOrHaematology-->
-                                    <h:panelGroup rendered="#{patientReportController.currentPatientReport.item.reportType eq 'PathologyOrHaematology'}"  >
-                                        <div id="divReportM"  class="labReport"   >
-                                            <ez:common_report 
-                                                showBackground="#{patientReportController.showBackground}" 
-                                                commonReportFormat="#{patientReportController.currentPatientReport.reportFormat}"
-                                                patientReport="#{patientReportController.currentPatientReport}">
-                                            </ez:common_report>
-
-                                            <div style="position: absolute; top: #{configOptionApplicationController.getShortTextValueByKey('Pathology or Haematology Lab Report Height')}%; width: 97%; font-family:Cambria, Georgia, serif; font-size: 14px; height: 70%; vertical-align: top;" >
-                                                <div id="ixName" class="d-flex justify-content-center">
-                                                    <h:outputLabel 
-                                                        value="#{patientReportController.currentPatientReport.patientInvestigation.investigation.printName}" 
-                                                        style="font-weight: bold; font-size: 21px!important;">
-                                                    </h:outputLabel>
-                                                </div>
-                                                <div class="mt-3" style="font-size: 16px; margin-left:7%; margin-right: 5%; ">
-                                                    <h:outputLabel value="#{fn:replace(patientReportController.currentPatientReport.templateItem.lobValue,'\\n','&lt;br/&gt;')}" style="text-align: left;"  escape="false" />
-                                                </div>
+                                        <!--PathologyOrHaematology-->
+                                        <h:panelGroup rendered="#{patientReportController.currentPatientReport.item.reportType eq 'PathologyOrHaematology'}"  >
+                                            <div id="divReportM"  class="labReport"   >
+                                                <ez:common_report 
+                                                    showBackground="#{patientReportController.showBackground}" 
+                                                    commonReportFormat="#{patientReportController.currentPatientReport.reportFormat}"
+                                                    patientReport="#{patientReportController.currentPatientReport}">
+                                                </ez:common_report>
+
+                                                <div style="position: absolute; top: #{configOptionApplicationController.getShortTextValueByKey('Pathology or Haematology Lab Report Height')}%; width: 97%; font-family:Cambria, Georgia, serif; font-size: 14px; height: 70%; vertical-align: top;" >
+                                                    <div id="ixName" class="d-flex justify-content-center">
+                                                        <h:outputLabel 
+                                                            value="#{patientReportController.currentPatientReport.patientInvestigation.investigation.printName}" 
+                                                            style="font-weight: bold; font-size: 21px!important;">
+                                                        </h:outputLabel>
+                                                    </div>
+                                                    <div class="mt-3" style="font-size: 16px; margin-left:7%; margin-right: 5%; ">
+                                                        <h:outputLabel value="#{fn:replace(patientReportController.currentPatientReport.templateItem.lobValue,'\\n','&lt;br/&gt;')}" style="text-align: left;"  escape="false" />
+                                                    </div>
 
-                                                <div style=" clear: left; padding-top: 2%; text-align: center;">
-                                                    <h:outputLabel value="--- End of Report ---" style="font-size: 16px; font-weight: bold; "></h:outputLabel>
+                                                    <div style=" clear: left; padding-top: 2%; text-align: center;">
+                                                        <h:outputLabel value="--- End of Report ---" style="font-size: 16px; font-weight: bold; "></h:outputLabel>
+                                                    </div>
                                                 </div>
                                             </div>
-                                        </div>
-                                    </h:panelGroup>
+                                        </h:panelGroup>
 
-                                </h:panelGroup>
+                                    </h:panelGroup>
+                                </div>
 
                             </div>
                         </div>
diff --git a/src/main/webapp/resources/template/not_authorize.xhtml b/src/main/webapp/resources/template/not_authorize.xhtml
index f4a01d1d39..a3455b42df 100644
--- a/src/main/webapp/resources/template/not_authorize.xhtml
+++ b/src/main/webapp/resources/template/not_authorize.xhtml
@@ -16,7 +16,7 @@
                     <i class="fa fa-exclamation-triangle" style="font-size: 10rem; color:#850f0f"></i>
                 </div>
                 <div class="d-flex justify-content-center">
-                    <p:outputLabel value="You are not Authorized to Access this Page.. !" class="m-2 ui-message-fatal"></p:outputLabel>
+                    <p:outputLabel value="You are not Authorized to Access this Page.. !" class="m-2" style="font-size: 40px; color:#850f0f; font-weight: 700;"></p:outputLabel>
                 </div>
             </div>
         </div>