diff --git a/src/components/charge/CheckoutDetail.vue b/src/components/charge/CheckoutDetail.vue
index 88ca5b9..5049375 100644
--- a/src/components/charge/CheckoutDetail.vue
+++ b/src/components/charge/CheckoutDetail.vue
@@ -92,6 +92,7 @@ const saveRetail = () => {
           cancelButtonText: '取消',
           type: 'warning',
         }).then(() => {
+      close()
       emit('confirm')
     })
     return
@@ -179,7 +180,6 @@ const addTraceAbilityCodeHandler = (item: any, code: any) => {
   addTraceabilityCodeDo(item, code)
 
 }
-
 </script>
 <style scoped lang="scss">
 .header {
diff --git a/src/components/charge/PersonalPayment.vue b/src/components/charge/PersonalPayment.vue
index 4a75508..3f24507 100644
--- a/src/components/charge/PersonalPayment.vue
+++ b/src/components/charge/PersonalPayment.vue
@@ -110,8 +110,7 @@ const completeSettlement = () => {
     changeOrderCode: orderInfo.value.changeOrderCode,
   }
   post("charge/socialRealPay", {...params}).then((res: any) => {
-    show.value = false;
-    emit('orderCompleted')
+    orderCompleted()
   })
 }
 
@@ -148,6 +147,7 @@ const openPsnPayment = (payInfo: any, orderInfo: any) => {
 }
 const orderCompleted = () => {
   show.value = false;
+  emit('orderCompleted')
 }
 const orderCanceled = () => {
   show.value = false;
diff --git a/src/components/charge/Settlement.vue b/src/components/charge/Settlement.vue
index 9dffa4c..0cac716 100644
--- a/src/components/charge/Settlement.vue
+++ b/src/components/charge/Settlement.vue
@@ -71,7 +71,7 @@ const socialCard = ref<any>({
 });
 const loading = ref(false);
 const show = ref(false)
-const printReceipt = ref(false);
+const printReceipt = ref(true);
 const payType = ref(null);
 const retailOrder = ref<any>(null);
 const close = () => {
diff --git a/src/views/charge/index.vue b/src/views/charge/index.vue
index a8fde95..e94d1ac 100644
--- a/src/views/charge/index.vue
+++ b/src/views/charge/index.vue
@@ -80,7 +80,7 @@
 
 import Panel from "@/components/common/Panel.vue";
 import ChargeQueue from "@/components/charge/ChargeQueue.vue";
-import {nextTick, onMounted, ref} from "vue";
+import {nextTick, onMounted, onUnmounted, ref} from "vue";
 import {post} from "@/utils/request.ts";
 import ServiceDetail from "@/components/common/service/ServiceDetail.vue";
 import GoodsDetail from "@/components/common/goods/GoodsDetail.vue";
@@ -95,6 +95,9 @@ import PatientCard from "@/components/charge/PatientCard.vue";
 import {apiConfig} from "@/assets/config/apiConfig.ts";
 import CheckoutDetail from "@/components/charge/CheckoutDetail.vue";
 import {ElMessage} from "element-plus";
+import {medTypeJson} from "@/assets/config/constants.ts";
+import {useWsStore} from "@/stores/wsStore.ts";
+import type {Request, Response} from "@/utils/ws.ts";
 
 const formData = ref<any>({
   patientInfo: {},
@@ -103,6 +106,16 @@ const formData = ref<any>({
   itemDetail: [],
   patientRegistration: {}
 })
+
+const initFormData = () => {
+  formData.value = {
+    patientInfo: {},
+    diagnosisMedicalRecord: {},
+    goodsDetail: [],
+    itemDetail: [],
+    patientRegistration: {}
+  }
+}
 const statusDisabled = ref(0)
 const diagnosisKeyword = ref("")
 const chargeQueueRef = ref()
@@ -212,11 +225,65 @@ const getDockerList = () => {
     dockerList.value = res
   })
 }
-const orderCompleted = () => {
+const orderCompleted = (printReceipt: any) => {
+  if (printReceipt) {
+    //打印小票
+    printReceiptDo()
+  }
   nextTick(() => {
-    chargeQueueRef.value?.getOrderList()
+    chargeQueueRef.value?.init()
+  })
+  initFormData()
+}
+
+type MedTypeKey = keyof typeof medTypeJson;
+const wsStore = useWsStore()
+const printReceiptDo = () => {
+  if (!formData.value.code) {
+    return
+  }
+  let code = formData.value.code;
+
+  const printConfig = {} as any;
+  post("common/config/getPrintConfig").then((res: any) => {
+    printConfig.printName = res.printName
+    printConfig.pageType = res.pageType
+    if (!printConfig.printName || !printConfig.pageType) {
+      ElMessage.error("打印机未设置，请先到设置-打印管理中设置")
+      return;
+    }
+    post("charge/getPrintInfoByCode", {code}).then((res: any) => {
+      res.printerName = printConfig.printName
+      res.pageType = printConfig.pageType
+      if (res.chargeSocialPayLog) {
+        res.chargeSocialPayLog.medTypeStr = medTypeJson[res.chargeSocialPayLog.medType as MedTypeKey];
+      }
+      console.log(res)
+      wsStore.sendMessage({
+        type: "PrintReceipt",
+        config: null,
+        data: res
+      })
+    })
+
   })
 }
+
+let request: Request = {
+  type: "getPrintList",
+  config: null,
+  data: null
+}
+wsStore.sendMessage(request);
+const reciceMessage = (response: Response) => {
+}
+onMounted(async () => {
+  wsStore.setMessageCallback(reciceMessage)
+})
+onUnmounted(() => {
+  wsStore.removeAllMessageCallback()
+})
+
 const orderCanceled = () => {
   nextTick(() => {
     chargeQueueRef.value?.getOrderList()