From d4a72a9fc2f8fbac6886b026a6504f32a102f4c0 Mon Sep 17 00:00:00 2001
From: bianyaqi <bianyaqi>
Date: Mon, 10 Apr 2023 17:32:54 +0800
Subject: [PATCH] =?UTF-8?q?'HIS=E5=BC=95=E5=85=A5=E5=88=97=E8=A1=A8?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9=EF=BC=8C=E4=BB=A5=E5=8F=8A=E6=96=B0=E5=A2=9E?=
 =?UTF-8?q?=E6=82=A3=E8=80=85=E7=9B=B8=E5=85=B3=E4=BF=AE=E6=94=B9'?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/filter/index.vue               |   2 +-
 .../optometryManagement/cornea/HIS-add.vue    |   2 +-
 .../optometryManagement/cornea/index.vue      |   2 +-
 .../optometryManagement/dioptric/HIS-add.vue  |  28 +---
 .../optometryManagement/dioptric/index.vue    |  41 +++---
 .../dioptric/patient-add-or-update.vue        |  60 +++++++-
 .../optometryManagement/seeDoctor/index.vue   |   4 +-
 .../outpatientManagement/call/HIS-add.vue     |  31 +---
 .../outpatientManagement/call/index.vue       | 134 ++++++++++--------
 .../call/patient-add-or-update.vue            |  73 +++++++++-
 .../outpatientManagement/treat/HIS-add.vue    |  30 +---
 .../outpatientManagement/treat/index.vue      |  30 ++--
 .../treat/patient-add-or-update.vue           |  85 ++++++++---
 13 files changed, 332 insertions(+), 190 deletions(-)

diff --git a/src/components/filter/index.vue b/src/components/filter/index.vue
index 2db910b..9195e8a 100644
--- a/src/components/filter/index.vue
+++ b/src/components/filter/index.vue
@@ -119,7 +119,7 @@ const dataListDemo = [
     tableName: 'REGISTER_PATIENT', // 表名
     type: '1', // 1患者信息，2数据查询
     fieldList: [
-      { fieldDescription: '病历号', fieldName: 'patientId', fieldType: 'string' },
+      { fieldDescription: '登记号', fieldName: 'patientId', fieldType: 'string' },
       { fieldDescription: '年龄', fieldName: 'age', fieldType: 'number' },
       { fieldDescription: '出生日期', fieldName: 'birthday', fieldType: 'date' },
       { fieldDescription: '地址', fieldName: 'address', fieldType: 'string' }
diff --git a/src/page-subspecialty/views/modules/optometryManagement/cornea/HIS-add.vue b/src/page-subspecialty/views/modules/optometryManagement/cornea/HIS-add.vue
index f19e6ca..8f74826 100644
--- a/src/page-subspecialty/views/modules/optometryManagement/cornea/HIS-add.vue
+++ b/src/page-subspecialty/views/modules/optometryManagement/cornea/HIS-add.vue
@@ -23,7 +23,7 @@
       <template slot="empty">
         <span style="color: #969799;">{{ tableText }}</span>
       </template>
-      <el-table-column property="patId" label="病历号" width="100" />
+      <el-table-column property="patId" label="登记号" width="100" />
       <el-table-column property="patName" label="患者姓名" width="100" />
       <el-table-column property="patIdNumber" label="身份证号" />
       <el-table-column property="patPhone" label="联系电话" />
diff --git a/src/page-subspecialty/views/modules/optometryManagement/cornea/index.vue b/src/page-subspecialty/views/modules/optometryManagement/cornea/index.vue
index 467c6d7..c6a1448 100644
--- a/src/page-subspecialty/views/modules/optometryManagement/cornea/index.vue
+++ b/src/page-subspecialty/views/modules/optometryManagement/cornea/index.vue
@@ -38,7 +38,7 @@
             style="width: 100%"
             @sort-change="dataListSortChangeHandle"
           >
-            <el-table-column prop="patientId" label="病历号 " header-align="center" align="center" />
+            <el-table-column prop="patientId" label="登记号 " header-align="center" align="center" />
             <el-table-column prop="patientName" label="患者姓名" header-align="center" align="center" />
             <el-table-column prop="patientSex" label="患者性别" header-align="center" align="center" />
             <el-table-column label="出生日期" header-align="center" align="center">
diff --git a/src/page-subspecialty/views/modules/optometryManagement/dioptric/HIS-add.vue b/src/page-subspecialty/views/modules/optometryManagement/dioptric/HIS-add.vue
index f9617df..dafdacb 100644
--- a/src/page-subspecialty/views/modules/optometryManagement/dioptric/HIS-add.vue
+++ b/src/page-subspecialty/views/modules/optometryManagement/dioptric/HIS-add.vue
@@ -17,15 +17,6 @@
       <el-form-item prop="patientIdNumber">
         <el-input v-model="dataFormHis.patientIdNumber" placeholder="请输入身份证号" clearable @clear="findHandle(1)" />
       </el-form-item>
-      <el-form-item prop="outpatientDoc">
-        <el-input v-model="dataFormHis.outpatientDoc" placeholder="门诊医师" clearable @clear="findHandle(1)" />
-      </el-form-item>
-      <el-form-item prop="region">
-        <el-select v-model="dataFormHis.region" placeholder="请选择视光医师">
-          <el-option label="区域一" value="shanghai" />
-          <el-option label="区域二" value="beijing" />
-        </el-select>
-      </el-form-item>
       <el-col :span="4">
         <el-form-item>
           <el-button type="primary" @click="findHandle(2)">查询</el-button>
@@ -37,10 +28,12 @@
       <template slot="empty">
         <span style="color: #969799;">{{ tableText }}</span>
       </template>
-      <el-table-column property="patientId" label="病历号" width="100" />
+      <el-table-column property="patientId" label="登记号" width="100" />
       <el-table-column property="patientName" label="患者姓名" width="100" />
       <el-table-column property="patientIdNumber" label="身份证号" />
       <el-table-column property="patientPhone" label="联系电话" />
+      <el-table-column property="zlProject" label="医疗项目" width="240" />
+      <el-table-column property="remark" label="备注" width="240" />
       <!--      <el-table-column property="patientAddress" label="家庭地址" />-->
       <el-table-column label="操作" width="80">
         <template slot-scope="scope">
@@ -128,21 +121,8 @@ export default {
     },
     // 点击引入按钮
     async introduceHandle(scopwRow) {
+      console.log(scopwRow)
       this.$parent.addOrUpdateHandle('', scopwRow, 'HIS引入')
-      // console.log(item)
-      // const { data: res } = await this.$http.get('/patient/doLeadIn', {
-      //   params: {
-      //     patientId: item.patientId,
-      //     platform: this.isSearch
-      //   }
-      // })
-      // if (res.code === 0) {
-      //   this.$message.success('引入成功!')
-      //   this.$parent.getDataListInitial()
-      // } else {
-      //   this.tableText = res.msg
-      //   this.$message.error(res.msg)
-      // }
     }
   }
 }
