Squashed commit of the following:

commit 6128ecada6898bc1627a9d21a67304d9f6bcb0c3
Author: liucf <liucf@zjlantone.com>
Date:   Thu Sep 19 14:19:08 2019 +0800

    术语关联维护搜索新增入参

commit fbbd2716c5dfd95984a57df186ddaefce5a9a27c
Merge: 1fb22d7 c33f506
Author: liucf <liucf@zjlantone.com>
Date:   Thu Sep 19 13:28:40 2019 +0800

    Merge branch 'dev' of http://192.168.2.236:10080/zhouna/platformFront into dev

commit 1fb22d74de2a3cd90b8913eb0eae310aae13defa
Author: liucf <liucf@zjlantone.com>
Date:   Thu Sep 19 13:28:31 2019 +0800

    bug2348

commit c33f506f7a58fad623b29f913b5ffbe69aa0a6c8
Author: zhouna <zhouna@zjlantone.com>
Date:   Thu Sep 19 11:44:40 2019 +0800

    预问诊-独立填写单时间控件类型添加

commit b764b3e31d965d56809482251e2d35f6b6bc8967
Author: liucf <liucf@zjlantone.com>
Date:   Thu Sep 19 09:46:01 2019 +0800

    2334

commit 857e9fac1b1fff3f93bb2dd07ac016e7fde7bc69
Merge: 86ee5ac 049a72f
Author: liucf <liucf@zjlantone.com>
Date:   Wed Sep 18 13:28:40 2019 +0800

    Merge branch 'dev' of http://192.168.2.236:10080/zhouna/platformFront into dev

commit 86ee5ac0618dd57d6b029547602cd8b3c1faeaf0
Author: liucf <liucf@zjlantone.com>
Date:   Wed Sep 18 13:28:30 2019 +0800

    术语命名维护-诊断添加科室类型

src/api/config.js

