diff --git a/src/components/common/LocalConfig.vue b/src/components/common/LocalConfig.vue
index 64205e8..2b8c756 100644
--- a/src/components/common/LocalConfig.vue
+++ b/src/components/common/LocalConfig.vue
@@ -12,11 +12,11 @@
                 <el-checkbox v-model="LocalConfig.normal.isDevTool" size="small" />
               </el-form-item>
             </el-col>
-          </el-row>          
+          </el-row>
         </el-form>
       </el-tab-pane>
       <el-tab-pane label="人员登记">
-        <el-form label-width="140px" size="size">          
+        <el-form label-width="140px" size="size">
           <el-row>
             <el-col :span="12">
               <el-form-item label="人员登记组件">
@@ -27,17 +27,26 @@
               </el-form-item>
             </el-col>
             <el-col :span="12">
-              <el-form-item label="与标准版高度差">                
+              <el-form-item label="与标准版高度差">
                 <el-input type="number" v-model="LocalConfig.patientRegister.editHeight" size="small" />
               </el-form-item>
             </el-col>
           </el-row>
           <el-row>
-            <el-col :span="24">
+            <el-col :span="12">
               <el-form-item label="保存即发送收费申请">
                 <el-checkbox v-model="LocalConfig.patientRegister.immediateToHisCharge" size="small" />
               </el-form-item>
-            </el-col>            
+            </el-col>
+            <el-col :span="12">
+              <el-form-item label="保存打指引单与条码">
+                <el-checkbox-group v-model="printGuideLabel">
+                  <el-checkbox label="guide">指引单</el-checkbox>
+                  <el-checkbox label="pacs">检查条码</el-checkbox>
+                  <el-checkbox label="lis">检验条码</el-checkbox>
+                </el-checkbox-group>
+              </el-form-item>              
+            </el-col>
           </el-row>
         </el-form>
       </el-tab-pane>
@@ -73,22 +82,24 @@
 </template>
 <script>
 