diff --git a/src/page-subspecialty/views/modules/optometryManagement/dioptric/index.vue b/src/page-subspecialty/views/modules/optometryManagement/dioptric/index.vue
index 36d2f09..b0a7715 100644
--- a/src/page-subspecialty/views/modules/optometryManagement/dioptric/index.vue
+++ b/src/page-subspecialty/views/modules/optometryManagement/dioptric/index.vue
@@ -77,19 +77,19 @@
           <el-table-column prop="mzDoctorName" label="门诊医师" header-align="center" align="center" />
           <el-table-column prop="sgDoctorName" label="视光医师" header-align="center" align="center" />
           <el-table-column prop="createDate" label="就诊时间" header-align="center" align="center" />
-<!--          <el-table-column prop="callSort" label="分诊序号" header-align="center" align="center" />-->
-<!--          <el-table-column prop="callStatus" label="叫号状态" header-align="center" align="center">-->
-<!--            <template slot-scope="scope">-->
-<!--              {{ scope.row.callStatus | callStatus }}-->
-<!--            </template>-->
-<!--          </el-table-column>-->
+          <!--          <el-table-column prop="callSort" label="分诊序号" header-align="center" align="center" />-->
+          <!--          <el-table-column prop="callStatus" label="叫号状态" header-align="center" align="center">-->
+          <!--            <template slot-scope="scope">-->
+          <!--              {{ scope.row.callStatus | callStatus }}-->
+          <!--            </template>-->
+          <!--          </el-table-column>-->
           <el-table-column prop="operation" label="操作" header-align="center" align="center" width="180">
             <template slot-scope="scope">
-<!--              <span-->
-<!--                style="color: #1890ff; padding-right: 8px"-->
-<!--                class="operation-details"-->
-<!--                @click="browseClick(scope.row)"-->
-<!--              >叫号</span>-->
+              <!--              <span-->
+              <!--                style="color: #1890ff; padding-right: 8px"-->
+              <!--                class="operation-details"-->
+              <!--                @click="browseClick(scope.row)"-->
+              <!--              >叫号</span>-->
               <!--                v-if="scope.row.callStatus !== '1' && scope.row.callStatus !== '3' && scope.row.callStatus !== '5'"-->
               <span
                 style="color: #1890ff; padding-right: 8px"
@@ -112,7 +112,7 @@
     <!-- HIS引入弹框 -->
     <his-add v-if="HisAddVisible" ref="HisAddRef" :is-search="'3'" />
     <!-- 详情页 -->
-    <detail-view v-if="detailViewVisible" ref="viewRef" :only-read="onlyRead" :isSearch="'3'" :patient-id="patientId" :patient-id-number="patientIdNumber" @detailViewVisible="detailViewVisible=false" />
+    <detail-view v-if="detailViewVisible" ref="viewRef" :only-read="onlyRead" :is-search="'3'" :patient-id="patientId" :patient-id-number="patientIdNumber" @detailViewVisible="detailViewVisible=false" />
   </div>
 </template>
 <script>