@@ -217,6 +217,7 @@ export default {
     'relationContactDetail': 'api/knowledgeman/multContact/relationContactDetail', //知识库标准化-医学术语多层关联维护-详情
     'addMultRelation': 'api/knowledgeman/multContact/addRelation', //知识库标准化-医学术语多层关联维护-添加或者编辑
     'reloadLib': 'api/knowledgeman/reload/createFile', //术语命名-加载词库
+    'getDeptList': '/api/knowledgeman/concept/getConceptListByType', //术语命名-诊断-科室
 	  /*********预问诊相关接口**********/
 	  'questionList':'/api/precman/questionInfo_prec/page',     //预问诊-填写单列表
     'questionAdd':'/api/precman/questionInfo_prec/saveOrUpdate',      //预问诊-填写单添加

src/api/icss.js

@@ -421,4 +421,7 @@ export default {
     reloadLib() {    //医学术语命名维护-加载词库
         return axios.post(urls.reloadLib)
     },
+    getDeptList(param) {    //医学术语命名维护-添加-获取科室
+        return axios.post(urls.getDeptList,param)
+    },
 }

src/components/icss/AddConceptRelation.vue

@@ -170,17 +170,18 @@ export default {
             this.$router.go(-1);
           },
           searchDiag() {
-          const param = {
-            "name": this.searchDiagVal,
-            "relationId": 17,
-            "relationPosition": 1,
-            "typeId":this.conceptType
-          }
-          api.getConceptInfoAssay(param).then((res)=>{
-           if(res.data.code === '0') {
-             this.conceptList = res.data.data
-           }
-       })
+            const param = {
+              "name": this.searchDiagVal,
+              "relationId": 17,
+              "relationPosition": 1,
+              "typeId":this.conceptType,
+              "relationTypeId":this.searchType //9-19新增
+            }
+            api.getConceptInfoAssay(param).then((res)=>{
+             if(res.data.code === '0') {
+               this.conceptList = res.data.data
+             }
+         })
         },
         selectDiag(item) {
           this.form.conceptId = item.conceptId;

src/components/icss/AddMedicalName.vue

@@ -182,6 +182,16 @@
                 @input="inputAge"
               ></el-input>
             </el-form-item>
+            <el-form-item label="科室：" v-if="dioType" class="marT">
+                <el-select v-model="dept">
+                    <el-option v-for="(it,i) in deptList" :label="it.name" :value="it.name"></el-option>
+                </el-select>
+            </el-form-item>
+            <el-form-item label="类型：" v-if="dioType" class="marT">
+                <el-select v-model="dioType">
+                    <el-option v-for="(it,i) in dioTypeList" :label="it.name" :value="it.val"></el-option>
+                </el-select>
+            </el-form-item>
           </el-form> 
         </div>
         <div class="btn">
@@ -243,7 +253,11 @@ import pinyin from '../../js/Convert_Pinyin.js';
         unfit:false, //点确认时是否弹提示,
         saveDisable: false,  //保存按钮禁止点击
         options:[],
-        copy:null
+        copy:null,
+        dioTypeList:[],//更多信息-类型
+        dioType:'', //默认展示一类
+        deptList:[], //更多信息-科室
+        dept:'',  //默认展示全科
       }
     },
     created(){
@@ -263,9 +277,41 @@ import pinyin from '../../js/Convert_Pinyin.js';
         if(newVal && newVal != preVal){
           this.changeState(newVal);
         }
-      }
+      },
     },
     methods:{
+      // 诊断类型下--更多信息-类型
+      getDioType(flag){
+        api.getknowledgeList().then((res)=>{
+          const data = res.data;
+          if(data.code==0){
+            this.dioTypeList = data.data[2];
+            // 修改时无需赋值
+            if(!flag){
+              this.dioType = this.dioTypeList[0].val;
+            } 
+          }
+        })
+      },
+      // 诊断类型下--更多信息-科室
+      getDdeptList(conptId){
+        api.getDeptList({"type":1}).then((res)=>{
+          const data = res.data;
+          if(data.code==0){
+            this.deptList = data.data;
+            if(!conptId){
+              this.dept = "全科"; //默认展示全科
+            }else{
+              // 科室id转成name显示
+              this.deptList.map((v,i)=>{
+                if(v.conceptId==conptId){
+                  this.dept = v.name;
+                }
+              })
+            }
+          }
+        })
+      },
       changeState(val){
         let tmpAllwords = JSON.parse(JSON.stringify(this.synonymous));
         for(let i = 0;i < tmpAllwords.length;i++){
@@ -299,6 +345,13 @@ import pinyin from '../../js/Convert_Pinyin.js';
               this.showMore = result.data.isHasCommon;
               this.maxAge = result.data.maxAge;
               this.minAge = result.data.minAge;
+              const type = result.data.type;
+              if(type == '诊断'){
+                this.dioType = result.data.classify; //类型
+                const deptConptId = result.data.deptId;
+                this.getDioType(true);
+                this.getDdeptList(deptConptId);
+              } 
               // this.sexType = result.data.sexType;
               let sexType = result.data.sexType;
               this.sex.map((v,i)=>{
@@ -543,15 +596,40 @@ import pinyin from '../../js/Convert_Pinyin.js';
               sexCode = v.value;
             }
           })
-          params = {
-            'name':this.data.name,
-            'type':this.data.type,
-            'detailList':detailList,
-            'conceptId':this.copy?'':this.id,//复制当新增，把id置空
-            'sexType':sexCode,
-            'maxAge':this.maxAge,
-            'minAge':this.minAge
+          
+          if(this.dioType){
+            const deptList = this.deptList;
+            let conptId = null;
+            for(let i in deptList){
+              if(deptList[i].name == this.dept){
+                conptId = deptList[i].conceptId;
+              }
+            }
+            params = {
+              "addCptDiseaseExtVO": {
+                "classify": this.dioType,
+                "deptId": conptId
+              },
+              'name':this.data.name,
+              'type':this.data.type,
+              'detailList':detailList,
+              'conceptId':this.copy?'':this.id,//复制当新增，把id置空
+              'sexType':sexCode,
+              'maxAge':this.maxAge,
+              'minAge':this.minAge
+            }
+          }else{
+            params = {
+              'name':this.data.name,
+              'type':this.data.type,
+              'detailList':detailList,
+              'conceptId':this.copy?'':this.id,//复制当新增，把id置空
+              'sexType':sexCode,
+              'maxAge':this.maxAge,
+              'minAge':this.minAge
+            }
           }
+          
         }else{
           params = {
             'name':this.data.name,
@@ -589,6 +667,13 @@ import pinyin from '../../js/Convert_Pinyin.js';
             this.showMore = v.isHasCommon;
           }
         })
+        if(e == '诊断'){
+          this.getDioType();
+          this.getDdeptList();
+        }else{
+          this.dioType = '';
+          this.dept = '';
+        } 
       }
     }
   }
