Merge pull request #4551 from hmislk/Issue#4550

Issue#4550

Author: Senula88

src/main/java/com/divudi/bean/clinical/PatientEncounterController.java

@@ -733,6 +733,7 @@ public void createNewResultReport(ClinicalFindingValue pf) {
 
         patientReportController.setCurrentPtIx(currentPtIx);
         patientReportController.createNewReport(currentPtIx);
+        pf.setPatientReport(patientReportController.getCurrentPatientReport());
     }
 
 
@@ -760,6 +761,7 @@ public void addEncounterInvestigationResults() {
         getEncounterFindingValues().add(encounterInvestigationResult);
         setEncounterInvestigationResults(fillEncounterInvestigationResults(current));
         createNewResultReport(encounterInvestigationResult);
+        clinicalFindingValueFacade.edit(encounterInvestigationResult);
         encounterInvestigationResult = null;
         JsfUtil.addSuccessMessage("Investigation Report added");
 
@@ -786,7 +788,7 @@ public PatientInvestigation createPatientInvestigation(ClinicalFindingValue pf)
         pi.setPrinted(Boolean.FALSE);
         pi.setReceived(Boolean.TRUE);
         pi.setRetired(false);
-        createBillItemForPatientInvestigation(pi);
+//        createBillItemForPatientInvestigation(pi);
         if (pi.getId() == null) {
             getPiFacade().create(pi);
         }
@@ -795,31 +797,31 @@ public PatientInvestigation createPatientInvestigation(ClinicalFindingValue pf)
         return pi;
     }
 
