diff --git a/src/components/common/LocalConfig.vue b/src/components/common/LocalConfig.vue
index 2b8c756..e8f9b7b 100644
--- a/src/components/common/LocalConfig.vue
+++ b/src/components/common/LocalConfig.vue
@@ -48,6 +48,13 @@
               </el-form-item>              
             </el-col>
           </el-row>
+          <el-row>
+            <el-col :span="24">
+              <el-form-item label="启用人名查重">
+                <el-checkbox v-model="LocalConfig.patientRegister.findPatientByName" size="small" />
+              </el-form-item>
+            </el-col>
+          </el-row>
         </el-form>
       </el-tab-pane>
       <el-tab-pane label="检验条码">
@@ -99,6 +106,7 @@ export default {
           edit: 'standard', //standard/qztl 人员登记组件版本
           editHeight: 0,  // 相较与标准版，选组合项目组件，减少高度
           immediateToHisCharge: true,  // 人员登记保存后，立即发送收费申请
+          findPatientByName:true, // 人员登记，启有人名查询
           printGuideLabel: ["guide", "pacs", "lis"], // 保存后打印指引单与条码
         },
         lisLabel: { // 检验条码打印
diff --git a/src/components/occDisease/OccDisease.vue b/src/components/occDisease/OccDisease.vue
index 7ce9ed4..3daeeb4 100644
--- a/src/components/occDisease/OccDisease.vue
+++ b/src/components/occDisease/OccDisease.vue
@@ -2,29 +2,31 @@
   <div style="margin-top: -15px;">
     <el-tabs v-model="tabChoosed" style="height: 510px;">
       <el-tab-pane label="基本信息" name="1">
-        <OccDiseaseBase :patientRegisterId="patientRegisterId" />
+        <OccDiseaseBase />
       </el-tab-pane>
 
       <el-tab-pane label="毒害因素" name="2">
-        <OccDiseasePoison :patientRegisterId="patientRegisterId" />
+        <OccDiseasePoison />
       </el-tab-pane>
 
       <el-tab-pane label="职业史" name="3">
-        <OccDiseaseHistory :patientRegisterId="patientRegisterId" />
+        <OccDiseaseHistory />
       </el-tab-pane>
       <el-tab-pane label="症状" name="4">
-        <OccDiseaseSymptom :patientRegisterId="patientRegisterId" />
+        <OccDiseaseSymptom />
       </el-tab-pane>
       <el-tab-pane label="体征" name="5">
         <CheckDetails :patientRegisterId="patientRegisterId" :tabChoosed="'2'" />
       </el-tab-pane>
       <el-tab-pane label="检查结论" name="6">
-        <OccDiseaseConclusion :patientRegisterId="patientRegisterId" />
+        <OccDiseaseConclusion />
       </el-tab-pane>
     </el-tabs>
     <div style="display: flex;justify-content: space-between;">
       <div></div>
       <div>
+        <el-button class="commonbutton" @click="btnTest">测试</el-button>
+        <el-button class="deletebutton" @click="btnDel">删除</el-button>
         <el-button class="commonbutton" @click="btnOk">确定</el-button>
         <el-button class="commonbutton" @click="btnClose">关闭</el-button>
       </div>
@@ -34,6 +36,7 @@
 <script>
 import { mapState } from "vuex";
 import { getapi, postapi, putapi, deletapi } from "@/api/api";
+import { deepCopy } from "../../utlis/proFunc";
 
 import OccDiseaseBase from "./OccDiseaseBase.vue";
 import OccDiseasePoison from "./OccDiseasePoison.vue";
@@ -59,12 +62,7 @@ export default {
   },
 
   created() {
-    if (this.$route.query.patient_register) {
-      this.dataTransOpts.tableS.patient_register = this.$route.query.patient_register
-    } else {
-      this.dataTransOpts.tableS.patient_register = { id: '', patientRegisterNo: '' }
-      this.dataTransOpts.tableS.register_check = { id: '' }
-    }
+
   },
 
   //挂载完成
@@ -87,8 +85,8 @@ export default {
   methods: {
 
     //数据初始化
-    dictInit() {
-      
+    dictInit() {     
+
       //职业病检查类别
       postapi("/api/app/Poison/GetPoisonWithTypeList").then((res) => {
         if (res.code > -1) {
@@ -106,15 +104,53 @@ export default {
           });
         }
       });
+
     },
 
     initOccDiseaseData() {
-
+      let patientRegisterId = this.dataTransOpts.tableS.patient_register.id
+      postapi('/api/app/OccupationalDisease/GetOccupationalDiseaseWithDetailByPatientRegisterId',{patientRegisterId})
+      .then(res => {
+        if(res.code > -1){
+          this.dataTransOpts.tableS.patient_occupational_disease = deepCopy(res.data['patientOccupationalDisease'])
+          this.dataTransOpts.tableM.patient_poison = deepCopy(res.data['patientPoisonDtos'])
+          this.dataTransOpts.tableM.patient_occupational_history = deepCopy(res.data['patientOccupationalHistoryDtos'])
+          this.dataTransOpts.tableM.patient_symptom = deepCopy(res.data['patientSymptomDtos'])
+        }
+      })
       this.dataTransOpts.refresh.sumDoctor.M++  // 刷新体征
     },
 
+    btnTest(){
+      console.log('this.dataTransOpts.tableS.patient_occupational_disease',this.dataTransOpts.tableS.patient_occupational_disease)
+      console.log('this.dataTransOpts.tableM.patient_poison',this.dataTransOpts.tableM.patient_poison)
+      console.log('this.dataTransOpts.tableM.patient_occupational_history',this.dataTransOpts.tableM.patient_occupational_history)
+      console.log('this.dataTransOpts.tableM.patient_symptom',this.dataTransOpts.tableM.patient_symptom)
+    },
+
+    btnDel(){
+
+    },
+
     // 点击确定
     btnOk() {
+      let body = {
+        patientRegisterId: this.dataTransOpts.tableS.patient_register.id,
+        patientOccupationalDisease: deepCopy(this.dataTransOpts.tableS.patient_occupational_disease),
+        patientPoisons: deepCopy(this.dataTransOpts.tableM.patient_poison),
+        patientOccupationalHistorys: deepCopy(this.dataTransOpts.tableM.patient_occupational_history),
+        patientSymptoms: deepCopy(this.dataTransOpts.tableM.patient_symptom)
+      }
+
+      postapi('/api/app/OccupationalDisease/CreateOccupationalDiseaseWithDetail', body).then(res => {
+        if (res.code > -1) {          
+          this.$message.success({ showClose: true, message: "操作成功！" })
+          this.dataTransOpts.plus.OccDisease++
+        } else {
+          this.$message.warning({ showClose: true, message: res.message })
+        }
+      })
+
 
     },
 
diff --git a/src/components/occDisease/OccDiseaseBase.vue b/src/components/occDisease/OccDiseaseBase.vue
index 2dd6dd3..b1ec21a 100644
--- a/src/components/occDisease/OccDiseaseBase.vue
+++ b/src/components/occDisease/OccDiseaseBase.vue
@@ -1,34 +1,34 @@
 <template>
   <div style="height: 468px;overflow-y: auto;">
-    <el-form :model="form" ref="form" label-width="80px" :rules="rules">
+    <el-form :model="dataTransOpts.tableS.patient_occupational_disease" ref="form" label-width="80px" >
       <el-row>
         <el-col :span="6">
           <el-form-item prop="ocCheckTypeId" label="检查类别">
-            <el-select v-model="form.ocCheckTypeId" size="small">
+            <el-select v-model="dataTransOpts.tableS.patient_occupational_disease.ocCheckTypeId" size="small">
               <el-option v-for="item in dict.occCheckType" :key="item.value" :label="item.displayName" :value="item.id" />
             </el-select>
           </el-form-item>
         </el-col>
         <el-col :span="6">
           <el-form-item label="工种">
-            <el-input v-model="form.jobType" size="small"></el-input>
+            <el-input v-model="dataTransOpts.tableS.patient_occupational_disease.jobType" size="small"></el-input>
           </el-form-item>
         </el-col>
         <el-col :span="6">
           <el-form-item prop="totalWorkTime" label="总工龄">
-            <el-input v-model="form.totalWorkTime" size="small"></el-input>
+            <el-input v-model="dataTransOpts.tableS.patient_occupational_disease.totalWorkTime" size="small"></el-input>
           </el-form-item>
         </el-col>
         <el-col :span="6">
           <el-form-item prop="poisonWorkTime" label="接害工龄">
-            <el-input v-model="form.poisonWorkTime" size="small"></el-input>
+            <el-input v-model="dataTransOpts.tableS.patient_occupational_disease.poisonWorkTime" size="small"></el-input>
           </el-form-item>
         </el-col>
       </el-row>
       <el-row>
         <el-col :span="24">
           <el-form-item label="一、既往病史：" label-width="105px">
-            <el-input type="textarea" v-model="form.previousHistory" size="small"
+            <el-input type="textarea" v-model="dataTransOpts.tableS.patient_occupational_disease.previousHistory" size="small"
               :autosize="{ minRows: 1, maxRows: 10 }"></el-input>
           </el-form-item>
         </el-col>
@@ -36,12 +36,12 @@
       <el-row>
         <el-col :span="16">
           <el-form-item label="二、急慢性职业病史：病名" label-width="175px">
-            <el-input v-model="form.occupationalDisease" size="small"></el-input>
+            <el-input v-model="dataTransOpts.tableS.patient_occupational_disease.occupationalDisease" size="small"></el-input>
           </el-form-item> 
         </el-col>
         <el-col :span="8">
           <el-form-item prop="diagnosisDate" label="诊断日期">
-            <el-date-picker v-model="form.diagnosisDate" type="date" format="yyyy-MM-dd" value-format="yyyy-MM-dd"
+            <el-date-picker v-model="dataTransOpts.tableS.patient_occupational_disease.diagnosisDate" type="date" format="yyyy-MM-dd" value-format="yyyy-MM-dd"
               placeholder="诊断日期" size="small" style="width: 100%" />
           </el-form-item>
         </el-col>
@@ -49,33 +49,33 @@
       <el-row>
         <el-col :span="16">
           <el-form-item prop="diagnosisHospital" label="诊断单位" label-width="175px">
-            <el-input v-model="form.diagnosisHospital" size="small"></el-input>
+            <el-input v-model="dataTransOpts.tableS.patient_occupational_disease.diagnosisHospital" size="small"></el-input>
           </el-form-item>
         </el-col>
         <el-col :span="8">
           <el-form-item prop="recovery" label="是否痊愈">
-            <el-checkbox v-model="form.recovery" true-label="Y" false-label="N"></el-checkbox>
+            <el-checkbox v-model="dataTransOpts.tableS.patient_occupational_disease.recovery" true-label="Y" false-label="N"></el-checkbox>
           </el-form-item>
         </el-col>
       </el-row>      
       <el-row>
         <el-col :span="8">
           <el-form-item label="三、月经史： 初经" label-width="120px">
-            <el-input type="number" v-model="form.firstMenstruation" size="small">
+            <el-input type="number" v-model="dataTransOpts.tableS.patient_occupational_disease.firstMenstruation" size="small">
               <template slot="append">岁</template>
             </el-input>
           </el-form-item>
         </el-col>
         <el-col :span="8">
           <el-form-item prop="menstruationTimeLength" label="经期">
-            <el-input type="number" v-model="form.menstruationTimeLength" size="small">
+            <el-input type="number" v-model="dataTransOpts.tableS.patient_occupational_disease.menstruationTimeLength" size="small">
               <template slot="append">天</template>
             </el-input>
           </el-form-item>
         </el-col>
         <el-col :span="8">
           <el-form-item prop="menstruationCycle" label="周期">
-            <el-input type="number" v-model="form.menstruationCycle" size="small">
+            <el-input type="number" v-model="dataTransOpts.tableS.patient_occupational_disease.menstruationCycle" size="small">
               <template slot="append">天</template>
             </el-input>
           </el-form-item>
@@ -84,19 +84,19 @@
       <el-row>
         <el-col :span="8">
           <el-form-item label="是否停经" label-width="120px">
-            <el-checkbox v-model="form.menstruationFlag" true-label="Y" false-label="N"></el-checkbox>
+            <el-checkbox v-model="dataTransOpts.tableS.patient_occupational_disease.menstruationFlag" true-label="Y" false-label="N"></el-checkbox>
           </el-form-item>
         </el-col>
         <el-col :span="7">
           <el-form-item prop="menstruationEndAge" label="停经年龄">
-            <el-input type="number" v-model="form.menstruationEndAge" size="small">
+            <el-input type="number" v-model="dataTransOpts.tableS.patient_occupational_disease.menstruationEndAge" size="small">
               <template slot="append">岁</template>
             </el-input>
           </el-form-item>
         </el-col>
         <el-col :span="9">
           <el-form-item prop="lastMenstrualPeriodDate" label="末次月经日期" label-width="120px">
-            <el-date-picker v-model="form.lastMenstrualPeriodDate" type="date" format="yyyy-MM-dd" value-format="yyyy-MM-dd"
+            <el-date-picker v-model="dataTransOpts.tableS.patient_occupational_disease.lastMenstrualPeriodDate" type="date" format="yyyy-MM-dd" value-format="yyyy-MM-dd"
               placeholder="末次月经日期" size="small" style="width: 100%" />
           </el-form-item>
         </el-col>
@@ -104,35 +104,35 @@
       <el-row>
         <el-col :span="8">
           <el-form-item label="四、生育史：现有子女" label-width="145px">
-            <el-input type="number" v-model="form.childrenNum" size="small">
+            <el-input type="number" v-model="dataTransOpts.tableS.patient_occupational_disease.childrenNum" size="small">
               <template slot="append">人</template>
             </el-input>
           </el-form-item>
         </el-col>
         <el-col :span="4">
           <el-form-item label="流产" label-width="50px">
-            <el-input type="number" v-model="form.abortionTimes" size="small">
+            <el-input type="number" v-model="dataTransOpts.tableS.patient_occupational_disease.abortionTimes" size="small">
               <template slot="append">次</template>
             </el-input>
           </el-form-item>
         </el-col>
         <el-col :span="4">
           <el-form-item label="早产" label-width="50px">
-            <el-input type="number" v-model="form.prematureBirthTimes" size="small">
+            <el-input type="number" v-model="dataTransOpts.tableS.patient_occupational_disease.prematureBirthTimes" size="small">
               <template slot="append">次</template>
             </el-input>
           </el-form-item>
         </el-col>      
         <el-col :span="4">
           <el-form-item label="死产" label-width="50px">
-            <el-input type="number" v-model="form.stillbirthTimes" size="small">
+            <el-input type="number" v-model="dataTransOpts.tableS.patient_occupational_disease.stillbirthTimes" size="small">
               <template slot="append">人</template>
             </el-input>
           </el-form-item>
         </el-col>
         <el-col :span="4">
           <el-form-item label="异常胎" label-width="60px">
-            <el-input type="number" v-model="form.abnormalTimes" size="small">
+            <el-input type="number" v-model="dataTransOpts.tableS.patient_occupational_disease.abnormalTimes" size="small">
               <template slot="append">次</template>
             </el-input>
           </el-form-item>
@@ -141,23 +141,23 @@
       <el-row>
         <el-col :span="12">
           <el-form-item label="五、烟酒史：吸烟" label-width="115px">
-            <el-radio-group v-model="form.smokeFlag">
-              <el-radio :label="3">不吸</el-radio>
-              <el-radio :label="6">偶尔吸</el-radio>
-              <el-radio :label="9">经常吸</el-radio>
+            <el-radio-group v-model="dataTransOpts.tableS.patient_occupational_disease.smokeFlag">
+              <el-radio :label="'0'">不吸</el-radio>
+              <el-radio :label="'1'">偶尔吸</el-radio>
+              <el-radio :label="'2'">经常吸</el-radio>
             </el-radio-group>
           </el-form-item>
         </el-col>
         <el-col :span="6">
           <el-form-item label="频次">
-            <el-input type="number" v-model="form.smokeNum" size="small">
+            <el-input type="number" v-model="dataTransOpts.tableS.patient_occupational_disease.smokeNum" size="small">
               <template slot="append">支/天</template>
             </el-input>
           </el-form-item>
         </el-col>
         <el-col :span="6">
           <el-form-item label="烟龄">
-            <el-input type="number" v-model="form.smokeYears" size="small">
+            <el-input type="number" v-model="dataTransOpts.tableS.patient_occupational_disease.smokeYears" size="small">
               <template slot="append">年</template>
             </el-input>
           </el-form-item>
@@ -166,23 +166,23 @@
       <el-row>
         <el-col :span="12">
           <el-form-item label="喝酒" label-width="115px">
-            <el-radio-group v-model="form.drinkFlag">
-              <el-radio :label="3">不喝</el-radio>
-              <el-radio :label="6">偶尔喝</el-radio>
-              <el-radio :label="9">经常喝</el-radio>
+            <el-radio-group v-model="dataTransOpts.tableS.patient_occupational_disease.drinkFlag">
+              <el-radio :label="'0'">不喝</el-radio>
+              <el-radio :label="'1'">偶尔喝</el-radio>
+              <el-radio :label="'2'">经常喝</el-radio>
             </el-radio-group>
           </el-form-item>
         </el-col>
         <el-col :span="6">
           <el-form-item label="频次">
-            <el-input type="number" v-model="form.drinkNum" size="small">
+            <el-input type="number" v-model="dataTransOpts.tableS.patient_occupational_disease.drinkNum" size="small">
               <template slot="append">ml/次</template>
             </el-input>
           </el-form-item>
         </el-col>
         <el-col :span="6">
           <el-form-item label="酒龄">
-            <el-input type="number" v-model="form.drinkYears" size="small">
+            <el-input type="number" v-model="dataTransOpts.tableS.patient_occupational_disease.drinkYears" size="small">
               <template slot="append">年</template>
             </el-input>
           </el-form-item>
@@ -191,7 +191,7 @@
       <el-row>
         <el-col :span="24">
           <el-form-item label="六、其他：" label-width="75px">
-            <el-input type="textarea" v-model="form.other" size="small"
+            <el-input type="textarea" v-model="dataTransOpts.tableS.patient_occupational_disease.other" size="small"
               :autosize="{ minRows: 1, maxRows: 10 }"></el-input>
           </el-form-item>
         </el-col>
@@ -199,22 +199,22 @@
       <el-row>
         <el-col :span="5">
           <el-form-item label="创建者">
-            <el-input v-model="form.creatorName" disabled size="small"></el-input>
+            <el-input v-model="dataTransOpts.tableS.patient_occupational_disease.creatorName" disabled size="small"></el-input>
           </el-form-item>
         </el-col>
         <el-col :span="7">
           <el-form-item label="创建时间" label-width="80px" style="margin-left:-10px;">
-            <el-date-picker v-model="form.creationTime" type="datetime" size="small" style="width: 100%" disabled />
+            <el-date-picker v-model="dataTransOpts.tableS.patient_occupational_disease.creationTime" type="datetime" size="small" style="width: 100%" disabled />
           </el-form-item>
         </el-col>
         <el-col :span="5">
           <el-form-item label="修改者">
-            <el-input v-model="form.creatorName" disabled size="small"></el-input>
+            <el-input v-model="dataTransOpts.tableS.patient_occupational_disease.creatorName" disabled size="small"></el-input>
           </el-form-item>
         </el-col>
         <el-col :span="7">
           <el-form-item label="修改时间" label-width="80px" style="margin-left:-10px;">
-            <el-date-picker v-model="form.lastModificationTime" type="datetime" size="small" style="width: 100%"
+            <el-date-picker v-model="dataTransOpts.tableS.patient_occupational_disease.lastModificationTime" type="datetime" size="small" style="width: 100%"
               disabled />
           </el-form-item>
         </el-col>
@@ -260,30 +260,14 @@ export default {
         prematureBirthTimes:'', // 早产
         stillbirthTimes:'', // 死产
         abnormalTimes:'', // 异常胎
-        smokeFlag:'', // 吸烟
+        smokeFlag:'0', // 吸烟
         smokeNum:'', // 吸烟频次
         smokeYears:'', //烟龄
-        drinkFlag:'', // 喝酒
+        drinkFlag:'0', // 喝酒
         drinkNum:'', // 喝酒频次
         drinkYears:'', // 酒龄
         other:'', // 其他
       },
-
-      formInit: {},
-      contactMethodList: [],  //联系方式（可修改）
-
-
-      Methodtypes: [
-        //{ value: '',label: '所有订单状态' },
-        { value: "0", label: "电话" },
-        { value: "1", label: "邮箱" },
-      ],
-
-      rules: {
-        displayName: [
-          { required: true, message: "请输入名称", trigger: "blur" },
-        ],
-      },
     };
   },
 
@@ -291,7 +275,7 @@ export default {
     //获取用户当前页面的权限
     let userPriv = window.sessionStorage.getItem('userPriv')
     if (userPriv) this.pagePriv.privs = deepCopy(getPagePriv(this.pagePriv.routeUrlorPageName))
-    this.formInit = deepCopy(this.form)
+    
   },
 
   //挂载完成
diff --git a/src/components/occDisease/OccDiseasePoison.vue b/src/components/occDisease/OccDiseasePoison.vue
index fab02b2..71e20dc 100644
--- a/src/components/occDisease/OccDiseasePoison.vue
+++ b/src/components/occDisease/OccDiseasePoison.vue
@@ -73,7 +73,9 @@ export default {
 
   //挂载完成
   mounted() {
-    // this.postion = deepCopy(this.dict.postion)
+    this.$nextTick(() => {
+      this.postion = deepCopy(this.dict.postion)
+    })   
   },
 
   computed: {
diff --git a/src/components/patientRegister/PatientLis.vue b/src/components/patientRegister/PatientLis.vue
index f17f684..0114c7c 100644
--- a/src/components/patientRegister/PatientLis.vue
+++ b/src/components/patientRegister/PatientLis.vue
@@ -359,6 +359,7 @@ export default {
         this.patientRegister.query.startDate &&
         this.patientRegister.query.endDate
       ) {
+        body.dateType = this.patientRegister.query.dateType
         body.startDate = moment(this.patientRegister.query.startDate).format("yyyy-MM-DD");
         body.endDate = moment(this.patientRegister.query.endDate).format("yyyy-MM-DD");
         if (body.startDate > body.endDate) {
diff --git a/src/components/patientRegister/PatientRegisterEdit.vue b/src/components/patientRegister/PatientRegisterEdit.vue
index d82c86f..0838348 100644
--- a/src/components/patientRegister/PatientRegisterEdit.vue
+++ b/src/components/patientRegister/PatientRegisterEdit.vue
@@ -61,7 +61,7 @@
             <el-row>
               <el-col :span="5">
                 <el-form-item label="姓名" prop="patientName">
-                  <el-input id="patientName" v-model="form.patientName" @change="Query(form.patientName)" size="small"
+                  <el-input id="patientName" v-model="form.patientName" @change="changePatientName" size="small"
                     autocomplete="off"></el-input>
                 </el-form-item>
               </el-col>
@@ -330,47 +330,47 @@
               </el-col>
               <el-col :span="2">
                 <el-form-item label="普速">
-                  <el-checkbox v-model="form.qztlIsCw" true-label="Y" false-label="N" disabled/>
+                  <el-checkbox v-model="form.qztlIsCw" true-label="Y" false-label="N" disabled />
                 </el-form-item>
               </el-col>
               <el-col :span="2">
                 <el-form-item label="从业">
-                  <el-checkbox v-model="form.qztlIsCy" true-label="Y" false-label="N" disabled/>
+                  <el-checkbox v-model="form.qztlIsCy" true-label="Y" false-label="N" disabled />
                 </el-form-item>
               </el-col>
               <el-col :span="2">
                 <el-form-item label="高铁">
-                  <el-checkbox v-model="form.qztlIsGt" true-label="Y" false-label="N" disabled/>
+                  <el-checkbox v-model="form.qztlIsGt" true-label="Y" false-label="N" disabled />
                 </el-form-item>
               </el-col>
               <el-col :span="2">
                 <el-form-item label="行车">
-                  <el-checkbox v-model="form.qztlIsMain" true-label="Y" false-label="N" disabled/>
+                  <el-checkbox v-model="form.qztlIsMain" true-label="Y" false-label="N" disabled />
                 </el-form-item>
               </el-col>
               <el-col :span="2">
                 <el-form-item label="职害">
-                  <el-checkbox v-model="form.qztlIsWh" true-label="Y" false-label="N" disabled/>
+                  <el-checkbox v-model="form.qztlIsWh" true-label="Y" false-label="N" disabled />
                 </el-form-item>
               </el-col>
               <el-col :span="2">
                 <el-form-item label="复检">
-                  <el-checkbox v-model="form.qztlIsFj" true-label="Y" false-label="N" disabled/>
+                  <el-checkbox v-model="form.qztlIsFj" true-label="Y" false-label="N" disabled />
                 </el-form-item>
               </el-col>
               <el-col :span="2">
                 <el-form-item label="导入">
-                  <el-checkbox v-model="form.isQztlImport" true-label="Y" false-label="N" disabled/>
+                  <el-checkbox v-model="form.isQztlImport" true-label="Y" false-label="N" disabled />
                 </el-form-item>
               </el-col>
               <el-col :span="2">
                 <el-form-item label="上传">
-                  <el-checkbox v-model="form.uploadQztlFlag" true-label="Y" false-label="N" disabled/>
+                  <el-checkbox v-model="form.uploadQztlFlag" true-label="Y" false-label="N" disabled />
                 </el-form-item>
               </el-col>
               <el-col :span="4">
                 <el-form-item label="计划" prop="planuserid">
-                  <el-input v-model="form.planuserid" size="small" disabled/>
+                  <el-input v-model="form.planuserid" size="small" disabled />
                 </el-form-item>
               </el-col>
             </el-row>
@@ -596,7 +596,7 @@ import { getTreeNode } from "../../utlis/tree"
 import {
   getPagePriv, checkPagePriv, objCopy, setNull, dddw, checkIDCode, parseID,
   birthdayToAge, ageToBirthday, deepCopy, arrayFilter, arrayReduce, parsIcCardtoLocal,
-  arrayExistObj
+  arrayExistObj, isValidMobileNumber
 } from "../../utlis/proFunc";
 import { getTreePids } from "../../utlis/tree";
 import { photoParse, savePeoplePhoto, } from "../../utlis/proApi";
@@ -623,8 +623,14 @@ export default {
   // isDoctor: '0:标准人员登记/1:医生诊台登记(可修改单位)' 
   props: ['isDoctor', 'patientRegisterId', 'editTimes', 'refreshRegister', 'refFuncSetData'],
   data() {
+    var validateMobileTelephone = (rule, value, callback) => {
+      if (value) {
+        if (!isValidMobileNumber(value)) callback(new Error('请填写正确的手机号！'));
+      } else {
+        callback();
+      }
+    };
     return {
-
       pagePriv: {
         routeUrlorPageName: 'PatientRegisterEdit', //当前页面归属路由或归属页面权限名称
         privs: [] // 页面权限
@@ -634,6 +640,7 @@ export default {
           editMode: 'standard', //standard/qztl 人员登记组件版本
           editHeight: 0,  // 相较与标准版，选组合项目组件，减少高度
           immediateToHisCharge: true,  // 人员登记保存后，立即发送收费申请
+          findPatientByName: true, // 人员登记，启有人名查询
           printGuideLabel: ["guide", "pacs", "lis"], // 保存后打印指引单与条码
         },
       },
@@ -732,6 +739,9 @@ export default {
         medicalCenterId: [
           { required: true, message: "请填写体检中心", trigger: "blur" },
         ],
+        mobileTelephone: [
+          { validator: validateMobileTelephone, trigger: 'blur' }
+        ],
       },
 
       dialogVisible: false,
@@ -761,7 +771,7 @@ export default {
       dialogOrg: false,
 
       printing: false, // 是否打印中，控制一次只能有一个任务
-      completeFlag:'0', // 默认预登记，首次正式登记或者预登记转正式登记，提示打印条码与指引单
+      completeFlag: '0', // 默认预登记，首次正式登记或者预登记转正式登记，提示打印条码与指引单
     };
   },
 
@@ -775,7 +785,16 @@ export default {
       if (LocalConfig && LocalConfig.patientRegister) {
         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.immediateToHisCharge) {
+          this.LocalConfig.patientRegister.immediateToHisCharge = true
+        } else {
+          this.LocalConfig.patientRegister.immediateToHisCharge = false
+        }
+        if (LocalConfig.patientRegister.findPatientByName) {
+          this.LocalConfig.patientRegister.findPatientByName = true
+        } else {
+          this.LocalConfig.patientRegister.findPatientByName = false
+        }
         if (LocalConfig.patientRegister.printGuideLabel) this.LocalConfig.patientRegister.printGuideLabel = deepCopy(LocalConfig.patientRegister.printGuideLabel)
       }
     } catch (error) {
@@ -1275,6 +1294,13 @@ export default {
       }
     },
 
+    // 输入名字时，查重
+    changePatientName() {
+      console.log('this.LocalConfig.patientRegister.findPatientByName', this.LocalConfig.patientRegister.findPatientByName)
+      if (this.LocalConfig.patientRegister.findPatientByName) {
+        this.Query(this.form.patientName)
+      }
+    },
     // //分组改变时触发
     changeCustomerOrgGroupId() {
       this.prAsbOpraOpts.prAsbGroup++
@@ -1392,7 +1418,7 @@ export default {
 
       let body = deepCopy(this.form);
       // // console.log('this.form',this.form)
-      console.log('body',this.form,body)
+      console.log('body', this.form, body)
       if (this.form.birthDate) {
         try {
           body.birthDate = moment(new Date(this.form.birthDate)).format("yyyy-MM-DD")
@@ -1508,17 +1534,17 @@ export default {
                     type: "warning",
                   })
                     .then(async () => {
-                      try {      
+                      try {
 
                         await this.labelPrint(false)  // 先打条码，这样指引单上才有条码数据
 
-                        if(this.LocalConfig.patientRegister.printGuideLabel.indexOf('guide') > -1) await this.guidePrint('0001', false)
+                        if (this.LocalConfig.patientRegister.printGuideLabel.indexOf('guide') > -1) await this.guidePrint('0001', false)
                       } catch (error) {
                         // this.$message.info({ showClose: true, message: error });
                         console.log(error)
                       }
                     })
-                    .catch((err) => {                      
+                    .catch((err) => {
                       if (err != "cancel") {
                         console.log(err)
                       }
@@ -1659,7 +1685,7 @@ export default {
         this.$message.info({ showClose: true, message: "人员信息尚未保存，不可执行此操作！" });
         return;
       }
-      if(this.form.completeFlag == '0'){
+      if (this.form.completeFlag == '0') {
         this.$message.info({ showClose: true, message: "预登记人员，不可执行此操作！" });
         return;
       }
@@ -1785,7 +1811,7 @@ export default {
         this.$message.info({ showClose: true, message: "人员信息尚未保存，不可执行此操作！" });
         return;
       }
-      if(this.form.completeFlag == '0'){
+      if (this.form.completeFlag == '0') {
         this.$message.info({ showClose: true, message: "预登记人员，不可执行此操作！" });
         return;
       }
@@ -1810,10 +1836,10 @@ export default {
       this.printing = true
       try {
         // lis条码打印 
-        if(this.LocalConfig.patientRegister.printGuideLabel.indexOf('lis') > -1) await this.lisPrint('0002', isPreview, toOutShell)
+        if (this.LocalConfig.patientRegister.printGuideLabel.indexOf('lis') > -1) await this.lisPrint('0002', isPreview, toOutShell)
 
         // pacs条码打印 
-        if(this.LocalConfig.patientRegister.printGuideLabel.indexOf('pacs') > -1) 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)
@@ -1901,7 +1927,7 @@ export default {
         this.$message.info({ showClose: true, message: "人员信息尚未保存，不可执行此操作！" });
         return;
       }
-      if(this.form.completeFlag == '0'){
+      if (this.form.completeFlag == '0') {
         this.$message.info({ showClose: true, message: "预登记人员，不可执行此操作！" });
         return;
       }
@@ -2057,13 +2083,13 @@ export default {
     },
 
     // 显示职业病
-    btnOcc(){
-      if(!this.form.id){
-        this.$message.warning({showClose:true,message:'人员信息尚未保存！'})
+    btnOcc() {
+      if (!this.form.id) {
+        this.$message.warning({ showClose: true, message: '人员信息尚未保存！' })
         return
       }
       this.dataTransOpts.plus.OccDisease++
-      this.dialogWin.OccDisease = true      
+      this.dialogWin.OccDisease = true
     },
 
     //回车替代tab键
diff --git a/src/utlis/proFunc.js b/src/utlis/proFunc.js
index 3e5ebed..934a3cf 100644
--- a/src/utlis/proFunc.js
+++ b/src/utlis/proFunc.js
@@ -429,6 +429,12 @@ function listOrderBy(arr, keyObjs) {
 }
 exports.listOrderBy = listOrderBy;
 
+function isValidMobileNumber(tel) {
+  const regExp = /^1[3-9]\d{9}$/;
+  return regExp.test(tel);
+}
+exports.isValidMobileNumber = isValidMobileNumber;
+