2月7日提交

src/views/data/query/index.vue

@@ -170,14 +170,20 @@
             <span class="pind10"></span>
             <el-date-picker v-model="formData1.endTime" type="date" format="yyyy 年 MM 月 dd 日" value-format="yyyyMMdd" placeholder="结束日期"></el-date-picker>
           </el-form-item>
-          <el-form-item label="诊断编码范围">
+          <el-form-item label="范围搜索">
+            <!-- 下拉框开始 -->
+            <el-select class="width150" filterable  v-model="selectRange" @change="rangeChange" placeholder="请选择范围类型">
+              <!-- fieldList -->
+              <el-option v-for="(item, index) in rangeArray" :label="item.name" :value="item.id" :key="index"></el-option>
+            </el-select>
+            <!-- 下拉框开始 -->
             <div class="zkSelect">
-              <el-input class="width300" v-model="formData1.bmStart"  placeholder="编码起始范围">
+              <el-input class="width300" v-model="formData1.bmStart"  placeholder="起始范围">
               </el-input>
             </div>
             <span class="pind" style="color: #ccc">——</span>
             <div class="zkSelect">
-              <el-input class="width300" v-model="formData1.bmEnd" placeholder="编码结束范围">
+              <el-input class="width300" v-model="formData1.bmEnd" placeholder="结束范围">
               </el-input>
             </div>
           </el-form-item>
