Merge pull request #6459 from hmislk/Issue#6458

Issue#6458 Closes #6458
hmislk · Jul 21, 2024 · f2e9bc0 · f2e9bc0
2 parents 2c34337 + 3290e20
commit f2e9bc0
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/src/main/java/com/divudi/bean/common/OpdPreBillController.java b/src/main/java/com/divudi/bean/common/OpdPreBillController.java
@@ -667,6 +667,11 @@ public void setSessionDate(Date sessionDate) {
     }
 
     public boolean isForeigner() {
+        if (configOptionApplicationController.getBooleanValueByKey("Save the Patient with Patient Status")) {
+            if (patient != null) {
+                foreigner = patient.getPerson().isForeigner();
+            }
+        }
         return foreigner;
     }
 

diff --git a/src/main/webapp/opd/opd_pre_bill.xhtml b/src/main/webapp/opd/opd_pre_bill.xhtml
@@ -407,7 +407,7 @@
                                                     id="comment"/>
                                             </div>
 
-                                            <h:panelGroup id="gpLocalForeign" layout="block"  class="col-md-4" >
+                                            <h:panelGroup id="gpLocalForeign" layout="block"  class="col-md-4" rendered="#{!configOptionApplicationController.getBooleanValueByKey('Save the Patient with Patient Status')}">
                                                 <p:commandButton value="Mark Foreigner" 
                                                                  class="mx-1"
                                                                  action="#{opdPreBillController.markAsForeigner}"