-import { deepCopy } from "@/utlis/proFunc";
+import { deepCopy,objCopy } from "../../utlis/proFunc";
 import { mapState } from "vuex";
 
 export default {
   data() {
     return {
+      printGuideLabel:["guide", "pacs", "lis"],
       LocalConfig: {
         normal: {
           isDevTool: false, // 壳端是否显示打开调试工具按钮
           PatientRegisterEdit: 'standard', //standard/qztl 人员登记组件版本
           PatientRegisterEditHeight: 0,  // 相较与标准版，选组合项目组件，减少高度
         },
-        patientRegister: {          
+        patientRegister: {
           edit: 'standard', //standard/qztl 人员登记组件版本
           editHeight: 0,  // 相较与标准版，选组合项目组件，减少高度
           immediateToHisCharge: true,  // 人员登记保存后，立即发送收费申请
+          printGuideLabel: ["guide", "pacs", "lis"], // 保存后打印指引单与条码
         },
         lisLabel: { // 检验条码打印
           MarginTop: 56, //
@@ -110,7 +121,11 @@ export default {
     this.LocalConfigInit = deepCopy(this.LocalConfig)
     let LocalConfig = window.localStorage.getItem("LocalConfig") || null
     try {
-      this.LocalConfig = Object.assign({}, this.LocalConfig, JSON.parse(LocalConfig) || {})
+      console.log('JSON.parse(LocalConfig)',JSON.parse(LocalConfig))      
+      this.LocalConfig = Object.assign({}, this.LocalConfigInit, JSON.parse(LocalConfig) || {})
+      if(this.LocalConfig && this.LocalConfig.patientRegister && this.LocalConfig.patientRegister.printGuideLabel){
+        this.printGuideLabel = deepCopy(this.LocalConfig.patientRegister.printGuideLabel)
+      }
     } catch (error) {
       console.log('window.localStorage.getItem("LocalConfig")', error)
     }
@@ -123,6 +138,7 @@ export default {
 
   methods: {
     btnOk() {
+      this.LocalConfig.patientRegister.printGuideLabel = deepCopy(this.printGuideLabel)
       window.localStorage.setItem("LocalConfig", JSON.stringify(this.LocalConfig))
     },
 
diff --git a/src/components/patientRegister/PatientRegisterEdit.vue b/src/components/patientRegister/PatientRegisterEdit.vue
index 7a0aa95..c9cc47a 100644
--- a/src/components/patientRegister/PatientRegisterEdit.vue
+++ b/src/components/patientRegister/PatientRegisterEdit.vue
@@ -624,6 +624,7 @@ export default {
           editMode: 'standard', //standard/qztl 人员登记组件版本
           editHeight: 0,  // 相较与标准版，选组合项目组件，减少高度
           immediateToHisCharge: true,  // 人员登记保存后，立即发送收费申请
+          printGuideLabel: ["guide", "pacs", "lis"], // 保存后打印指引单与条码
         },
       },
       brushTimes: 0,
@@ -764,6 +765,7 @@ export default {
         if (LocalConfig.patientRegister.edit) this.LocalConfig.patientRegister.edit = LocalConfig.patientRegister.edit
         if (LocalConfig.patientRegister.editHeight) this.LocalConfig.patientRegister.editHeight = LocalConfig.patientRegister.editHeight
         if (LocalConfig.patientRegister.immediateToHisCharge) this.LocalConfig.patientRegister.immediateToHisCharge = LocalConfig.patientRegister.immediateToHisCharge
+        if (LocalConfig.patientRegister.printGuideLabel) this.LocalConfig.patientRegister.printGuideLabel = deepCopy(LocalConfig.patientRegister.printGuideLabel)
       }
     } catch (error) {
       console.log("window.localStorage.getItem('LocalConfig')", error)
@@ -1470,7 +1472,7 @@ export default {
         postapi(`/api/PatientRegister/CreatePatientRegister`, body)
           .then(async (res) => {
             if (res.code > -1) {
-              objCopy(res.data,this.form) // 日期类型复制会有问题(记得要特殊处理)
+              objCopy(res.data, this.form) // 日期类型复制会有问题(记得要特殊处理)
 
               this.dataTransOpts.tableS.patient_register = deepCopy(res.data)
 
@@ -1487,27 +1489,29 @@ export default {
                 await this.immediateToHisCharge(this.form.id)
               }
 
-              // 新增保存时，提示是否打条码
-              if (!body.id) {
-                this.$confirm("是否打印 指引单、检验条码及 Pacs 条码?", "提示", {
-                  confirmButtonText: "是",
-                  cancelButtonText: "否",
-                  type: "warning",
-                })
-                  .then(async () => {
-                    try {
-                      await this.guidePrint('0001', false)
-                      await this.labelPrint(false)
-                    } catch (error) {
-                      // this.$message.info({ showClose: true, message: error });
-                      console.log(error)
-                    }
+              // 新增保存时，提示是否打条码 (预登记一般不打条码)
+              if (!body.id && this.form.completeFlag != '0') {
+                if (Array.isArray(this.LocalConfig.patientRegister.printGuideLabel) && this.LocalConfig.patientRegister.printGuideLabel.length > 0) {
+                  this.$confirm("是否打印 指引单、检验条码及 Pacs 条码?", "提示", {
+                    confirmButtonText: "是",
+                    cancelButtonText: "否",
+                    type: "warning",
                   })
-                  .catch((err) => {
-                    // if (err == "cancel") {
-                    //   this.$message.info({ showClose: true, message: "已取消操作" });
-                    // }
-                  });
+                    .then(async () => {
+                      try {
+                        if(this.LocalConfig.patientRegister.printGuideLabel.indexOf('guide') > -1) await this.guidePrint('0001', false)
+                        await this.labelPrint(false)
+                      } catch (error) {
+                        // this.$message.info({ showClose: true, message: error });
+                        console.log(error)
+                      }
+                    })
+                    .catch((err) => {
+                      // if (err == "cancel") {
+                      //   this.$message.info({ showClose: true, message: "已取消操作" });
+                      // }
+                    });
+                }
               }
             }
           }
@@ -1640,6 +1644,10 @@ export default {
         this.$message.info({ showClose: true, message: "人员信息尚未保存，不可执行此操作！" });
         return;
       }
+      if(this.form.completeFlag == '0'){
+        this.$message.info({ showClose: true, message: "预登记人员，不可执行此操作！" });
+        return;
+      }
       if (!this.$peisAPI) {
         this.$message.info({ showClose: true, message: "此功能，需要在壳客户端才可运行！" })
         return
@@ -1659,7 +1667,7 @@ export default {
           { Name: 'pageFooter', Value: 'pic/peisQrCode.jpg' },
         ],
       };
-      console.log('this.$peisAPI.print',JSON.stringify(toOutShell))
+      console.log('this.$peisAPI.print', JSON.stringify(toOutShell))
       this.printing = true
       if (isPreview) {
         /*
@@ -1712,7 +1720,7 @@ export default {
 
     //检验申请
     async lisRequest() {
-      this.$message.warning({ showClose: true, message: '开发中……' });
+      this.$message.warning({ showClose: true, message: '此功能已合并到条码打印' });
       /*
       let isPrintLisRequest = false
       let res = null
@@ -1762,6 +1770,10 @@ export default {
         this.$message.info({ showClose: true, message: "人员信息尚未保存，不可执行此操作！" });
         return;
       }
+      if(this.form.completeFlag == '0'){
+        this.$message.info({ showClose: true, message: "预登记人员，不可执行此操作！" });
+        return;
+      }
       if (!this.$peisAPI) {
         this.$message.info({ showClose: true, message: "此功能，需要在壳客户端才可运行！" })
         return
@@ -1783,10 +1795,10 @@ export default {
       this.printing = true
       try {
         // lis条码打印 
-        await this.lisPrint('0002', isPreview, toOutShell)
+        if(this.LocalConfig.patientRegister.printGuideLabel.indexOf('lis') > -1) await this.lisPrint('0002', isPreview, toOutShell)
 
         // pacs条码打印 
-        await this.pacsPrint('0004', isPreview, toOutShell)
+        if(this.LocalConfig.patientRegister.printGuideLabel.indexOf('pacs') > -1) await this.pacsPrint('0004', isPreview, toOutShell)
 
       } catch (error) {
         console.log(error)
@@ -1992,11 +2004,11 @@ export default {
         });
 
         let resCharge = await postapi("/api/app/ChargeRequest/Create", body)
-        if(resCharge.code > -1){
+        if (resCharge.code > -1) {
           this.dataTransOpts.refresh.patient_register.S++
         }
       } catch (error) {
-        this.$message.error({showClose:true,message:`${error}`})
+        this.$message.error({ showClose: true, message: `${error}` })
       }
     },
 
diff --git a/src/components/patientRegister/PatientRegisterList.vue b/src/components/patientRegister/PatientRegisterList.vue
index d0b829d..aafdb71 100644
--- a/src/components/patientRegister/PatientRegisterList.vue
+++ b/src/components/patientRegister/PatientRegisterList.vue
@@ -12,8 +12,7 @@
             <el-table-column type="selection" width="40" align="center"></el-table-column>
             <el-table-column v-for="(item, index) in dragCol" :key="index" :type="dragCol[index].type"
               :min-width="dragCol[index].minWidth" :align="dragCol[index].align" :label="item.label"
-              :prop="dragCol[index].prop"
-              :sortable="dragCol[index].type || dragCol[index].prop == 'sn' ? false : true">
+              :prop="dragCol[index].prop" :sortable="dragCol[index].type || dragCol[index].prop == 'sn' ? false : true">
               <template slot-scope="scope" v-if="!(dragCol[index].type)">
                 <div v-if="!dragCol[index].type">
                   <div v-if="dragCol[index].prop == 'sn'">
@@ -258,7 +257,7 @@ import {
   objCopy,
   arrayReduce,
   arrayExistObj,
-  deepCopy,setPrStatusColor
+  deepCopy, setPrStatusColor
 } from "../../utlis/proFunc";
 
 import PatientRegisterEdit from "../../components/patientRegister/PatientRegisterEdit.vue";
@@ -396,7 +395,7 @@ export default {
   },
   methods: {
     ...mapActions(["getCustomerOrgGroup", "getPatientRegisterAbs"]),
-    moment, dddw, deepCopy, checkPagePriv,setPrStatusColor,
+    moment, dddw, deepCopy, checkPagePriv, setPrStatusColor,
 
     // 扩展定义表格行样式
     handleRowClassName({ row, rowIndex }) {
@@ -417,7 +416,7 @@ export default {
       });
     },
 
-    
+
 
 
     refFuncSetData(item, v) {
@@ -426,6 +425,7 @@ export default {
 
     // 打印指引单(isPreview)
     async guidePrint(ReportCode, isPreview) {
+
       if (!this.$peisAPI) {
         this.$message.info({ showClose: true, message: "此功能，需要在壳客户端才可运行！" });
         return;
@@ -456,7 +456,7 @@ export default {
       //选中（取消勾选） end  -------------------------
 
       if (this.multipleSelection.length < 1) {
-        this.$message.info({ showClose: true, message: "请选择要打印指引单的人员记录！" });
+        this.$message.info({ showClose: true, message: "请勾选要打印指引单的人员记录！" });
         return;
       }
 
@@ -488,6 +488,11 @@ export default {
           });
         */
         toOutShell.BusinessCode = this.multipleSelection[0].id
+        if (this.multipleSelection[0].completeFlag == '0') {
+          this.$message.warning({ showClose: true, message: '预登记人员，不可执行此操作！' })
+          return
+        }
+
         this.$peisAPI.printPre(JSON.stringify(toOutShell))
           .then(res => {
             if (JSON.parse(res).code < 0) {
@@ -508,6 +513,10 @@ export default {
           try {
 
             let patientregisterId = this.multipleSelection[i].id
+            if (this.multipleSelection[i].completeFlag == '0'){
+              this.$message.warning({ showClose: true, message: `${this.multipleSelection[i].patientName} 为预登记人员，不可打印指引单` });
+              continue
+            }
             toOutShell.BusinessCode = patientregisterId
             let resPeisAPI = await this.$peisAPI.print(JSON.stringify(toOutShell));
             if (JSON.parse(resPeisAPI).code < 0) continue
@@ -958,35 +967,35 @@ export default {
         items.push({
           label: "发送检验申请",
           onClick: () => {
-            this.lisRequest(row.id);
+            this.lisRequest(row);
           },
         })
       if (checkPagePriv(this.pagePriv.privs, '预览检验条码') && row.completeFlag != '0')
         items.push({
           label: "预览检验条码",
           onClick: () => {
-            this.lisPrint(row.id, "0002", true);
+            this.lisPrint(row, "0002", true);
           },
         })
       if (checkPagePriv(this.pagePriv.privs, '打印检验条码') && row.completeFlag != '0')
         items.push({
           label: "打印检验条码",
           onClick: () => {
-            this.lisPrint(row.id, "0002", false);
+            this.lisPrint(row, "0002", false);
           },
         })
       if (checkPagePriv(this.pagePriv.privs, '预览Pacs条码') && row.completeFlag != '0')
         items.push({
           label: "预览Pacs条码",
           onClick: () => {
-            this.pacsPrint(row.id, "0004", true);
+            this.pacsPrint(row, "0004", true);
           },
         })
       if (checkPagePriv(this.pagePriv.privs, '打印Pacs条码') && row.completeFlag != '0')
         items.push({
           label: "打印Pacs条码",
           onClick: () => {
-            this.pacsPrint(row.id, "0004", false);
+            this.pacsPrint(row, "0004", false);
           },
         })
       items.push({ label: "----------------", })
@@ -1052,16 +1061,16 @@ export default {
     },
 
     //检验申请
-    async lisRequest(prId) {
+    async lisRequest(row) {
       let isPrintLisRequest = false;
       let res = null;
-      if (prId.length < 1) {
-        this.$message.info({ showClose: true, message: "人员信息尚未保存，不可执行此操作！" });
+      if (row.completeFlag == '0') {
+        this.$message.info({ showClose: true, message: "预登记人员，不可执行此操作！" });
         return;
       }
 
       try {
-        res = await postapi(`/api/app/lisrequest/setlisrequest?PatientRegisterId=${prId}`);
+        res = await postapi(`/api/app/lisrequest/setlisrequest?PatientRegisterId=${row.id}`);
         // console.log(`/ api / app / lisrequest / setlisrequest ? PatientRegisterId = ${ prId }`,res);
       } catch (error) {
         return;
@@ -1090,11 +1099,16 @@ export default {
         return;
       }
       //打印检验申请单
-      this.lisPrint(prId, "0003", false);
+      this.lisPrint(row, "0003", false);
     },
 
     //检验条码打印
-    lisPrint(prId, ReportCode, isPreview) {
+    lisPrint(row, ReportCode, isPreview) {
+      if (row.completeFlag == '0') {
+        this.$message.info({ showClose: true, message: "预登记人员，不可执行此操作！" });
+        return;
+      }
+
       if (!this.$peisAPI) {
         this.$message.info({ showClose: true, message: "此功能，需要在壳客户端才可运行！" });
         return;
@@ -1113,7 +1127,7 @@ export default {
           { Name: "printer", Value: user },
           { Name: "hisLog", Value: "pic/hisLog.jpg" },
         ],
-        BusinessCode: prId
+        BusinessCode: row.id
       };
 
       // console.log('this.$peisAPI.print', toOutShell)
@@ -1189,7 +1203,7 @@ export default {
             } else {
               return postapi("/api/app/lisrequest/updatelisrequestisprint", {
                 operateType: 1,
-                patientRegisterId: prId,
+                patientRegisterId: row.id,
               });
             }
           })
@@ -1206,7 +1220,11 @@ export default {
     },
 
     //pacs条码打印
-    pacsPrint(prId, ReportCode, isPreview) {
+    pacsPrint(row, ReportCode, isPreview) {
+      if (row.completeFlag == '0') {
+        this.$message.info({ showClose: true, message: "预登记人员，不可执行此操作！" });
+        return;
+      }
       if (!this.$peisAPI) {
         this.$message.info({ showClose: true, message: "此功能，需要在壳客户端才可运行！" });
         return;
@@ -1295,7 +1313,7 @@ export default {
             } else {
               return postapi("/api/app/lisrequest/updatelisrequestisprint", {
                 operateType: 1,
-                patientRegisterId: prId,
+                patientRegisterId: row.id,
               });
             }
           })