Squashed commit of the following:

commit 8301c9a59087b33c5a3e2383fbaf883721075ec9
Author: liucf <liucf@zjlantone.com>
Date:   Mon Sep 23 11:03:15 2019 +0800

    化验子项详情接口入参修改

commit 0076083cf77d1204030848de25a2ad7b36f142f7
Author: zhangxc <zhangxc@zjlantone.com>
Date:   Mon Sep 23 10:12:42 2019 +0800

    分诊人体图修改详情参数修改

commit 08491601aa4eba442583cf6857c3569be719107a
Merge: 09e2a7d 0b7dc53
Author: zhangxc <zhangxc@zjlantone.com>
Date:   Fri Sep 20 16:59:35 2019 +0800

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

commit 09e2a7d40f09b5ef842b078caeda204ca4f336d2
Author: zhangxc <zhangxc@zjlantone.com>
Date:   Fri Sep 20 16:58:50 2019 +0800

    人体分诊图删除修改参数修改

commit 0b7dc53d74bb086a79bc38b96967be0be1be8805
Merge: 8039ce5 4a51b1e
Author: liucf <liucf@zjlantone.com>
Date:   Fri Sep 20 16:52:03 2019 +0800

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

commit 8039ce5b4b4e8fb64aa6c0ea90f919ff69b313b7
Author: liucf <liucf@zjlantone.com>
Date:   Fri Sep 20 16:51:52 2019 +0800

    术语关联

commit 4a51b1e49ed7bf1adc46d2cb1f6c4a2f3b5480c6
Author: zhangxc <zhangxc@zjlantone.com>
Date:   Fri Sep 20 16:02:43 2019 +0800

    人体分诊图修改参数变更

commit 9ab66387f58b1e30a4b80f8b35ab58ceb4d9a3f1
Merge: 99b196b d15315f
Author: zhangxc <zhangxc@zjlantone.com>
Date:   Fri Sep 20 15:52:18 2019 +0800

    Merge branch 'test' into dev

commit 99b196bdfda74bda873c61d71b5b6b4555e3e2ff
Author: liucf <liucf@zjlantone.com>
Date:   Fri Sep 20 15:45:48 2019 +0800

    术语关联维护新增入参

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/components/icss/AddConceptRelation.vue

@@ -330,7 +330,8 @@ export default {
         const param ={
           "conceptId": this.form.conceptId,
           "nodeList": this.nodeList,
-          "sonRelationId": 17
+          "sonRelationId": 17,
+          "sonTypeId":this.searchType //9-20新增
         }
         this.showConfirmDialog('是否建立该关联？', () => {
           this.saveDisable = true;  //提交保存按钮不可点击，返回结果时才可点击，防止频繁发送请求

src/components/icss/AssaySon.vue

@@ -143,7 +143,9 @@
         modifyRelation(row) {
             const param = {
                 conceptId: row.conceptId,
-                relationId:18
+                // relationId:18
+                relationIds:[18], //9-23后台修改
+                typeIds:[13]
             }
             api.getAssaySonDetail(param).then((res) => {
                 if(res.data.code == '0') {

src/components/icss/ConceptRelation.vue

@@ -160,9 +160,14 @@ export default {
           this.$router.push({name:'AddConceptRelation',params:pam})
         },
         modifyRelation(row) {
+          const typeL = this.filter.type.toString().split('101');
+          const typeId = [];
+          typeId[0] = +typeL[1];
             const param = {
               "conceptId": row.conceptId,
-              "relationId":17
+              // "relationId":17
+              "relationIds":[17],//9-20新增
+              "typeIds":typeId
             }
           const pam = this.searched ? {
             currentPage: this.currentPage,
@@ -223,10 +228,14 @@ export default {
         },
         showDelDialog(row){
           this.showConfirmDialog('是否删除该关联？',()=>{
+            const typeL = this.filter.type.toString().split('101');
+            const typeId = [];
+            typeId[0] = +typeL[1];
             const param = {
               "conceptId": row.conceptId,
-              "isDeleted": row.isDeleted=== 'N'?'Y':'N',
-              "relationId": 17
+              // "isDeleted": row.isDeleted=== 'N'?'Y':'N',
+              "relationIds":[17],//9-20新增
+              "typeIds":typeId
             }
             api.delConceptRelation(param).then((res)=>{
               if(res.data.code=='0'){

src/components/icss/MedicalMultRelation.vue

@@ -7,7 +7,7 @@
                 </el-form-item>
                 <el-form-item>
                     <el-button size="mini" @click="filterDatas">确认</el-button>
-                    <!-- <el-button size="mini" type="warning" style="margin:0 10px"  @click="addMedicalMultR">添加</el-button> -->
+                    <el-button size="mini" type="warning" style="margin:0 10px"  @click="addMedicalMultR">添加</el-button>
                 </el-form-item>
             </el-form>
         </crumbs>
@@ -53,8 +53,8 @@
                         label="操作" width="160">
                     <template slot-scope="scope">
                         <el-button type="text" size="small" :disabled="scope.row.isDeleted != 'N'" @click="toEditProduct(scope.row)">修改</el-button>
-                        <!-- <span style="margin:0 3px;">|</span>
-                        <el-button type="text" size="small" :class="scope.row.isDeleted == 'N'?'delete':'review'" @click="showDelDialog(scope.row)">{{scope.row.isDeleted == 'N'?'删除':'恢复'}}</el-button> -->
+                        <span style="margin:0 3px;">|</span>
+                        <el-button type="text" size="small" :class="scope.row.isDeleted == 'N'?'delete':'review'" @click="showDelDialog(scope.row)">{{scope.row.isDeleted == 'N'?'删除':'恢复'}}</el-button>
                     </template>
                 </el-table-column>
             </el-table>
@@ -129,7 +129,8 @@
       toEditProduct(row){
         const param = {
           conceptId: row.conceptId,
-          relationId: 17
+          relationIds: [17,17],
+          typeIds: [3,1]
         };
         const pam = this.searched ? {
           currentPage: this.currentPage,
@@ -231,8 +232,9 @@
         }*/
         const param = {
           conceptId:item.conceptId,
-          isDeleted:item.isDeleted === 'N'?'Y':'N',
-          relationId: 17
+          // isDeleted:item.isDeleted === 'N'?'Y':'N',
+          relationIds: [17],
+          typeIds: [3,1]
         }
         let waringTxt = '是否删除该关系，可能对现有系统造成影响'
         this.showConfirmDialog(waringTxt,()=>{