@@ -728,4 +813,7 @@ import pinyin from '../../js/Convert_Pinyin.js';
       margin: 0 35px;
      }
    }
+  /deep/ .marT{
+    margin-top: 20px;
+  }
 </style>

src/components/icss/ConceptRelation.vue

@@ -132,6 +132,8 @@ export default {
   },
     methods: {
         toggTab(item){
+          // bug2348 搜索后切换tab时清空搜索条件
+          this.filter.conceptName = '';
           this.filter.type = item.key;
           this.currentPage = 1;
           this.getDataList();

src/components/icss/MedicalMultRelation.vue

@@ -2,7 +2,7 @@
     <div>
         <crumbs title="分诊人体图数据维护" minWidth="995px">
             <el-form :inline="true" class="demo-form-inline">
-                <el-form-item label="标准术语名词：">
+                <el-form-item label="医学标准术语：">
                     <el-input size="mini" v-model="filter.term" placeholder="输入术语"></el-input>
                 </el-form-item>
                 <el-form-item>

src/components/preTreat/CombinQuestion.vue

@@ -15,8 +15,8 @@
                 <el-form-item label="填写单系统名称：">
                     <el-input size="mini" v-model="filter.tagSysName" placeholder="填写单系统名称" clearable></el-input>
                 </el-form-item>
-                <el-form-item label="填写单界面名称：">
-                    <el-input size="mini" v-model="filter.name" placeholder="填写单界面名称" clearable></el-input>
+                <el-form-item label="填写单医生界面名称：">
+                    <el-input size="mini" v-model="filter.name" placeholder="填写单医生界面名称" clearable></el-input>
                 </el-form-item>
                 <el-form-item>
                     <el-button size="mini" @click="filterDatas">确认</el-button>
@@ -50,7 +50,7 @@
                 <el-table-column
                         :resizable = "false"
                         prop="name"
-                        label="填写单界面名称">
+                        label="填写单医生界面名称">
                 </el-table-column>
                 <el-table-column
                         :resizable = "false"

src/components/preTreat/PubIndeptQa.vue

@@ -175,7 +175,7 @@
                 ></el-input>
             </el-form-item>
             <el-form-item label="填写单图片内容："
-                          v-if="qaType==1&&form.region2!=4"
+                          v-if="qaType==1&&form.region2&&form.region2!=4&&form.region2!=9"
                           prop="region13">
                 <el-upload
                         :class="form.region13?'upload-hide':''"
@@ -304,10 +304,10 @@
         showFileList:false,
         uploadUrl:config.urls.uploadImg,        //图片上传地址
         labelTypesMaps: {       // 归属和填写单类型限制
-          '1':['1','2','3','5','6','7','8'], //症状情况
-          '51':['1','2','3','4','5','6','7'],    //诊疗情况
-          '3':['1','2','3','5','6','7'],         //其他史
-          '52':['1','2','3','5','6','7']            //补充内容
+          '1':['1','2','3','5','6','7','8','9'], //症状情况
+          '51':['1','2','3','4','5','6','7','9'],    //诊疗情况
+          '3':['1','2','3','5','6','7','9'],         //其他史
+          '52':['1','2','3','5','6','7','9']            //补充内容
         },
         combinLabelMaps:{
           '1':['4'], //症状情况