-    public void createBillItemForPatientInvestigation(PatientInvestigation pi){
-        BillItem bi = new BillItem();
-        bi.setQty(1.0);
-        bi.setItem(pi.getInvestigation());
-        if(bill==null){
-            bill = new Bill();
-        }
-        bill.setPatient(pi.getPatient());
-        bill.setCreatedAt(new Date());
-        bill.setCreater(sessionController.getLoggedUser());
-        bill.setPatient(pi.getPatient());
-        bill.setBalance(0.0);
-        bi.setCreatedAt(bill.getCreatedAt());
-        bi.setCreater(sessionController.getLoggedUser());
-        if (bill.getId()==null){
-            billFacade.create(bill);
-        }
-        
-        bi.setBill(bill);
-        
-        if (bi.getId() == null) {
-            billItemFacade.create(bi);
-        }
-        pi.setBillItem(bi);
-    }
+//    public void createBillItemForPatientInvestigation(PatientInvestigation pi){
+//        BillItem bi = new BillItem();
+//        bi.setQty(1.0);
+//        bi.setItem(pi.getInvestigation());
+//        if(bill==null){
+//            bill = new Bill();
+//        }
+//        bill.setPatient(pi.getPatient());
+//        bill.setCreatedAt(new Date());
+//        bill.setCreater(sessionController.getLoggedUser());
+//        bill.setPatient(pi.getPatient());
+//        bill.setBalance(0.0);
+//        bi.setCreatedAt(bill.getCreatedAt());
+//        bi.setCreater(sessionController.getLoggedUser());
+//        if (bill.getId()==null){
+//            billFacade.create(bill);
+//        }
+//        
+//        bi.setBill(bill);
+//        
+//        if (bi.getId() == null) {
+//            billItemFacade.create(bi);
+//        }
+//        pi.setBillItem(bi);
+//    }
 
     public void addDx() {
         if (diagnosis == null) {

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

@@ -1546,6 +1546,45 @@ public void approvePatientReport() {
                 getSmsFacade().create(e);
             }
         }
+        
+        JsfUtil.addSuccessMessage("Approved");
+        commonController.printReportDetails(null, null, startTime, "Lab Report Aprove.");
+    }
+    
+    public void approveEmrPatientReport() {
+        Date startTime = new Date();
+        if (currentPatientReport == null) {
+            JsfUtil.addErrorMessage("Nothing to approve");
+            return;
+        }
+        if (currentPatientReport.getDataEntered() == false) {
+            JsfUtil.addErrorMessage("First Save report");
+            return;
+        }
+
+        BooleanMessage tbm = canApproveThePatientReport(currentPatientReport);
+        if (!tbm.isFlag()) {
+            JsfUtil.addErrorMessage(tbm.getMessage());
+            return;
+        }
+
+        getCurrentPtIx().setApproved(true);
+        currentPtIx.setApproveAt(Calendar.getInstance().getTime());
+        currentPtIx.setApproveUser(getSessionController().getLoggedUser());
+        currentPtIx.setApproveDepartment(getSessionController().getDepartment());
+        getPiFacade().edit(currentPtIx);
+        currentPatientReport.setApproved(Boolean.FALSE);
+        currentPatientReport.setApproved(Boolean.TRUE);
+        currentPatientReport.setApproveAt(Calendar.getInstance().getTime());
+        currentPatientReport.setApproveDepartment(getSessionController().getLoggedUser().getDepartment());
+        currentPatientReport.setApproveInstitution(getSessionController().getLoggedUser().getInstitution());
+        currentPatientReport.setApproveUser(getSessionController().getLoggedUser());
+        currentPatientReport.setQrCodeContentsDetailed(generateQrCodeDetails(currentPatientReport));
+        currentPatientReport.setQrCodeContentsLink(generateQrCodeLink(currentPatientReport));
+        getFacade().edit(currentPatientReport);
+        getStaffController().setCurrent(getSessionController().getLoggedUser().getStaff());
+        getTransferController().setStaff(getSessionController().getLoggedUser().getStaff());
+
         if(clinicalFindingValue!=null){
             getClinicalFindingValue().setPatientInvestigation(currentPtIx);
             if(clinicalFindingValue.getId()!=null){

src/main/java/com/divudi/entity/clinical/ClinicalFindingValue.java

@@ -11,6 +11,7 @@
 import com.divudi.entity.PatientEncounter;
 import com.divudi.entity.Person;
 import com.divudi.entity.lab.PatientInvestigation;
+import com.divudi.entity.lab.PatientReport;
 import java.io.Serializable;
 import javax.persistence.CascadeType;
 import javax.persistence.Entity;
@@ -66,6 +67,8 @@ public class ClinicalFindingValue implements Serializable {
     private DocumentTemplate documentTemplate;
     @ManyToOne
     private PatientInvestigation patientInvestigation;
+    @ManyToOne
+    private PatientReport patientReport;
 
     @Enumerated(EnumType.STRING)
     private ClinicalFindingValueType clinicalFindingValueType;
@@ -267,6 +270,14 @@ public PatientInvestigation getPatientInvestigation() {
     public void setPatientInvestigation(PatientInvestigation patientInvestigation) {
         this.patientInvestigation = patientInvestigation;
     }
+
+    public PatientReport getPatientReport() {
+        return patientReport;
+    }
+
+    public void setPatientReport(PatientReport patientReport) {
+        this.patientReport = patientReport;
+    }
 
 
 

src/main/webapp/emr/opd_visit.xhtml

@@ -643,18 +643,19 @@
                                                                  var="ix" class="w-100">
                                                         <p:column headerText="Procedure" >
                                                             <h:outputLabel value="#{ix.itemValue.name}"></h:outputLabel>
-
                                                         </p:column>
+                                                        
                                                         <p:column headerText="Details">
                                                             <h:outputLabel value="#{ix.lobValue}"></h:outputLabel>
                                                         </p:column>
                                                         <p:column headerText="Action">
                                                             <div class="d-flex">
                                                                 <p:commandLink id="btnNewReport" ajax="false"
                                                                                disabled="#{ix.patientInvestigation ne null}"
-                                                                               action="/lab/patient_report">
+                                                                               action="/emr/patient_report">
                                                                     <f:setPropertyActionListener value="#{ix}" target="#{patientEncounterController.currentEIResult}"></f:setPropertyActionListener>
                                                                     <f:setPropertyActionListener value="#{ix}" target="#{patientReportController.clinicalFindingValue}"/>
+                                                                    <f:setPropertyActionListener value="#{ix.patientReport}" target="#{patientReportController.currentPatientReport}"></f:setPropertyActionListener>
                                                                     <p:graphicImage library="image" styleClass="standedicon" name="data_entry.png" ></p:graphicImage>
                                                                 </p:commandLink>
                                                                 <p:commandButton