@@ -178,16 +178,25 @@ export default {
       options: [
         {
           value: '0',
-          label: '今日'
+          label: '今天'
         }, {
           value: '1',
-          label: '近三天'
+          label: '昨天'
         }, {
           value: '2',
-          label: '近一周'
+          label: '前天'
         }, {
           value: '3',
+          label: '近三天'
+        }, {
+          value: '4',
+          label: '近一周'
+        }, {
+          value: '5',
           label: '近一个月 '
+        }, {
+          value: '6',
+          label: '近半年 '
         }, {
           value: '',
           label: '全部'
@@ -222,7 +231,7 @@ export default {
         patientId: '',
         beginDate: '',
         endDate: '',
-        searchType: '',
+        searchType: '0',
         patientName: '',
         patientStatus: '',
         patientIdNumber: ''
diff --git a/src/page-subspecialty/views/modules/optometryManagement/dioptric/patient-add-or-update.vue b/src/page-subspecialty/views/modules/optometryManagement/dioptric/patient-add-or-update.vue
index b723850..4dfbe17 100644
--- a/src/page-subspecialty/views/modules/optometryManagement/dioptric/patient-add-or-update.vue
+++ b/src/page-subspecialty/views/modules/optometryManagement/dioptric/patient-add-or-update.vue
@@ -7,7 +7,7 @@
     @close="closeDialog"
   >
     <el-form ref="dataForm" :model="dataForm" :rules="dataRule">
-      <el-form-item label="病历号:" label-width="120px" prop="patientId" class="formItemOne">
+      <el-form-item label="登记号:" label-width="120px" prop="patientId" class="formItemOne">
         <el-input v-model="dataForm.patientId" placeholder="请输入病历号" />
       </el-form-item>
       <el-form-item label="患者姓名:" label-width="120px" prop="patientName">
@@ -38,9 +38,32 @@
       <el-form-item label="家庭地址:" label-width="120px" prop="patientAddress">
         <el-input v-model="dataForm.patientAddress" placeholder="请输入地址" />
       </el-form-item>
-      <el-form-item label="医疗项目:" label-width="120px" prop="patientAddress">
-        <el-input v-model="dataForm.zlProject" placeholder="请输入医疗项目" />
+      <el-form-item label="门诊医师:" prop="outpatientDoc" label-width="120px">
+        <el-select v-model="dataForm.outpatientDoc" placeholder="请选择门诊医师">
+          <el-option label="区域一" value="shanghai" />
+          <el-option label="区域二" value="beijing" />
+        </el-select>
       </el-form-item>
+      <el-form-item label="视光医师" prop="optometryDoc" label-width="120px">
+        <el-select v-model="dataForm.optometryDoc" placeholder="请选择视光医师">
+          <el-option label="区域一" value="shanghai" />
+          <el-option label="区域二" value="beijing" />
+        </el-select>
+      </el-form-item>
+      <el-form-item label="眼别:" prop="zlEye" label-width="120px">
+        <el-select v-model="dataForm.zlEye" placeholder="请选择眼别">
+          <el-option v-for="item in zlEyeList" :key="item.value" :label="item.name" :value="item.value" />
+        </el-select>
+      </el-form-item>
+      <el-select v-model="dataForm.zlProject" placeholder="请选择医疗项目">
+        <el-option
+          v-for="item in projectList"
+          :key="item.itemId"
+          :label="item.itemName"
+          :value="item.itemId
+          "
+        />
+      </el-select>
       <el-form-item label="备注:" label-width="120px" prop="remarks">
         <el-input v-model="dataForm.remark" type="textarea" />
       </el-form-item>
@@ -74,12 +97,21 @@ export default {
         patientPhone: '',
         patientAddress: '',
         patientBirthday: '',
+        outpatientDoc: '', // 门诊医师
+        optometryDoc: '', // 视光医师
+        zlEye: '',
         zlProject: '',
         visitId: '',
         remark: ''
       },
+      zlEyeList: [
+        { name: '左眼', value: 'os' },
+        { name: '右眼', value: 'od' },
+        { name: '双眼', value: 'ou' }
+      ],
       params: {},
-      visitList: []
+      visitList: [],
+      projectList: []
     }
   },
   computed: {
@@ -114,16 +146,34 @@ export default {
   methods: {
     init() {
       this.visible = true
+      this.getDoctorList()
+      this.getProject()
       this.$nextTick(() => {
         this.$refs.dataForm.resetFields() // 重置表单
         // this.getVisitList() // 获取随访列表
         if (this.params.patientIdNumber && this.dataForm.title !== 'HIS引入') {
-          this.getInfo()
+          this.dataForm = {
+            title: this.dataForm.title,
+            ...this.params
+          }
         } else if (this.dataForm.title === 'HIS引入') {
           this.getHisInfo()
         }
       })
     },
+    // 获取医师列表
+    getDoctorList() {
+      this.$http.get('/sys/user').then(data => {
+        this.doctorList = data.data.data
+        this.dataForm.optometryDoc = JSON.parse(window.localStorage.getItem('qg-userData')).employeeId
+      })
+    },
+    // 获取项目列表
+    getProject() {
+      this.$http.post('/patient/getZlItemDict').then(data => {
+        this.projectList = data.data.data
+      })
+    },
     // 获取信息
     getInfo() {
       this.$http.get(`/patient/manage/${this.params.patientCentreId}/${this.params.patientIdNumber}`).then(({ data: res }) => {
diff --git a/src/page-subspecialty/views/modules/optometryManagement/seeDoctor/index.vue b/src/page-subspecialty/views/modules/optometryManagement/seeDoctor/index.vue
index d174f3a..780a525 100644
--- a/src/page-subspecialty/views/modules/optometryManagement/seeDoctor/index.vue
+++ b/src/page-subspecialty/views/modules/optometryManagement/seeDoctor/index.vue
@@ -34,7 +34,7 @@
           <review :patient-id="patientId" />
         </el-tab-pane>
         <el-tab-pane label="历史档案" name="history">
-          <history-file :patientId="patientId" />
+          <history-file :patient-id="patientId" />
         </el-tab-pane>
         <el-tab-pane label="RGP" name="RGP">
           <ok-lens-rgp ref="okLensRgp" :patient-id="patientId" :doctor-list="doctorList" tab-title="RGP" />
@@ -77,7 +77,7 @@ export default {
   watch: {
     patientInfoObj(val) {
       this.patientInfo = [{
-        name: '病历号',
+        name: '登记号',
         info: val.patientId
       },
       {
diff --git a/src/page-subspecialty/views/modules/outpatientManagement/call/HIS-add.vue b/src/page-subspecialty/views/modules/outpatientManagement/call/HIS-add.vue
index 98dd5fb..5188c8e 100644
--- a/src/page-subspecialty/views/modules/outpatientManagement/call/HIS-add.vue
+++ b/src/page-subspecialty/views/modules/outpatientManagement/call/HIS-add.vue
@@ -17,15 +17,6 @@
       <el-form-item prop="patientIdNumber">
         <el-input v-model="dataFormHis.patientIdNumber" placeholder="请输入身份证号" clearable @clear="findHandle(1)" />
       </el-form-item>
-      <el-form-item prop="outpatientDoc">
-        <el-input v-model="dataFormHis.outpatientDoc" placeholder="请输入门诊医师" clearable @clear="findHandle(1)" />
-      </el-form-item>
-      <el-form-item prop="region">
-        <el-select v-model="dataFormHis.region" placeholder="请选择视光医师">
-          <el-option label="区域一" value="shanghai" />
-          <el-option label="区域二" value="beijing" />
-        </el-select>
-      </el-form-item>
       <el-col :span="4">
         <el-form-item>
           <el-button type="primary" @click="findHandle(2)">查询</el-button>
@@ -37,10 +28,12 @@
       <template slot="empty">
         <span style="color: #969799;">{{ tableText }}</span>
       </template>
-      <el-table-column property="patientId" label="病历号" width="100" />
+      <el-table-column property="patientId" label="登记号" width="100" />
       <el-table-column property="patientName" label="患者姓名" width="100" />
       <el-table-column property="patientIdNumber" label="身份证号" />
       <el-table-column property="patientPhone" label="联系电话" />
+      <el-table-column property="zlProject" label="医疗项目" width="240" />
+      <el-table-column property="remark" label="备注" width="240" />
       <el-table-column label="操作" width="80">
         <template slot-scope="scope">
           <p class="introduce" @click="introduceHandle(scope.row)">引入</p>
@@ -51,6 +44,7 @@
 </template>
 
 <script>
+
 export default {
   props: {
     patientTypeList: {
@@ -126,21 +120,8 @@ export default {
       }
     },
     // 点击引入按钮
-    async introduceHandle(item) {
-      console.log(item)
-      const { data: res } = await this.$http.get('/patient/doLeadIn', {
-        params: {
-          patientId: item.patientId,
-          platform: this.isSearch
-        }
-      })
-      if (res.code === 0) {
-        this.$message.success('引入成功!')
-        this.$parent.getDataListInitial()
-      } else {
-        this.tableText = res.msg
-        this.$message.error(res.msg)
-      }
+    introduceHandle(item) {
+      this.$emit('openAdd', item)
     }
   }
 }
diff --git a/src/page-subspecialty/views/modules/outpatientManagement/call/index.vue b/src/page-subspecialty/views/modules/outpatientManagement/call/index.vue
index eec3c36..2d2739b 100644
--- a/src/page-subspecialty/views/modules/outpatientManagement/call/index.vue
+++ b/src/page-subspecialty/views/modules/outpatientManagement/call/index.vue
@@ -77,20 +77,20 @@
           <el-table-column prop="mzDoctorName" label="门诊医师" header-align="center" align="center" />
           <el-table-column prop="sgDoctorName" label="视光医师" header-align="center" align="center" />
           <el-table-column prop="createDate" label="就诊时间" header-align="center" align="center" />
-<!--          <el-table-column prop="callSort" label="分诊序号" header-align="center" align="center" />-->
-<!--          <el-table-column prop="callStatus" label="叫号状态" header-align="center" align="center">-->
-<!--            <template slot-scope="scope">-->
-<!--              {{ scope.row.callStatus | callStatus }}-->
-<!--            </template>-->
-<!--          </el-table-column>-->
+          <!--          <el-table-column prop="callSort" label="分诊序号" header-align="center" align="center" />-->
+          <!--          <el-table-column prop="callStatus" label="叫号状态" header-align="center" align="center">-->
+          <!--            <template slot-scope="scope">-->
+          <!--              {{ scope.row.callStatus | callStatus }}-->
+          <!--            </template>-->
+          <!--          </el-table-column>-->
           <el-table-column prop="operation" label="操作" header-align="center" align="center" width="180">
             <template slot-scope="scope">
-<!--              <span-->
-<!--                style="color: #1890ff; padding-right: 8px"-->
-<!--                class="operation-details"-->
-<!--                @click="browseClick(scope.row)"-->
-<!--              >叫号</span>-->
-<!--                              v-if="scope.row.callStatus !== '1' && scope.row.callStatus !== '3' && scope.row.callStatus !== '5'"-->
+              <!--              <span-->
+              <!--                style="color: #1890ff; padding-right: 8px"-->
+              <!--                class="operation-details"-->
+              <!--                @click="browseClick(scope.row)"-->
+              <!--              >叫号</span>-->
+              <!--                              v-if="scope.row.callStatus !== '1' && scope.row.callStatus !== '3' && scope.row.callStatus !== '5'"-->
               <span
                 style="color: #1890ff; padding-right: 8px"
                 class="operation-details"
@@ -110,9 +110,9 @@
     <!-- 弹窗, 新增 / 修改 -->
     <add-or-update v-if="addOrUpdateVisible" ref="addOrUpdate" :patient-type-list="patientTypeList" @refreshDataList="getDataListInitial" />
     <!-- HIS引入弹框 -->
-    <his-add v-if="HisAddVisible" ref="HisAddRef" :is-search="'1'" />
+    <his-add v-if="HisAddVisible" ref="HisAddRef" :is-search="'1'" @openAdd="getHisData" />
     <!-- 详情页 -->
-    <detail-view v-if="detailViewVisible" :only-read="onlyRead" :is-search="'1'" ref="viewRef" :patient-id="patientId" :patient-id-number="patientIdNumber" @detailViewVisible="detailViewVisible=false" />
+    <detail-view v-if="detailViewVisible" ref="viewRef" :only-read="onlyRead" :is-search="'1'" :patient-id="patientId" :patient-id-number="patientIdNumber" @detailViewVisible="detailViewVisible=false" />
   </div>
 </template>
 <script>
@@ -127,6 +127,47 @@ export default {
     AddOrUpdate,
     detailView
   },
+  filters: {
+    callStatus(val) {
+      switch (val) {
+        case '1':
+          return '未叫号'
+          break
+        case '2':
+          return '已叫号'
+          break
+        case '3':
+          return '过号'
+          break
+        case '4':
+          return '呼叫中'
+          break
+        default:
+          return val
+      }
+    },
+    patientStatus(val) {
+      switch (val) {
+        case '1':
+          return '未报到'
+          break
+        case '2':
+          return '未诊断'
+          break
+        case '3':
+          return '就诊中'
+          break
+        case '4':
+          return '回诊'
+          break
+        case '5':
+          return '已诊'
+          break
+        default:
+          return val
+      }
+    }
+  },
   mixins: [mixinViewModule, tableAutoHeight],
   data() {
     return {
@@ -137,16 +178,25 @@ export default {
       options: [
         {
           value: '0',
-          label: '今日'
+          label: '今天'
         }, {
           value: '1',
-          label: '近三天'
+          label: '昨天'
         }, {
           value: '2',
-          label: '近一周'
+          label: '前天'
         }, {
           value: '3',
+          label: '近三天'
+        }, {
+          value: '4',
+          label: '近一周'
+        }, {
+          value: '5',
           label: '近一个月 '
+        }, {
+          value: '6',
+          label: '近半年 '
         }, {
           value: '',
           label: '全部'
@@ -181,59 +231,23 @@ export default {
         patientId: '',
         beginDate: '',
         endDate: '',
-        searchType: '',
+        searchType: '0',
         patientName: '',
         patientStatus: '',
         patientIdNumber: ''
       },
       patientId: '',
-      patientIdNumber: ''
-    }
-  },
-  filters: {
-    callStatus(val) {
-      switch (val) {
-        case '1':
-          return '未叫号'
-          break
-        case '2':
-          return '已叫号'
-          break
-        case '3':
-          return '过号'
-          break
-        case '4':
-          return '呼叫中'
-          break
-        default:
-          return val
-      }
-    },
-    patientStatus(val) {
-      switch (val) {
-        case '1':
-          return '未报到'
-          break
-        case '2':
-          return '未诊断'
-          break
-        case '3':
-          return '就诊中'
-          break
-        case '4':
-          return '回诊'
-          break
-        case '5':
-          return '已诊'
-          break
-        default:
-          return val
-      }
+      patientIdNumber: '',
+      doctorList: []
     }
   },
   created() {
   },
   methods: {
+    // HIS引入事件
+    getHisData(val) {
+      this.addOrUpdateHandle('', { ...val }, 'HIS引入')
+    },
     // 日期改变时
     dateChange(e) {
       this.dataForm.beginDate = e ? e[0] : ''
diff --git a/src/page-subspecialty/views/modules/outpatientManagement/call/patient-add-or-update.vue b/src/page-subspecialty/views/modules/outpatientManagement/call/patient-add-or-update.vue
index 0013583..dc54be4 100644
--- a/src/page-subspecialty/views/modules/outpatientManagement/call/patient-add-or-update.vue
+++ b/src/page-subspecialty/views/modules/outpatientManagement/call/patient-add-or-update.vue
@@ -7,7 +7,7 @@
     @close="closeDialog"
   >
     <el-form ref="dataForm" :model="dataForm" :rules="dataRule">
-      <el-form-item label="病历号:" label-width="120px" prop="patientId" class="formItemOne">
+      <el-form-item label="登记号:" label-width="120px" prop="patientId" class="formItemOne">
         <el-input v-model="dataForm.patientId" placeholder="请输入病历号" />
       </el-form-item>
       <el-form-item label="患者姓名:" label-width="120px" prop="patientName">
@@ -38,8 +38,43 @@
       <el-form-item label="家庭地址:" label-width="120px" prop="patientAddress">
         <el-input v-model="dataForm.patientAddress" placeholder="请输入地址" />
       </el-form-item>
+      <el-form-item label="门诊医师:" prop="outpatientDoc" label-width="120px">
+        <el-select v-model="dataForm.outpatientDoc" placeholder="请选择门诊医师">
+          <el-option
+            v-for="item in doctorList"
+            :key="item.id"
+            :label="item.realName"
+            :value="item.employeeId
+            "
+          />
+        </el-select>
+      </el-form-item>
+      <el-form-item label="视光医师:" prop="optometryDoc" label-width="120px">
+        <el-select v-model="dataForm.optometryDoc" placeholder="请选择视光医师">
+          <el-option
+            v-for="item in doctorList"
+            :key="item.id"
+            :label="item.realName"
+            :value="item.employeeId
+            "
+          />
+        </el-select>
+      </el-form-item>
+      <el-form-item label="眼别:" prop="zlEye" label-width="120px">
+        <el-select v-model="dataForm.zlEye" placeholder="请选择眼别">
+          <el-option v-for="item in zlEyeList" :key="item.value" :label="item.name" :value="item.value" />
+        </el-select>
+      </el-form-item>
       <el-form-item label="医疗项目:" label-width="120px" prop="patientAddress">
-        <el-input v-model="dataForm.zlProject" placeholder="请输入医疗项目" />
+        <el-select v-model="dataForm.zlProject" placeholder="请选择医疗项目">
+          <el-option
+            v-for="item in projectList"
+            :key="item.itemId"
+            :label="item.itemName"
+            :value="item.itemId
+            "
+          />
+        </el-select>
       </el-form-item>
       <!--      <el-form-item label="随访方案:" label-width="90px" prop="visitId">-->
       <!--        <el-select v-model="dataForm.visitId" placeholder="请选择随访方案">-->
@@ -60,6 +95,7 @@
 <script>
 import debounce from 'lodash/debounce'
 import { isMobile, isIDNumber } from '@/utils/validate'
+import eventBus from '@/page-subspecialty/utils/eventBus'
 export default {
   props: {
     patientTypeList: {
@@ -79,12 +115,22 @@ export default {
         patientPhone: '',
         patientAddress: '',
         patientBirthday: '',
+        outpatientDoc: '', // 门诊医师
+        optometryDoc: '', // 视光医师
         zlProject: '',
+        zlEye: '',
         visitId: '',
         remark: ''
       },
+      zlEyeList: [
+        { name: '左眼', value: 'os' },
+        { name: '右眼', value: 'od' },
+        { name: '双眼', value: 'ou' }
+      ],
       params: {},
-      visitList: []
+      visitList: [],
+      doctorList: [],
+      projectList: []
     }
   },
   computed: {
@@ -119,15 +165,34 @@ export default {
   methods: {
     init() {
       this.visible = true
+      this.getDoctorList()
+      this.getProject()
       this.$nextTick(() => {
         this.$refs.dataForm.resetFields() // 重置表单
         if (this.params.patientIdNumber && this.dataForm.title !== 'HIS引入') {
-          this.getInfo()
+          // this.getInfo()
+          this.dataForm = {
+            title: this.dataForm.title,
+            ...this.params
+          }
         } else if (this.dataForm.title === 'HIS引入') {
           this.getHisInfo()
         }
       })
     },
+    // 获取医师列表
+    getDoctorList() {
+      this.$http.get('/sys/user').then(data => {
+        this.doctorList = data.data.data
+        this.dataForm.optometryDoc = JSON.parse(window.localStorage.getItem('qg-userData')).employeeId
+      })
+    },
+    // 获取项目列表
+    getProject() {
+      this.$http.post('/patient/getZlItemDict').then(data => {
+        this.projectList = data.data.data
+      })
+    },
     // 获取信息
     getInfo() {
       this.$http.get(`/patient/manage/${this.params.patientCentreId}/${this.params.patientIdNumber}`).then(({ data: res }) => {
diff --git a/src/page-subspecialty/views/modules/outpatientManagement/treat/HIS-add.vue b/src/page-subspecialty/views/modules/outpatientManagement/treat/HIS-add.vue
index 927fc20..ad58981 100644
--- a/src/page-subspecialty/views/modules/outpatientManagement/treat/HIS-add.vue
+++ b/src/page-subspecialty/views/modules/outpatientManagement/treat/HIS-add.vue
@@ -17,15 +17,6 @@
       <el-form-item prop="patientIdNumber">
         <el-input v-model="dataFormHis.patientIdNumber" placeholder="请输入身份证号" clearable @clear="findHandle(1)" />
       </el-form-item>
-      <el-form-item prop="outpatientDoc">
-        <el-input v-model="dataFormHis.outpatientDoc" placeholder="请输入门诊医师" clearable @clear="findHandle(1)" />
-      </el-form-item>
-      <el-form-item prop="region">
-        <el-select v-model="dataFormHis.region" placeholder="请选择视光医师">
-          <el-option label="区域一" value="shanghai" />
-          <el-option label="区域二" value="beijing" />
-        </el-select>
-      </el-form-item>
       <el-col :span="4">
         <el-form-item>
           <el-button type="primary" @click="findHandle(2)">查询</el-button>
@@ -37,10 +28,12 @@
       <template slot="empty">
         <span style="color: #969799;">{{ tableText }}</span>
       </template>
-      <el-table-column property="patientId" label="病历号" width="100" />
+      <el-table-column property="patientId" label="登记号" width="100" />
       <el-table-column property="patientName" label="患者姓名" width="100" />
       <el-table-column property="patientIdNumber" label="身份证号" />
       <el-table-column property="patientPhone" label="联系电话" />
+      <el-table-column property="zlProject" label="医疗项目" width="240" />
+      <el-table-column property="remark" label="备注" width="240" />
       <el-table-column label="操作" width="80">
         <template slot-scope="scope">
           <p class="introduce" @click="introduceHandle(scope.row)">引入</p>
@@ -124,21 +117,8 @@ export default {
       }
     },
     // 点击引入按钮
-    async introduceHandle(item) {
-      console.log(item)
-      const { data: res } = await this.$http.get('/patient/doLeadIn', {
-        params: {
-          patientId: item.patientId,
-          platform: this.isSearch
-        }
-      })
-      if (res.code === 0) {
-        this.$message.success('引入成功!')
-        this.$parent.getDataListInitial()
-      } else {
-        this.tableText = res.msg
-        this.$message.error(res.msg)
-      }
+    introduceHandle(item) {
+      this.$emit('openAdd', item)
     }
   }
 }
diff --git a/src/page-subspecialty/views/modules/outpatientManagement/treat/index.vue b/src/page-subspecialty/views/modules/outpatientManagement/treat/index.vue
index 7245244..f362a51 100644
--- a/src/page-subspecialty/views/modules/outpatientManagement/treat/index.vue
+++ b/src/page-subspecialty/views/modules/outpatientManagement/treat/index.vue
@@ -58,7 +58,7 @@
           style="width: 100%"
         >
           <el-table-column prop="patientId" label="登记号" header-align="center" align="center" />
-<!--          <el-table-column prop="patientId" label="就诊号" header-align="center" align="center" />-->
+          <!--          <el-table-column prop="patientId" label="就诊号" header-align="center" align="center" />-->
           <el-table-column label="状态" header-align="center" align="center">
             <template slot-scope="scope">
               {{ scope.row.patientStatus | patientStatus }}
@@ -79,7 +79,7 @@
           </el-table-column>
           <el-table-column prop="patientSex" label="治疗医师" header-align="center" align="center" />
           <el-table-column prop="createDate" label="就诊时间" header-align="center" align="center" />
-<!--          <el-table-column prop="callSort" label="分诊序号" header-align="center" align="center" />-->
+          <!--          <el-table-column prop="callSort" label="分诊序号" header-align="center" align="center" />-->
           <!--          <el-table-column prop="patientSex" label="叫号状态" header-align="center" align="center">-->
           <!--            <template slot-scope="scope">-->
           <!--              {{ scope.row.callStatus | callStatus }}-->
@@ -111,9 +111,9 @@
     <!-- 弹窗, 新增 / 修改 -->
     <add-or-update v-if="addOrUpdateVisible" ref="addOrUpdate" :patient-type-list="patientTypeList" @refreshDataList="getDataListInitial" />
     <!-- HIS引入弹框 -->
-    <his-add v-if="HisAddVisible" ref="HisAddRef" :is-search="'2'" />
+    <his-add v-if="HisAddVisible" ref="HisAddRef" :is-search="'2'" @openAdd="getHisData" />
     <!-- 详情页 -->
-    <detail-view v-if="detailViewVisible" :only-read="onlyRead" ref="viewRef" :is-search="'2'" :patient-id="patientId" :patient-id-number="patientIdNumber" @detailViewVisible="detailViewVisible=false" />
+    <detail-view v-if="detailViewVisible" ref="viewRef" :only-read="onlyRead" :is-search="'2'" :patient-id="patientId" :patient-id-number="patientIdNumber" @detailViewVisible="detailViewVisible=false" />
   </div>
 </template>
 <script>
@@ -179,16 +179,25 @@ export default {
       options: [
         {
           value: '0',
-          label: '今日'
+          label: '今天'
         }, {
           value: '1',
-          label: '近三天'
+          label: '昨天'
         }, {
           value: '2',
-          label: '近一周'
+          label: '前天'
         }, {
           value: '3',
+          label: '近三天'
+        }, {
+          value: '4',
+          label: '近一周'
+        }, {
+          value: '5',
           label: '近一个月 '
+        }, {
+          value: '6',
+          label: '近半年 '
         }, {
           value: '',
           label: '全部'
@@ -223,7 +232,7 @@ export default {
         patientId: '',
         beginDate: '',
         endDate: '',
-        searchType: '',
+        searchType: '0',
         patientName: '',
         patientStatus: '',
         patientIdNumber: ''
@@ -242,6 +251,9 @@ export default {
     this.isShowPatient = !(this.$route.matched.length > 2)
   },
   methods: {
+    getHisData(val) {
+      this.addOrUpdateHandle('', { ...val }, 'HIS引入')
+    },
     // 日期改变时
     dateChange(e) {
       this.dataForm.beginDate = e ? e[0] : ''
@@ -272,7 +284,7 @@ export default {
       this.$nextTick(() => {
         this.$refs.HisAddRef.init()
       })
-    },
+    }
   }
 }
 </script>
diff --git a/src/page-subspecialty/views/modules/outpatientManagement/treat/patient-add-or-update.vue b/src/page-subspecialty/views/modules/outpatientManagement/treat/patient-add-or-update.vue
index 82080e5..6ac0e09 100644
--- a/src/page-subspecialty/views/modules/outpatientManagement/treat/patient-add-or-update.vue
+++ b/src/page-subspecialty/views/modules/outpatientManagement/treat/patient-add-or-update.vue
@@ -7,7 +7,7 @@
     @close="closeDialog"
   >
     <el-form ref="dataForm" :model="dataForm" :rules="dataRule">
-      <el-form-item label="病历号:" label-width="120px" prop="patientId" class="formItemOne">
+      <el-form-item label="登记号:" label-width="120px" prop="patientId" class="formItemOne">
         <el-input v-model="dataForm.patientId" placeholder="请输入病历号" />
       </el-form-item>
       <el-form-item label="患者姓名:" label-width="120px" prop="patientName">
@@ -38,9 +38,42 @@
       <el-form-item label="家庭地址:" label-width="120px" prop="patientAddress">
         <el-input v-model="dataForm.patientAddress" placeholder="请输入地址" />
       </el-form-item>
-      <el-form-item label="医疗项目:" label-width="120px" prop="patientAddress">
-        <el-input v-model="dataForm.zlProject" placeholder="请输入医疗项目" />
+      <el-form-item label="门诊医师:" prop="outpatientDoc" label-width="120px">
+        <el-select v-model="dataForm.outpatientDoc" placeholder="请选择门诊医师">
+          <el-option
+            v-for="item in doctorList"
+            :key="item.id"
+            :label="item.realName"
+            :value="item.employeeId
+            "
+          />
+        </el-select>
       </el-form-item>
+      <el-form-item label="视光医师:" prop="optometryDoc" label-width="120px">
+        <el-select v-model="dataForm.optometryDoc" placeholder="请选择视光医师">
+          <el-option
+            v-for="item in doctorList"
+            :key="item.id"
+            :label="item.realName"
+            :value="item.employeeId
+            "
+          />
+        </el-select>
+      </el-form-item>
+      <el-form-item label="眼别:" prop="zlEye" label-width="120px">
+        <el-select v-model="dataForm.zlEye" placeholder="请选择眼别">
+          <el-option v-for="item in zlEyeList" :key="item.value" :label="item.name" :value="item.value" />
+        </el-select>
+      </el-form-item>
+      <el-select v-model="dataForm.zlProject" placeholder="请选择医疗项目">
+        <el-option
+          v-for="item in projectList"
+          :key="item.itemId"
+          :label="item.itemName"
+          :value="item.itemId
+          "
+        />
+      </el-select>
       <!--      <el-form-item label="随访方案:" label-width="90px" prop="visitId">-->
       <!--        <el-select v-model="dataForm.visitId" placeholder="请选择随访方案">-->
       <!--          <el-option v-for="item in visitList" :key="item.id" :label="item.name" :value="item.id" />-->
@@ -79,12 +112,22 @@ export default {
         patientPhone: '',
         patientAddress: '',
         patientBirthday: '',
+        outpatientDoc: '', // 门诊医师
+        optometryDoc: '', // 视光医师
+        zlEye: '',
         zlProject: '',
         visitId: '',
         remark: ''
       },
+      zlEyeList: [
+        { name: '左眼', value: 'os' },
+        { name: '右眼', value: 'od' },
+        { name: '双眼', value: 'ou' }
+      ],
       params: {},
-      visitList: []
+      visitList: [],
+      doctorList: [],
+      projectList: []
     }
   },
   computed: {
@@ -112,6 +155,9 @@ export default {
         ],
         patientIdNumber: [
           { required: true, message: '请输入患者身份证号', trigger: 'blur' }
+        ],
+        optometryDoc: [
+          { required: true, message: '请选择视光医师', trigger: 'blur' }
         ]
       }
     }
@@ -119,27 +165,32 @@ export default {
   methods: {
     init() {
       this.visible = true
+      this.getDoctorList()
+      this.getProject()
       this.$nextTick(() => {
         this.$refs.dataForm.resetFields() // 重置表单
-        this.getVisitList() // 获取随访列表
         if (this.params.patientIdNumber && this.dataForm.title !== 'HIS引入') {
-          this.getInfo()
+          this.dataForm = {
+            title: this.dataForm.title,
+            ...this.params
+          }
         } else if (this.dataForm.title === 'HIS引入') {
           this.getHisInfo()
         }
       })
     },
-    // 获取信息
-    getInfo() {
-      this.$http.get(`/patient/manage/${this.params.patientCentreId}/${this.params.patientIdNumber}`).then(({ data: res }) => {
-        if (res.code !== 0) {
-          return this.$message.error(res.msg)
-        }
-        this.dataForm = {
-          ...this.dataForm,
-          ...res.data
-        }
-      }).catch(() => {})
+    // 获取医师列表
+    getDoctorList() {
+      this.$http.get('/sys/user').then(data => {
+        this.doctorList = data.data.data
+        this.dataForm.optometryDoc = JSON.parse(window.localStorage.getItem('qg-userData')).employeeId
+      })
+    },
+    // 获取项目列表
+    getProject() {
+      this.$http.post('/patient/getZlItemDict').then(data => {
+        this.projectList = data.data.data
+      })
     },
     // 获取His信息
     getHisInfo() {