diff --git a/src/main/java/com/divudi/bean/common/OpdPreBillController.java b/src/main/java/com/divudi/bean/common/OpdPreBillController.java
index ace9a95cbd..04716dd74e 100644
--- 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
index c987296bea..d881d43930 100644
--- 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}"