diff --git a/src/components/360View/afterPart/index-copy.vue b/src/components/360View/afterPart/index-copy.vue
index 62af523..37b0bbd 100644
--- a/src/components/360View/afterPart/index-copy.vue
+++ b/src/components/360View/afterPart/index-copy.vue
@@ -631,19 +631,19 @@ export default {
       })
     },
     // 点击左侧模板数据覆盖表格内容
-    templateData(data, node) {
-      if (data && data.caseJson) {
-        this.tableData = JSON.parse(data.caseJson)
-        // 回显表格复选框
-        this.$nextTick(() => {
-          this.tableData.forEach(item => {
-            if (item.flag) {
-              this.$refs.multipleTable.toggleRowSelection(item, true)
-            }
-          })
-        })
+    async templateData(data, node) {
+      const { data: res } = await this.$http.get('/mjz/getMjzHdjcInfoTemplate', {
+        params: {
+          id: data.id,
+          patientId: this.patientId
+        }
+      })
+      if (res.code === 0) {
+        if (res.data) {
+          this.dataForm = this.handleData(res.data)
+        }
       } else {
-        // this.tableData = Object.assign([], this.sourceData)
+        this.$message.error(res.msg)
       }
     },
     // 点击保存模板后弹框
@@ -658,15 +658,19 @@ export default {
     },
     // 保存模板树
     async saveTreeTemplete() {
-      if (!this.treeId) return this.$message.warning('请选择节点!')
+      if (!this.treeId) return this.$message.warning('请选择目录!')
       const params = {
-        caseJson: JSON.stringify(this.tableData),
         doctorId: this.doctorId,
         name: this.form.name,
         type: 3, // 2前段检查 3后段检查
         treeId: this.treeId
       }
-      const { data: res } = await this.$http.post('/treetemplate/addTreeCase', params)
+      for (const resKey in this.dataForm) {
+        if (Array.isArray(this.dataForm[resKey])) {
+          this.dataForm[resKey] = this.dataForm[resKey].join(',')
+        }
+      }
+      const { data: res } = await this.$http.post('/mjz/saveMjzHdjcTemplate', { ...params, ...this.dataForm })
       if (res.code === 0) {
         this.templateFlag = false
         await this.queryTreeCase()
@@ -707,7 +711,7 @@ export default {
       let url = ''
       if (data.type) {
         // 模板节点
-        url = '/treetemplate/deleteTreeCase'
+        url = '/mjz/delMjzHdjcInfoTemplate'
       } else {
         // 树节点
         url = '/treetemplate/deleteTree'
diff --git a/src/components/360View/business.vue b/src/components/360View/business.vue
index 92973ed..758039e 100644
--- a/src/components/360View/business.vue
+++ b/src/components/360View/business.vue
@@ -12,12 +12,23 @@
       <el-input v-model="remark" auto-complete="off" style="width: 420px" />
     </div>
     <div class="fileBox">
-      <p class="title">预约激光治疗</p>
+      <p class="title">预约医疗项目</p>
       <el-button type="primary" size="small" @click="sendTreat">发送</el-button>
     </div>
     <div style="margin: 12px 0">
       状态：<span class="circle">已发送</span>
     </div>
+    <div style="margin-bottom: 12px">
+      医疗项目：
+      <el-select v-model="itemId" placeholder="" clearable style="display: inline-block;width: 220px;margin-left: 8px" >
+        <el-option
+          v-for="item in projectList"
+          :key="item.itemId"
+          :label="item.itemName"
+          :value="item.itemId"
+        />
+      </el-select>
+    </div>
     <div>
       备注：
       <el-input v-model="treatRemark" auto-complete="off" style="width: 420px" />
@@ -49,6 +60,8 @@ export default {
   data() {
     return {
       remark: '',
+      projectList: [],
+      itemId: '',
       treatRemark: '',
       jzNumber: ''
     }
@@ -60,6 +73,7 @@ export default {
 
   },
   mounted() {
+    this.queryProjects()
     this.jzNumber = window.localStorage.getItem('jzNumber')
   },
   methods: {
@@ -79,9 +93,16 @@ export default {
       //   this.$message.error(res.msg)
       // }
     },
+    queryProjects() {
+      this.$http.get('/patient/getZlItemDict', { params: { isAppoint: 1 }}).then(data => {
+        this.projectList = data.data.data || []
+      })
+    },
     // 发送激光治疗
     async sendTreat() {
+      if (!this.itemId) return this.$message.warning('请选择医疗项目!')
       const params = {
+        itemId: this.itemId,
         remark: this.treatRemark,
         jzNumber: this.jzNumber,
         platform: this.platform,
diff --git a/src/components/360View/commonForm/threeVision.vue b/src/components/360View/commonForm/threeVision.vue
index 39195e9..cd697fb 100644
--- a/src/components/360View/commonForm/threeVision.vue
+++ b/src/components/360View/commonForm/threeVision.vue
@@ -1,6 +1,5 @@
 <template>
   <div id="operation-record" style=" background: #fff; padding: 10px 20px 50px 20px;page-break-after:always">
-    <!--    <Keyboard :layouts="myLayout" @input="handleInput" />-->
     <div v-if="!onlyRead && isPlatform" class="btnBox">
       <el-button v-print="'#threeFunc'" size="small" @click="handleSaveTable">打印</el-button>
       <el-button type="primary" size="small" @click="handleSaveTable">保存</el-button>
@@ -40,82 +39,75 @@
                     >
                       <template slot-scope="scope">
                         <div v-if="scope.row.name == '1'">
-                          <div class="center">
-                            <!--                            <el-input v-model="dataForm.jfwjcOd1" placeholder="" @change="handleFocus"></el-input>-->
-                            <el-input v-model="dataForm.jfwjcOd1" placeholder="" />
-                            <el-select v-model="dataForm.ctPrismDw" placeholder="" clearable style="display: inline-block;width: 100px;margin-left: 8px">
-                              <el-option
-                                v-for="item in symbolList"
-                                :key="item.id"
-                                :label="item.name"
-                                :value="item.name"
-                              />
-                            </el-select>
+                          <div class="width-120 center">
+                            <el-popover
+                              ref="popover1"
+                              placement="bottom"
+                              width="560"
+                            >
+                              <Keyboard :layouts="myLayout" @input="handleInput('jfwjcOd1', $event)" />
+                            </el-popover>
+                            <el-input v-model="dataForm.jfwjcOd1" v-popover:popover1 placeholder="" />
                           </div>
                         </div>
                         <div v-if="scope.row.name == '2'">
-                          <div class="center">
-                            <el-input v-model="dataForm.jfwjcOd1n" placeholder="" />
-                            <el-select v-model="dataForm.ctPrismDw" placeholder="" clearable style="display: inline-block;width: 100px;margin-left: 8px">
-                              <el-option
-                                v-for="item in symbolList"
-                                :key="item.id"
-                                :label="item.name"
-                                :value="item.name"
-                              />
-                            </el-select>
+                          <div class="width-120 center">
+                            <el-popover
+                              ref="popover1n"
+                              placement="bottom"
+                              width="560"
+                            >
+                              <Keyboard :layouts="myLayout" @input="handleInput('jfwjcOd1n', $event)" />
+                            </el-popover>
+                            <el-input v-model="dataForm.jfwjcOd1n" v-popover:popover1n placeholder="" />
                           </div>
                         </div>
                         <div v-if="scope.row.name == '3'">
-                          <div class="center">
-                            <el-input v-model="dataForm.jfwjcOd4" placeholder="" />
-                            <el-select v-model="dataForm.ctPrismDw" placeholder="" clearable style="display: inline-block;width: 100px;margin-left: 8px">
-                              <el-option
-                                v-for="item in symbolList"
-                                :key="item.id"
-                                :label="item.name"
-                                :value="item.name"
-                              />
-                            </el-select>
+                          <div class="width-120 center">
+                            <el-popover
+                              ref="popover2"
+                              placement="bottom"
+                              width="560"
+                            >
+                              <Keyboard :layouts="myLayout" @input="handleInput('jfwjcOd4', $event)" />
+                            </el-popover>
+                            <el-input v-model="dataForm.jfwjcOd4" v-popover:popover2 placeholder="" />
                           </div>
                         </div>
                         <div v-if="scope.row.name == '4'">
-                          <div class="center">
-                            <el-input v-model="dataForm.jfwjcOd4n" placeholder="" />
-                            <el-select v-model="dataForm.ctPrismDw" placeholder="" clearable style="display: inline-block;width: 100px;margin-left: 8px">
-                              <el-option
-                                v-for="item in symbolList"
-                                :key="item.id"
-                                :label="item.name"
-                                :value="item.name"
-                              />
-                            </el-select>
+                          <div class="width-120 center">
+                            <el-popover
+                              ref="popover2n"
+                              placement="bottom"
+                              width="560"
+                            >
+                              <Keyboard :layouts="myLayout" @input="handleInput('jfwjcOd4n', $event)" />
+                            </el-popover>
+                            <el-input v-model="dataForm.jfwjcOd4n" v-popover:popover2n placeholder="" />
                           </div>
                         </div>
                         <div v-if="scope.row.name == '5'">
-                          <div class="center">
-                            <el-input v-model="dataForm.jfwjcOd7" placeholder="" />
-                            <el-select v-model="dataForm.ctPrismDw" placeholder="" clearable style="display: inline-block;width: 100px;margin-left: 8px">
-                              <el-option
-                                v-for="item in symbolList"
-                                :key="item.id"
-                                :label="item.name"
-                                :value="item.name"
-                              />
-                            </el-select>
+                          <div class="width-120 center">
+                            <el-popover
+                              ref="popover3"
+                              placement="bottom"
+                              width="560"
+                            >
+                              <Keyboard :layouts="myLayout" @input="handleInput('jfwjcOd7', $event)" />
+                            </el-popover>
+                            <el-input v-model="dataForm.jfwjcOd7" v-popover:popover3 placeholder="" />
                           </div>
                         </div>
                         <div v-if="scope.row.name == '6'">
-                          <div class="center">
-                            <el-input v-model="dataForm.jfwjcOd7n" placeholder="" />
-                            <el-select v-model="dataForm.ctPrismDw" placeholder="" clearable style="display: inline-block;width: 100px;margin-left: 8px">
-                              <el-option
-                                v-for="item in symbolList"
-                                :key="item.id"
-                                :label="item.name"
-                                :value="item.name"
-                              />
-                            </el-select>
+                          <div class="width-120 center">
+                            <el-popover
+                              ref="popover4"
+                              placement="bottom"
+                              width="560"
+                            >
+                              <Keyboard :layouts="myLayout" @input="handleInput('jfwjcOd7n', $event)" />
+                            </el-popover>
+                            <el-input v-model="dataForm.jfwjcOd7n" v-popover:popover4 placeholder="" />
                           </div>
                         </div>
                       </template>
@@ -125,81 +117,75 @@
                     >
                       <template slot-scope="scope">
                         <div v-if="scope.row.name == '1'">
-                          <div class="center">
-                            <el-input v-model="dataForm.jfwjcOd2" placeholder="" />
-                            <el-select v-model="dataForm.ctPrismDw" placeholder="" clearable style="display: inline-block;width: 100px;margin-left: 8px">
-                              <el-option
-                                v-for="item in symbolList"
-                                :key="item.id"
-                                :label="item.name"
-                                :value="item.name"
-                              />
-                            </el-select>
+                          <div class="width-120 center">
+                            <el-popover
+                              ref="popover4n"
+                              placement="bottom"
+                              width="560"
+                            >
+                              <Keyboard :layouts="myLayout" @input="handleInput('jfwjcOd2', $event)" />
+                            </el-popover>
+                            <el-input v-model="dataForm.jfwjcOd2" v-popover:popover4n placeholder="" />
                           </div>
                         </div>
                         <div v-if="scope.row.name == '2'">
-                          <div class="center">
-                            <el-input v-model="dataForm.jfwjcOd2n" placeholder="" />
-                            <el-select v-model="dataForm.ctPrismDw" placeholder="" clearable style="display: inline-block;width: 100px;margin-left: 8px">
-                              <el-option
-                                v-for="item in symbolList"
-                                :key="item.id"
-                                :label="item.name"
-                                :value="item.name"
-                              />
-                            </el-select>
+                          <div class="width-120 center">
+                            <el-popover
+                              ref="popover5"
+                              placement="bottom"
+                              width="560"
+                            >
+                              <Keyboard :layouts="myLayout" @input="handleInput('jfwjcOd2n', $event)" />
+                            </el-popover>
+                            <el-input v-model="dataForm.jfwjcOd2n" v-popover:popover5 placeholder="" />
                           </div>
                         </div>
                         <div v-if="scope.row.name == '3'">
-                          <div class="center">
-                            <el-input v-model="dataForm.jfwjcOd5" placeholder="" />
-                            <el-select v-model="dataForm.ctPrismDw" placeholder="" clearable style="display: inline-block;width: 100px;margin-left: 8px">
-                              <el-option
-                                v-for="item in symbolList"
-                                :key="item.id"
-                                :label="item.name"
-                                :value="item.name"
-                              />
-                            </el-select>
+                          <div class="width-120 center">
+                            <el-popover
+                              ref="popover5n"
+                              placement="bottom"
+                              width="560"
+                            >
+                              <Keyboard :layouts="myLayout" @input="handleInput('jfwjcOd5', $event)" />
+                            </el-popover>
+                            <el-input v-model="dataForm.jfwjcOd5" v-popover:popover5n placeholder="" />
                           </div>
                         </div>
                         <div v-if="scope.row.name == '4'">
-                          <div class="center">
-                            <el-input v-model="dataForm.jfwjcOd5n" placeholder="" />
-                            <el-select v-model="dataForm.ctPrismDw" placeholder="" clearable style="display: inline-block;width: 100px;margin-left: 8px">
-                              <el-option
-                                v-for="item in symbolList"
-                                :key="item.id"
-                                :label="item.name"
-                                :value="item.name"
-                              />
-                            </el-select>
+                          <div class="width-120 center">
+                            <el-popover
+                              ref="popover6"
+                              placement="bottom"
+                              width="560"
+                            >
+                              <Keyboard :layouts="myLayout" @input="handleInput('jfwjcOd5n', $event)" />
+                            </el-popover>
+                            <el-input v-model="dataForm.jfwjcOd5n" v-popover:popover6 placeholder="" />
                           </div>
                         </div>
                         <div v-if="scope.row.name == '5'">
-                          <div class="center">
-                            <el-input v-model="dataForm.jfwjcOd8" placeholder="" />
-                            <el-select v-model="dataForm.ctPrismDw" placeholder="" clearable style="display: inline-block;width: 100px;margin-left: 8px">
-                              <el-option
-                                v-for="item in symbolList"
-                                :key="item.id"
-                                :label="item.name"
-                                :value="item.name"
-                              />
-                            </el-select>
+                          <div class="width-120 center">
+                            <el-popover
+                              ref="popover6n"
+                              placement="bottom"
+                              width="560"
+                            >
+                              <Keyboard :layouts="myLayout" @input="handleInput('jfwjcOd8', $event)" />
+                            </el-popover>
+                            <el-input v-model="dataForm.jfwjcOd8" v-popover:popover6n placeholder="" />
                           </div>
                         </div>
                         <div v-if="scope.row.name == '6'">
-                          <div class="center">
-                            <el-input v-model="dataForm.jfwjcOd8n" placeholder="" />
-                            <el-select v-model="dataForm.ctPrismDw" placeholder="" clearable style="display: inline-block;width: 100px;margin-left: 8px">
-                              <el-option
-                                v-for="item in symbolList"
-                                :key="item.id"
-                                :label="item.name"
-                                :value="item.name"
-                              />
-                            </el-select>
+                          <div class="width-120 center">
+                            <el-popover
+                              ref="popover7"
+                              placement="bottom"
+                              width="560"
+                            >
+                              <Keyboard :layouts="myLayout" @input="handleInput('jfwjcOd8n', $event)" />
+                            </el-popover>
+                            <el-input v-model="dataForm.jfwjcOd8n" v-popover:popover7 placeholder="" />
                           </div>
                         </div>
                       </template>
@@ -209,81 +195,75 @@
                     >
                       <template slot-scope="scope">
                         <div v-if="scope.row.name == '1'">
-                          <div class="center">
-                            <el-input v-model="dataForm.jfwjcOd3" placeholder="" />
-                            <el-select v-model="dataForm.ctPrismDw" placeholder="" clearable style="display: inline-block;width: 100px;margin-left: 8px">
-                              <el-option
-                                v-for="item in symbolList"
-                                :key="item.id"
-                                :label="item.name"
-                                :value="item.name"
-                              />
-                            </el-select>
+                          <div class="width-120 center">
+                            <el-popover
+                              ref="popover7n"
+                              placement="bottom"
+                              width="560"
+                            >
+                              <Keyboard :layouts="myLayout" @input="handleInput('jfwjcOd3', $event)" />
+                            </el-popover>
+                            <el-input v-model="dataForm.jfwjcOd3" v-popover:popover7n placeholder="" />
                           </div>
                         </div>
                         <div v-if="scope.row.name == '2'">
-                          <div class="center">
-                            <el-input v-model="dataForm.jfwjcOd3n" placeholder="" />
-                            <el-select v-model="dataForm.ctPrismDw" placeholder="" clearable style="display: inline-block;width: 100px;margin-left: 8px">
-                              <el-option
-                                v-for="item in symbolList"
-                                :key="item.id"
-                                :label="item.name"
-                                :value="item.name"
-                              />
-                            </el-select>
+                          <div class="width-120 center">
+                            <el-popover
+                              ref="popover8"
+                              placement="bottom"
+                              width="560"
+                            >
+                              <Keyboard :layouts="myLayout" @input="handleInput('jfwjcOd3n', $event)" />
+                            </el-popover>
+                            <el-input v-model="dataForm.jfwjcOd3n" v-popover:popover8 placeholder="" />
                           </div>
                         </div>
                         <div v-if="scope.row.name == '3'">
-                          <div class="center">
-                            <el-input v-model="dataForm.jfwjcOd6" placeholder="" />
-                            <el-select v-model="dataForm.ctPrismDw" placeholder="" clearable style="display: inline-block;width: 100px;margin-left: 8px">
-                              <el-option
-                                v-for="item in symbolList"
-                                :key="item.id"
-                                :label="item.name"
-                                :value="item.name"
-                              />
-                            </el-select>
+                          <div class="width-120 center">
+                            <el-popover
+                              ref="popover8n"
+                              placement="bottom"
+                              width="560"
+                            >
+                              <Keyboard :layouts="myLayout" @input="handleInput('jfwjcOd6', $event)" />
+                            </el-popover>
+                            <el-input v-model="dataForm.jfwjcOd6" v-popover:popover8n placeholder="" />
                           </div>
                         </div>
                         <div v-if="scope.row.name == '4'">
-                          <div class="center">
-                            <el-input v-model="dataForm.jfwjcOd6n" placeholder="" />
-                            <el-select v-model="dataForm.ctPrismDw" placeholder="" clearable style="display: inline-block;width: 100px;margin-left: 8px">
-                              <el-option
-                                v-for="item in symbolList"
-                                :key="item.id"
-                                :label="item.name"
-                                :value="item.name"
-                              />
-                            </el-select>
+                          <div class="width-120 center">
+                            <el-popover
+                              ref="popover9"
+                              placement="bottom"
+                              width="560"
+                            >
+                              <Keyboard :layouts="myLayout" @input="handleInput('jfwjcOd6n', $event)" />
+                            </el-popover>
+                            <el-input v-model="dataForm.jfwjcOd6n" v-popover:popover9 placeholder="" />
                           </div>
                         </div>
                         <div v-if="scope.row.name == '5'">
-                          <div class="center">
-                            <el-input v-model="dataForm.jfwjcOd9" placeholder="" />
-                            <el-select v-model="dataForm.ctPrismDw" placeholder="" clearable style="display: inline-block;width: 100px;margin-left: 8px">
-                              <el-option
-                                v-for="item in symbolList"
-                                :key="item.id"
-                                :label="item.name"
-                                :value="item.name"
-                              />
-                            </el-select>
+                          <div class="width-120 center">
+                            <el-popover
+                              ref="popover9n"
+                              placement="bottom"
+                              width="560"
+                            >
+                              <Keyboard :layouts="myLayout" @input="handleInput('jfwjcOd9', $event)" />
+                            </el-popover>
+                            <el-input v-model="dataForm.jfwjcOd9" v-popover:popover9n placeholder="" />
                           </div>
                         </div>
                         <div v-if="scope.row.name == '6'">
-                          <div class="center">
-                            <el-input v-model="dataForm.jfwjcOd9n" placeholder="" />
-                            <el-select v-model="dataForm.ctPrismDw" placeholder="" clearable style="display: inline-block;width: 100px;margin-left: 8px">
-                              <el-option
-                                v-for="item in symbolList"
-                                :key="item.id"
-                                :label="item.name"
-                                :value="item.name"
-                              />
-                            </el-select>
+                          <div class="width-120 center">
+                            <el-popover
+                              ref="popover10"
+                              placement="bottom"
+                              width="560"
+                            >
+                              <Keyboard :layouts="myLayout" @input="handleInput('jfwjcOd9n', $event)" />
+                            </el-popover>
+                            <el-input v-model="dataForm.jfwjcOd9n" v-popover:popover10 placeholder="" />
                           </div>
                         </div>
                       </template>
@@ -301,32 +281,74 @@
                       <template slot-scope="scope">
                         <div v-if="scope.row.name == '1'">
                           <div class="width-120 center">
-                            <el-input v-model="dataForm.jfwjcOs1" placeholder="" />
+                            <el-popover
+                              ref="pop1"
+                              placement="bottom"
+                              width="560"
+                            >
+                              <Keyboard :layouts="myLayout" @input="handleInput('jfwjcOs1', $event)" />
+                            </el-popover>
+                            <el-input v-model="dataForm.jfwjcOs1" v-popover:pop1 placeholder="" />
                           </div>
                         </div>
                         <div v-if="scope.row.name == '2'">
                           <div class="width-120 center">
-                            <el-input v-model="dataForm.jfwjcOs1n" placeholder="" />
+                            <el-popover
+                              ref="pop1n"
+                              placement="bottom"
+                              width="560"
+                            >
+                              <Keyboard :layouts="myLayout" @input="handleInput('jfwjcOs1n', $event)" />
+                            </el-popover>
+                            <el-input v-model="dataForm.jfwjcOs1n" v-popover:pop1n placeholder="" />
                           </div>
                         </div>
                         <div v-if="scope.row.name == '3'">
                           <div class="width-120 center">
-                            <el-input v-model="dataForm.jfwjcOs4" placeholder="" />
+                            <el-popover
+                              ref="pop2"
+                              placement="bottom"
+                              width="560"
+                            >
+                              <Keyboard :layouts="myLayout" @input="handleInput('jfwjcOs4', $event)" />
+                            </el-popover>
+                            <el-input v-model="dataForm.jfwjcOs4" v-popover:pop2 placeholder="" />
                           </div>
                         </div>
                         <div v-if="scope.row.name == '4'">
                           <div class="width-120 center">
-                            <el-input v-model="dataForm.jfwjcOs4n" placeholder="" />
+                            <el-popover
+                              ref="pop2n"
+                              placement="bottom"
+                              width="560"
+                            >
+                              <Keyboard :layouts="myLayout" @input="handleInput('jfwjcOs4n', $event)" />
+                            </el-popover>
+                            <el-input v-model="dataForm.jfwjcOs4n" v-popover:pop2n placeholder="" />
                           </div>
                         </div>
                         <div v-if="scope.row.name == '5'">
                           <div class="width-120 center">
-                            <el-input v-model="dataForm.jfwjcOs7" placeholder="" />
+                            <el-popover
+                              ref="pop3"
+                              placement="bottom"
+                              width="560"
+                            >
+                              <Keyboard :layouts="myLayout" @input="handleInput('jfwjcOs7', $event)" />
+                            </el-popover>
+                            <el-input v-model="dataForm.jfwjcOs7" v-popover:pop3 placeholder="" />
                           </div>
                         </div>
                         <div v-if="scope.row.name == '6'">
                           <div class="width-120 center">
-                            <el-input v-model="dataForm.jfwjcOs7n" placeholder="" />
+                            <el-popover
+                              ref="pop3n"
+                              placement="bottom"
+                              width="560"
+                            >
+                              <Keyboard :layouts="myLayout" @input="handleInput('jfwjcOs7n', $event)" />
+                            </el-popover>
+                            <el-input v-model="dataForm.jfwjcOs7n" v-popover:pop3n placeholder="" />
                           </div>
                         </div>
                       </template>
@@ -337,32 +359,74 @@
                       <template slot-scope="scope">
                         <div v-if="scope.row.name == '1'">
                           <div class="width-120 center">
-                            <el-input v-model="dataForm.jfwjcOs2" placeholder="" />
+                            <el-popover
+                              ref="pop4"
+                              placement="bottom"
+                              width="560"
+                            >
+                              <Keyboard :layouts="myLayout" @input="handleInput('jfwjcOs2', $event)" />
+                            </el-popover>
+                            <el-input v-model="dataForm.jfwjcOs2" v-popover:pop4 placeholder="" />
                           </div>
                         </div>
                         <div v-if="scope.row.name == '2'">
                           <div class="width-120 center">
-                            <el-input v-model="dataForm.jfwjcOs2n" placeholder="" />
+                            <el-popover
+                              ref="pop4n"
+                              placement="bottom"
+                              width="560"
+                            >
+                              <Keyboard :layouts="myLayout" @input="handleInput('jfwjcOs2n', $event)" />
+                            </el-popover>
+                            <el-input v-model="dataForm.jfwjcOs2n" v-popover:pop4n placeholder="" />
                           </div>
                         </div>
                         <div v-if="scope.row.name == '3'">
                           <div class="width-120 center">
-                            <el-input v-model="dataForm.jfwjcOs5" placeholder="" />
+                            <el-popover
+                              ref="pop5"
+                              placement="bottom"
+                              width="560"
+                            >
+                              <Keyboard :layouts="myLayout" @input="handleInput('jfwjcOs5', $event)" />
+                            </el-popover>
+                            <el-input v-model="dataForm.jfwjcOs5" v-popover:pop5 placeholder="" />
                           </div>
                         </div>
                         <div v-if="scope.row.name == '4'">
                           <div class="width-120 center">
-                            <el-input v-model="dataForm.jfwjcOs5n" placeholder="" />
+                            <el-popover
+                              ref="pop5n"
+                              placement="bottom"
+                              width="560"
+                            >
+                              <Keyboard :layouts="myLayout" @input="handleInput('jfwjcOs5n', $event)" />
+                            </el-popover>
+                            <el-input v-model="dataForm.jfwjcOs5n" v-popover:pop5n placeholder="" />
                           </div>
                         </div>
                         <div v-if="scope.row.name == '5'">
                           <div class="width-120 center">
-                            <el-input v-model="dataForm.jfwjcOs8" placeholder="" />
+                            <el-popover
+                              ref="pop6"
+                              placement="bottom"
+                              width="560"
+                            >
+                              <Keyboard :layouts="myLayout" @input="handleInput('jfwjcOs8', $event)" />
+                            </el-popover>
+                            <el-input v-model="dataForm.jfwjcOs8" v-popover:pop6 placeholder="" />
                           </div>
                         </div>
                         <div v-if="scope.row.name == '6'">
                           <div class="width-120 center">
-                            <el-input v-model="dataForm.jfwjcOs8n" placeholder="" />
+                            <el-popover
+                              ref="pop6n"
+                              placement="bottom"
+                              width="560"
+                            >
+                              <Keyboard :layouts="myLayout" @input="handleInput('jfwjcOs8n', $event)" />
+                            </el-popover>
+                            <el-input v-model="dataForm.jfwjcOs8n" v-popover:pop6n placeholder="" />
                           </div>
                         </div>
                       </template>
@@ -373,64 +437,84 @@
                       <template slot-scope="scope">
                         <div v-if="scope.row.name == '1'">
                           <div class="width-120 center">
-                            <el-input v-model="dataForm.jfwjcOs3" placeholder="" />
+                            <el-popover
+                              ref="pop7"
+                              placement="bottom"
+                              width="560"
+                            >
+                              <Keyboard :layouts="myLayout" @input="handleInput('jfwjcOs3', $event)" />
+                            </el-popover>
+                            <el-input v-model="dataForm.jfwjcOs3" v-popover:pop7 placeholder="" />
                           </div>
                         </div>
                         <div v-if="scope.row.name == '2'">
                           <div class="width-120 center">
-                            <el-input v-model="dataForm.jfwjcOs3n" placeholder="" />
+                            <el-popover
+                              ref="pop7n"
+                              placement="bottom"
+                              width="560"
+                            >
+                              <Keyboard :layouts="myLayout" @input="handleInput('jfwjcOs3n', $event)" />
+                            </el-popover>
+                            <el-input v-model="dataForm.jfwjcOs3n" v-popover:pop7n placeholder="" />
                           </div>
                         </div>
                         <div v-if="scope.row.name == '3'">
                           <div class="width-120 center">
-                            <el-input v-model="dataForm.jfwjcOs6" placeholder="" />
+                            <el-popover
+                              ref="pop8"
+                              placement="bottom"
+                              width="560"
+                            >
+                              <Keyboard :layouts="myLayout" @input="handleInput('jfwjcOs6', $event)" />
+                            </el-popover>
+                            <el-input v-model="dataForm.jfwjcOs6" v-popover:pop8 placeholder="" />
                           </div>
                         </div>
                         <div v-if="scope.row.name == '4'">
                           <div class="width-120 center">
-                            <el-input v-model="dataForm.jfwjcOs6n" placeholder="" />
+                            <el-popover
+                              ref="pop8n"
+                              placement="bottom"
+                              width="560"
+                            >
+                              <Keyboard :layouts="myLayout" @input="handleInput('jfwjcOs6n', $event)" />
+                            </el-popover>
+                            <el-input v-model="dataForm.jfwjcOs6n" v-popover:pop8n placeholder="" />
                           </div>
                         </div>
                         <div v-if="scope.row.name == '5'">
                           <div class="width-120 center">
-                            <el-input v-model="dataForm.jfwjcOs9" placeholder="" />
+                            <el-popover
+                              ref="pop9"
+                              placement="bottom"
+                              width="560"
+                            >
+                              <Keyboard :layouts="myLayout" @input="handleInput('jfwjcOs9', $event)" />
+                            </el-popover>
+                            <el-input v-model="dataForm.jfwjcOs9" v-popover:pop9 placeholder="" />
                           </div>
                         </div>
                         <div v-if="scope.row.name == '6'">
                           <div class="width-120 center">
-                            <el-input v-model="dataForm.jfwjcOs9n" placeholder="" />
+                            <el-popover
+                              ref="pop9n"
+                              placement="bottom"
+                              width="560"
+                            >
+                              <Keyboard :layouts="myLayout" @input="handleInput('jfwjcOs9n', $event)" />
+                            </el-popover>
+                            <el-input v-model="dataForm.jfwjcOs9n" v-popover:pop9n placeholder="" />
                           </div>
                         </div>
                       </template>
                     </el-table-column>
                   </el-table>
                 </div>
-                <!--<div class="rowLine" />-->
-                <!--<div class="cloLine" />-->
-                <!--<div class="rowLine-l" />-->
-                <!--<div class="cloLine-l" />-->
                 <div class="Rline">R</div>
                 <div class="Rline-os">L</div>
                 <div class="Lline">L</div>
                 <div class="Lline-os">R</div>
-                <!--                <el-input v-model="dataForm.jfwjcOd1" class="ipt-a" placeholder="" />-->
-                <!--                <el-input v-model="dataForm.jfwjcOd2" class="ipt-b" placeholder="" />-->
-                <!--                <el-input v-model="dataForm.jfwjcOd3" class="ipt-c" placeholder="" />-->
-                <!--                <el-input v-model="dataForm.jfwjcOd4" class="ipt-d" placeholder="" />-->
-                <!--                <el-input v-model="dataForm.jfwjcOd5" class="ipt-e" placeholder="" />-->
-                <!--                <el-input v-model="dataForm.jfwjcOd6" class="ipt-f" placeholder="" />-->
-                <!--                <el-input v-model="dataForm.jfwjcOd7" class="ipt-g" placeholder="" />-->
-                <!--                <el-input v-model="dataForm.jfwjcOd8" class="ipt-h" placeholder="" />-->
-                <!--                <el-input v-model="dataForm.jfwjcOd9" class="ipt-j" placeholder="" />-->
-                <!--                <el-input v-model="dataForm.jfwjcOs1" class="iptos-a" placeholder="" />-->
-                <!--                <el-input v-model="dataForm.jfwjcOs2" class="iptos-b" placeholder="" />-->
-                <!--                <el-input v-model="dataForm.jfwjcOs3" class="iptos-c" placeholder="" />-->
-                <!--                <el-input v-model="dataForm.jfwjcOs4" class="iptos-d" placeholder="" />-->
-                <!--                <el-input v-model="dataForm.jfwjcOs5" class="iptos-e" placeholder="" />-->
-                <!--                <el-input v-model="dataForm.jfwjcOs6" class="iptos-f" placeholder="" />-->
-                <!--                <el-input v-model="dataForm.jfwjcOs7" class="iptos-g" placeholder="" />-->
-                <!--                <el-input v-model="dataForm.jfwjcOs8" class="iptos-h" placeholder="" />-->
-                <!--                <el-input v-model="dataForm.jfwjcOs9" class="iptos-j" placeholder="" />-->
               </div>
               <div v-else-if="scope.row.name === 'TITMUS(近)'" class="flex">
                 <span>TITMUS(近):</span>
@@ -658,6 +742,8 @@
 </template>
 <script>
 import Keyboard from 'vue-keyboard'
+// import 'vue-keyboard/dist/vue-keyboard.css'
+// import { KEYBOARD_MAP, KEYS } from 'vue-keyboard/lib/keyboard-map';
 export default {
   components: {
     Keyboard
@@ -682,11 +768,36 @@ export default {
   },
   data() {
     return {
+      options: {
+        layout: 'en-US',
+        layouts: {
+          // 添加自定义符号
+          custom: [
+            [
+              { key: '1', value: '1' },
+              { key: '2', value: '2' },
+              { key: '3', value: '3' },
+              { key: '11', value: 'custom-word' }, // 将新的键码添加到自定义符号中
+              { key: '4', value: '4' },
+              { key: '5', value: '5' },
+              { key: '6', value: '6' },
+              { key: '7', value: '7' },
+              { key: '8', value: '8' },
+              { key: '9', value: '9' },
+              { key: '0', value: '0' },
+              { key: '.', value: '.' },
+              { key: 'delete', value: '删除' }
+            ]
+          ]
+        }
+      },
       myLayout: [
         '1234567890{delete:backspace}|qwertyuiop|asdfghjkl|{shift:goto:1}zxcvbnm|{space:space}{custom:custom}',
-        '!@#$%^&*(){delete:backspace}|QWERTYUIOP|ASDFGHJKL|{shift:goto:0}ZXCVBNM|{space:space}{custom:custom}'
+        '@+-/%△°*()ᴿᴸ|QWERTYUIOP|ASDFGHJKL|{shift:goto:0}ZXCVBNM|{space:space}{custom:custom}'
       ],
+      // myLayout: '||{EX:EX}',
       focusItem: '',
+      visibleFlag: true,
       symbolList: [
         {
           name: 'ᴿ/ʟ',
@@ -1075,6 +1186,14 @@ export default {
         patientId: this.patientId
       }})
       if (res.code === 0) {
+        const R = /右上/g
+        const L = /左上/g
+        for (const key in res.data) {
+          if (typeof res.data[key] === 'string') {
+            res.data[key] = res.data[key].replace(R, 'ᴿ/ʟ')
+            res.data[key] = res.data[key].replace(L, 'ᴸ/ʀ')
+          }
+        }
         this.dataForm = res.data
         this.dataForm.jzNumber = window.localStorage.getItem('jzNumber')
         if (!this.dataForm.id) {
@@ -1090,12 +1209,13 @@ export default {
         }
       }
     },
-    handleFocus() {
-      this.focusItem = 'jfwjcOd1'
-    },
-    handleInput(input) {
-      console.log('Input:', input)
-      this.dataForm[this.focusItem] += input
+    handleInput(item, input) {
+      if (input === 'ᴿ') {
+        input = 'ᴿ/ʟ'
+      } else if (input === 'ᴸ') {
+        input = 'ᴸ/ʀ'
+      }
+      this.dataForm[item] = this.dataForm[item] ? this.dataForm[item] + input : input
     },
     // 获取报告单id
     async queryProject() {
@@ -1162,6 +1282,14 @@ export default {
     },
     // 保存
     async handleSaveTable() {
+      const R = /ᴿ\/ʟ/g
+      const L = /ᴸ\/ʀ/g
+      for (const key in this.dataForm) {
+        if (typeof this.dataForm[key] === 'string') {
+          this.dataForm[key] = this.dataForm[key].replace(R, '右上')
+          this.dataForm[key] = this.dataForm[key].replace(L, '左上')
+        }
+      }
       const data = JSON.parse(JSON.stringify(this.dataForm))
       const params = {
         caseId: this.caseId,
diff --git a/src/components/360View/forePart/index-copy.vue b/src/components/360View/forePart/index-copy.vue
index d856e5f..a4fb24a 100644
--- a/src/components/360View/forePart/index-copy.vue
+++ b/src/components/360View/forePart/index-copy.vue
@@ -1027,20 +1027,20 @@ export default {
           })
       })
     },
-    // 点击左侧模板数据覆盖表格内容
-    templateData(data, node) {
-      if (data && data.caseJson) {
-        this.tableData = JSON.parse(data.caseJson)
-        // 回显表格复选框
-        this.$nextTick(() => {
-          this.tableData.forEach(item => {
-            if (item.flag) {
-              this.$refs.multipleTable.toggleRowSelection(item, true)
-            }
-          })
-        })
+    // 点击左侧模板数据查询表格内容
+    async templateData(data, node) {
+      const { data: res } = await this.$http.get('/mjz/getMjzQdjcInfoTemplate', {
+        params: {
+          id: data.id,
+          patientId: this.patientId
+        }
+      })
+      if (res.code === 0) {
+        if (res.data) {
+          this.dataForm = this.handleData(res.data)
+        }
       } else {
-        // this.tableData = Object.assign([], this.sourceData)
+        this.$message.error(res.msg)
       }
     },
     // 点击保存模板后弹框
@@ -1057,13 +1057,18 @@ export default {
     async saveTreeTemplete() {
       if (!this.treeId) return this.$message.warning('请选择目录!')
       const params = {
-        caseJson: JSON.stringify(this.tableData),
         doctorId: this.doctorId,
         name: this.form.name,
         type: 2, // 2前段检查 3后段检查
-        treeId: this.treeId
+        treeId: this.treeId,
+        parentId: this.parentId
+      }
+      for (const resKey in this.dataForm) {
+        if (Array.isArray(this.dataForm[resKey])) {
+          this.dataForm[resKey] = this.dataForm[resKey].join(',')
+        }
       }
-      const { data: res } = await this.$http.post('/treetemplate/addTreeCase', params)
+      const { data: res } = await this.$http.post('/mjz/saveMjzQdjcTemplate', { ...params, ...this.dataForm })
       if (res.code === 0) {
         this.templateFlag = false
         await this.queryTreeCase()
@@ -1104,7 +1109,7 @@ export default {
       let url = ''
       if (data.type) {
         // 模板节点
-        url = '/treetemplate/deleteTreeCase'
+        url = '/mjz/delMjzQdjcInfoTemplate'
       } else {
         // 树节点
         url = '/treetemplate/deleteTree'
diff --git a/src/components/360View/img-reccrd.vue b/src/components/360View/img-reccrd.vue
index 8d39257..706c883 100644
--- a/src/components/360View/img-reccrd.vue
+++ b/src/components/360View/img-reccrd.vue
@@ -589,8 +589,8 @@ export default {
       const params = {
         searchType: this.examineType,
         searchChild: this.searchChild,
-        // patientId: this.patientInfo.patientId,
-        patientId: '2553716',
+        patientId: this.patientInfo.patientId,
+        // patientId: '2553716',
         eyeType: this.eyeType,
         fileType: this.fileType
       }
diff --git a/src/components/360View/index1.vue b/src/components/360View/index1.vue
index 950141d..2bd5ff3 100644
--- a/src/components/360View/index1.vue
+++ b/src/components/360View/index1.vue
@@ -406,9 +406,9 @@ export default {
     // 360浏览器
     handlePacs() {
       // const baseUrl = 'http://z1.huimucloud.com:8085'
-      // const baseUrl = 'http://10.80.5.32:8026'
-      const baseUrl = 'http://192.168.0.85:8001'
-      const href = `${baseUrl}/EXAMINE_Report/InterFace?PatID=${this.patientId || this.$route.query.patientId}&DoctorID=${this.employeeId}&PatIdKey=&ExamNo=`
+      const baseUrl = 'http://10.80.5.32:8026'
+      // const baseUrl = 'http://192.168.0.85:8001'
+      const href = `${baseUrl}/EXAMINE_Report/InterFace?PatID=${this.patientId}&DoctorID=${this.employeeId}&PatIdKey=&ExamNo=`
       window.open(href, '_blank')
       // const { href } = this.$router.resolve({
       //   name: 'pacsManage'
diff --git a/src/components/360View/medicalRecord/outPatientRecord/diagnosisForm.vue b/src/components/360View/medicalRecord/outPatientRecord/diagnosisForm.vue
index 8dcd858..c0df2b4 100644
--- a/src/components/360View/medicalRecord/outPatientRecord/diagnosisForm.vue
+++ b/src/components/360View/medicalRecord/outPatientRecord/diagnosisForm.vue
@@ -1,15 +1,17 @@
 <template>
-  <el-form id="formDiagnosis" ref="form" :model="diagnosis" label-width="120px" style="margin-top: 32px">
-    <el-form-item label="诊断：" style="width: 540px" prop="zd">
-      <el-input v-model="diagnosis.zd" type="textarea" auto-complete="off" style="width: 420px" />
-    </el-form-item>
-    <el-form-item label="处理：" style="width: 540px" prop="cl">
-      <el-input v-model="diagnosis.cl" type="textarea" auto-complete="off" style="width: 420px" />
-    </el-form-item>
-    <el-form-item label="治疗意见：" style="width: 540px" prop="zlyj">
-      <el-input v-model="diagnosis.zlyj" type="textarea" auto-complete="off" style="width: 420px" />
-    </el-form-item>
-  </el-form>
+  <div style="height: 100%">
+    <el-form id="formDiagnosis" ref="form" :model="diagnosis" label-width="120px" style="margin-top: 32px">
+      <el-form-item label="诊断：" style="width: 540px" prop="zd">
+        <el-input v-model="diagnosis.zd" type="textarea" auto-complete="off" :rows="4" style="width: 420px" />
+      </el-form-item>
+      <el-form-item label="处理：" style="width: 540px" prop="cl">
+        <el-input v-model="diagnosis.cl" type="textarea" auto-complete="off" :rows="4" style="width: 420px" />
+      </el-form-item>
+      <el-form-item label="治疗意见：" style="width: 540px" prop="zlyj">
+        <el-input v-model="diagnosis.zlyj" type="textarea" auto-complete="off" :rows="4" style="width: 420px" />
+      </el-form-item>
+    </el-form>
+  </div>
 </template>
 
 <script>
diff --git a/src/components/360View/medicalRecord/outPatientRecord/historyForm.vue b/src/components/360View/medicalRecord/outPatientRecord/historyForm.vue
index 720d0c8..3b2c806 100644
--- a/src/components/360View/medicalRecord/outPatientRecord/historyForm.vue
+++ b/src/components/360View/medicalRecord/outPatientRecord/historyForm.vue
@@ -1,21 +1,23 @@
 <template>
-  <el-form id="medHistory" ref="form" :model="formData" label-width="140px" style="margin-top: 32px">
+  <div style="height: 100%;overflow-y: auto">
+    <el-form id="medHistory" ref="form" :model="formData" label-width="140px" style="margin-top: 32px">
     <el-form-item label="主诉：" style="width: 540px" prop="zhuSu">
-      <el-input v-model="formData.zhuSu" type="textarea" auto-complete="off" style="width: 420px" />
+      <el-input v-model="formData.zhuSu" type="textarea" auto-complete="off" :rows="4" style="width: 420px" />
     </el-form-item>
     <el-form-item label="现病史：" style="width: 540px" prop="xbs">
-      <el-input v-model="formData.xbs" type="textarea" auto-complete="off" style="width: 420px" />
+      <el-input v-model="formData.xbs" type="textarea" auto-complete="off" :rows="4" style="width: 420px" />
     </el-form-item>
     <el-form-item label="既往病史：" style="width: 540px" prop="jws">
-      <el-input v-model="formData.jws" type="textarea" auto-complete="off" style="width: 420px" />
+      <el-input v-model="formData.jws" type="textarea" auto-complete="off" :rows="4" style="width: 420px" />
     </el-form-item>
     <el-form-item label="过敏史：" style="width: 540px" prop="gms">
-      <el-input v-model="formData.gms" type="textarea" auto-complete="off" style="width: 420px" />
+      <el-input v-model="formData.gms" type="textarea" auto-complete="off" :rows="4" style="width: 420px" />
     </el-form-item>
     <el-form-item label="周身其他病史：" style="width: 540px" prop="zsqtbs">
-      <el-input v-model="formData.zsqtbs" type="textarea" auto-complete="off" style="width: 420px" />
+      <el-input v-model="formData.zsqtbs" type="textarea" auto-complete="off" :rows="4" style="width: 420px" />
     </el-form-item>
   </el-form>
+  </div>
 </template>
 
 <script>
diff --git a/src/components/360View/pacs/img-reccrd.vue b/src/components/360View/pacs/img-reccrd.vue
index fe04f59..b9a8b10 100644
--- a/src/components/360View/pacs/img-reccrd.vue
+++ b/src/components/360View/pacs/img-reccrd.vue
@@ -467,8 +467,8 @@ export default {
       this.examineType = type
       const { data: res } = await this.$http.get('/patient/view/getPatientTree', { params: {
         type: type,
-        // patientId: this.patientInfo.patientId
-        patientId: '2553716'
+        patientId: this.patientInfo.patientId
+        // patientId: '2553716'
       }
       })
       if (res.code === 0) {
diff --git a/src/components/360View/pacs/patientList.vue b/src/components/360View/pacs/patientList.vue
index 9035059..6c5fcc5 100644
--- a/src/components/360View/pacs/patientList.vue
+++ b/src/components/360View/pacs/patientList.vue
@@ -103,7 +103,7 @@ export default {
       limit: 10,
       total: 0,
       // patientId: '2328656',
-      patientId: '2553716',
+      patientId: '',
       patientName: '', // 病人姓名
       userName: '', // 用户名
       childInfo: {
@@ -272,8 +272,8 @@ export default {
           click: () => {
             console.log(record)
             // window.localStorage.setItem('patientId', '88163664')
-            window.localStorage.setItem('patientId', '2553716')
-            // window.localStorage.setItem('patientId', record.id)
+            // window.localStorage.setItem('patientId', '2553716')
+            window.localStorage.setItem('patientId', record.id)
             window.localStorage.setItem('name', record.name)
             window.localStorage.setItem('age', record.age)
             window.localStorage.setItem('sex', record.sex)
diff --git a/src/components/360View/special/index.vue b/src/components/360View/special/index.vue
index 26dd846..16d96e1 100644
--- a/src/components/360View/special/index.vue
+++ b/src/components/360View/special/index.vue
@@ -154,6 +154,7 @@ export default {
       this.loadingFlag = true
       const { data: res } = await this.$http.get('/patient/view/getExtractData', {
         params: {
+          patientId: this.patientId,
           examNo: this.examNo,
           examineItem: this.examineItem
         }
@@ -217,6 +218,12 @@ export default {
     // 添加数据集
     addDataList() {
       const data = this.multipleSelection
+      if (!data.length) return this.$message.warning('请选择数据!')
+      data.forEach(item => {
+        item.id = item.name
+        item.odValue = item.od
+        item.osValue = item.os
+      })
       eventBus.$emit('sendForData', data)
     }
   }
@@ -247,7 +254,7 @@ export default {
     padding: 16px 0 0 16px;
     height: 100%;
     flex: 1;
-    overflow: auto;
+    overflow-y: auto;
     box-sizing: border-box;
     position: relative;
 
diff --git a/src/page-subspecialty/views/modules/outpatientManagement/call/index.vue b/src/page-subspecialty/views/modules/outpatientManagement/call/index.vue
index d292e36..6050d85 100644
--- a/src/page-subspecialty/views/modules/outpatientManagement/call/index.vue
+++ b/src/page-subspecialty/views/modules/outpatientManagement/call/index.vue
@@ -3,10 +3,6 @@
   <div class="patient-info">
     <div v-if="!detailViewVisible" style="height: 100%">
       <div class="patient-info-head">
-<!--        ᴿ/˪-->
-<!--        ᴸ/ʀ-->
-<!--        ᴿ/ʟ-->
-<!--        ᴸ/<span style="font-size: 13px">R</span>-->
         <el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataListInitial()">
           <el-form-item label="登记号:">
             <el-input v-model="dataForm.patientId" size="small" clearable placeholder="登记号" @clear="getDataListInitial()" />
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 50961a5..0536601 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
@@ -82,8 +82,7 @@
             v-for="item in projectList"
             :key="item.itemId"
             :label="item.itemName"
-            :value="item.itemId
-            "
+            :value="item.itemId"
           />
         </el-select>
       </el-form-item>
@@ -179,7 +178,7 @@ export default {
           { validator: validataIDNumber, trigger: 'blur' }
         ],
         sgDoctorId: [
-          { required: true, message: '请选择视光医师', trigger: 'blur' }
+          { required: false, message: '请选择视光医师', trigger: 'blur' }
         ],
         patientSource: [
           { required: true, message: '请选择患者来源', trigger: 'blur' }
@@ -222,7 +221,7 @@ export default {
         } else {
           this.mzDoctorList = data.data.data
         }
-        this.dataForm.sgDoctorId = JSON.parse(window.localStorage.getItem('qg-userData')).employeeId
+        this.dataForm.mzDoctorId = JSON.parse(window.localStorage.getItem('qg-userData')).employeeId
       })
     },
     // 获取项目列表
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 085dde0..c77f547 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
@@ -175,7 +175,7 @@ export default {
           { validator: validataIDNumber, trigger: 'blur' }
         ],
         sgDoctorId: [
-          { required: true, message: '请选择视光医师', trigger: 'blur' }
+          { required: false, message: '请选择视光医师', trigger: 'blur' }
         ],
         patientSource: [
           { required: true, message: '请选择患者来源', trigger: 'blur' }
@@ -218,7 +218,7 @@ export default {
         } else {
           this.mzDoctorList = data.data.data
         }
-        this.dataForm.sgDoctorId = JSON.parse(window.localStorage.getItem('qg-userData')).employeeId
+        this.dataForm.mzDoctorId = JSON.parse(window.localStorage.getItem('qg-userData')).employeeId
       })
     },
     // 获取项目列表
diff --git a/src/page-subspecialty/views/modules/systemManagement/team/team-add-or-update.vue b/src/page-subspecialty/views/modules/systemManagement/team/team-add-or-update.vue
index 57ae0f9..250d6f5 100644
--- a/src/page-subspecialty/views/modules/systemManagement/team/team-add-or-update.vue
+++ b/src/page-subspecialty/views/modules/systemManagement/team/team-add-or-update.vue
@@ -26,9 +26,12 @@
       <el-form-item label="手机号:" label-width="100px" prop="mobile">
         <el-input v-model="dataForm.mobile" placeholder="请输入手机号" />
       </el-form-item>
-      <!-- <el-form-item label="医生职位:" label-width="90px" prop="doctorJob">
-        <el-input v-model="dataForm.doctorJob" placeholder="请输入医生职位" />
-      </el-form-item> -->
+      <el-form-item label="医生职位:" label-width="100px" prop="position">
+        <el-radio-group v-model="dataForm.position" size="medium">
+          <el-radio-button label="门诊医师">门诊医师</el-radio-button>
+          <el-radio-button label="视光医师">视光医师</el-radio-button>
+        </el-radio-group>
+      </el-form-item>
       <!-- superAdmin：0普通用户 1是慧目管理员   -->
       <!--      <el-form-item v-if="loginInfo.superAdmin===1" label="所属医院:" label-width="90px" prop="centreId">-->
       <!--        <el-select v-model="dataForm.centreId" placeholder="请选择">-->
@@ -132,6 +135,7 @@ export default {
         password: '',
         gender: 1,
         mobile: '',
+        position: '门诊医师',
         positionIdList: [],
         positionListValue: [],
         roleIdList: [],
@@ -181,6 +185,9 @@ export default {
         gender: [
           { required: true, message: '请选择性别', trigger: 'change' }
         ],
+        position: [
+          { required: true, message: '请选择医生职位', trigger: 'change' }
+        ],
         mobile: [
           { required: true, validator: validataMobile, trigger: 'blur' }
         ]
@@ -199,7 +206,6 @@ export default {
         // this.getCentreJobList()
         this.loginInfo = JSON.parse(window.localStorage.getItem('qg-userData'))
         this.$refs.dataForm.resetFields() // 重置表单
-        console.log(this.dataForm)
         if (this.dataForm.id) {
           this.getInfo()
         }
diff --git a/src/page-subspecialty/views/pages/pacs/img-record.vue b/src/page-subspecialty/views/pages/pacs/img-record.vue
index 5156c5f..541579b 100644
--- a/src/page-subspecialty/views/pages/pacs/img-record.vue
+++ b/src/page-subspecialty/views/pages/pacs/img-record.vue
@@ -566,9 +566,7 @@ export default {
         // examDate: this.examDate,
         // examNo: this.examNo,
         // examItemCode: this.examItemCode,
-        // patientId: this.patientInfo.patientId,
-        // patientId: '2553716',
-        patientId: '2553716',
+        patientId: this.patientInfo.patientId,
         eyeType: this.eyeType,
         fileType: this.fileType
       }