@@ -329,6 +335,11 @@ export default {
   },
   data() {
     return {
+      selectRange:'',//范围下拉选中
+      rangeArray:[{'id':1,'name':'主要诊断编码','value':'zyzdbm'},
+        {'id':2,'name':'其他诊断编码','value':'qtzdbm'},
+        {'id':3,'name':'主要手术编码','value':'zyssbm'},
+        {'id':4,'name':'其他手术编码','value':'qtssbm'}],
       choice: 0,
       clumText: {},
       columnShow: false,
@@ -374,6 +385,7 @@ export default {
         ],
         hospitalizationon: '',
         hospitalizationin: '',
+        rangeName:'',
         bmStart:'',
         bmEnd:'',
       },
@@ -430,6 +442,12 @@ export default {
     this.getDoctors()
   },
   methods: {
+    //范围选择
+    rangeChange(value){
+      let currentRange =  this.rangeArray[value-1];
+      this.selectRange = currentRange['name'];
+      this.$set(this.formData1,'rangeName',currentRange['id'])
+    },
     handleSelectChange(val, index) {
       console.log(val, index)
       if (index === 1) {
@@ -722,8 +740,9 @@ export default {
           age_end_type: this.formData1.age_end_type || null,
           AAC01_start_date: this.formData1.startTime || '',
           AAC01_end_date: this.formData1.endTime || '',
-          bmStart: this.formData1.bmStart,//编码起始范围
-          bmEnd : this.formData1.bmEnd,//编码结束范围
+          rangeName:this.formData1.rangeName || null,//范围类型
+          bmStart: this.formData1.bmStart || null,//编码起始范围
+          bmEnd : this.formData1.bmEnd || null,//编码结束范围
           field: this.formData1.seniorList || null, //字段条件
           page: this.paginationData.currentPage, //页码
           limit: this.paginationData.pageSize, //条数
@@ -896,6 +915,7 @@ export default {
           AAC01_start_date: this.formData1.startTime || '',
           AAC01_end_date: this.formData1.endTime || '',
           field: this.formData1.seniorList || null, //字段条件
+          rangeName:this.formData1.rangeName || null,//范围类型
           bmStart: this.formData1.bmStart,//编码起始范围
           bmEnd : this.formData1.bmEnd,//编码结束范围
           page: num == 1 ? num : this.paginationData.currentPage, //页码
@@ -932,6 +952,7 @@ export default {
         Object.assign(this.$data.formData0, this.$options.data().formData0);
       } else {
         Object.assign(this.$data.formData1, this.$options.data().formData1);
+        this.selectRange = "";
       }
       this.funQuery(1);
     },

src/views/medicalRecord/index.vue

@@ -197,10 +197,10 @@
           <td colspan="2" :class="{'jy_bg': hasIntersection(active_zk_codes.jy, ['AAC04']), 'qz_bg': hasIntersection(active_zk_codes.qz, ['AAC04'])}">{{ blInfo.patient_info.AAC04 }}</td>
         </tr>
         <tr>
-          <td class="label ABA01C" :class="{'jy': hasIntersection(zk_codes.jy, ['ABA01C']), 'qz': hasIntersection(zk_codes.qz, ['ABA01C'])}">门(急)诊诊断</td>
-          <td colspan="5" :class="{'jy_bg': hasIntersection(active_zk_codes.jy, ['ABA01C']), 'qz_bg': hasIntersection(active_zk_codes.qz, ['ABA01C'])}">{{ blInfo.patient_medical_info.ABA01C }}</td>
-          <td class="label ABA01N" :class="{'jy': hasIntersection(zk_codes.jy, ['ABA01N']), 'qz': hasIntersection(zk_codes.qz, ['ABA01N'])}">疾病编码</td>
+          <td class="label ABA01C" :class="{'jy': hasIntersection(zk_codes.jy, ['ABA01N']), 'qz': hasIntersection(zk_codes.qz, ['ABA01N'])}">门(急)诊诊断</td>
           <td colspan="5" :class="{'jy_bg': hasIntersection(active_zk_codes.jy, ['ABA01N']), 'qz_bg': hasIntersection(active_zk_codes.qz, ['ABA01N'])}">{{ blInfo.patient_medical_info.ABA01N }}</td>
+          <td class="label ABA01N" :class="{'jy': hasIntersection(zk_codes.jy, ['ABA01C']), 'qz': hasIntersection(zk_codes.qz, ['ABA01C'])}">疾病编码</td>
+          <td colspan="5" :class="{'jy_bg': hasIntersection(active_zk_codes.jy, ['ABA01C']), 'qz_bg': hasIntersection(active_zk_codes.qz, ['ABA01C'])}">{{ blInfo.patient_medical_info.ABA01C }}</td>
         </tr>
       </table>
       <div class="oper-box">
@@ -405,8 +405,8 @@
           <th rowspan="2" class="label th25" :class="{'jy': judgeZD(zk_codes.jy, 'OPE_DATE'), 'qz': judgeZD(zk_codes.qz, 'OPE_DATE')}">手术及操作日期</th>
           <th colspan="2" rowspan="2" class="label th25" :class="{'jy': judgeZD(zk_codes.jy, 'ICD9_NAME'), 'qz': judgeZD(zk_codes.qz, 'ICD9_NAME')}">手术及操作名称</th>
           <th rowspan="2" class="label th25" :class="{'jy': judgeZD(zk_codes.jy, 'OPE_LEVEL'), 'qz': judgeZD(zk_codes.qz, 'OPE_LEVEL')}">手术级别</th>
-          <th rowspan="2" class="label th25" :class="{'jy': judgeZD(zk_codes.jy, 'OPE_TYPE'), 'qz': judgeZD(zk_codes.qz, 'OPE_TYPE')}">手术判别</th>
-          <th rowspan="2" class="label th25" :class="{'jy': judgeZD(zk_codes.jy, 'SSPB'), 'qz': judgeZD(zk_codes.qz, 'SSPB')}">手术类型</th>
+          <th rowspan="2" class="label th25" :class="{'jy': judgeZD(zk_codes.jy, 'OPE_TYPE'), 'qz': judgeZD(zk_codes.qz, 'OPE_TYPE')}">手术类型</th>
+          <th rowspan="2" class="label th25" :class="{'jy': judgeZD(zk_codes.jy, 'SSPB'), 'qz': judgeZD(zk_codes.qz, 'SSPB')}">手术判别</th>
           <th colspan="3" class="label th25" :class="{'jy': hasIntersection(zk_codes.jy, ['OPE_MAN_NAME', 'FRIST_ASSISTANT_NAME', 'SECOND_ASSISTANT_NAME']), 'qz': hasIntersection(zk_codes.qz, ['OPE_MAN_NAME', 'FRIST_ASSISTANT_NAME', 'SECOND_ASSISTANT_NAME'])}">手术及操作人员</th>
           <th rowspan="2" class="label th25" :class="{'jy': hasIntersection(zk_codes.jy, ['QKDJ', 'YHDJ']), 'qz': hasIntersection(zk_codes.qz, ['QKDJ', 'YHDJ'])}">切口愈合等级</th>
           <th rowspan="2" class="label th25" :class="{'jy': judgeZD(zk_codes.jy, 'HOCUS_WAY_ID'), 'qz': judgeZD(zk_codes.qz, 'HOCUS_WAY_ID')}">麻醉方式</th>