Merge branch 'dev5.3.3' into testedMerge

src/components/icss/SimilarListDrag.vue

@@ -19,7 +19,7 @@
             <tr v-for="(item,index) in similarList" :key="item.conceptId">
                 <td>{{index+1}}</td>
                 <td>{{item.name}}</td>
-                <td>{{item.isConceptRemark}}</td>
+                <td>({{item.libType}}){{item.isConceptRemark}}</td>
             </tr>
             </table>
         </div>

src/components/medicalTerm/AddAssistCheckMultRelation.vue

@@ -163,7 +163,7 @@ import apis from '@api/medicalTerm.js';
     },
     methods:{
        allowDrop(draggingNode, dropNode, type) {
-        if(draggingNode.data.parentConceptName !== dropNode.data.parentConceptName){
+        if(draggingNode.level !== dropNode.level){
           return false
         }else{
           return type !== 'inner'

src/components/preTreat/PubIndeptQa.vue

@@ -85,7 +85,7 @@
                             @click="pushSystemName(item.name)">{{item.name}}</li>
                     </ul>
                 </div>
-                <span class="changeTips changeTipsName">
+                <span class="changeTips changeTipsName" v-if="qaType !=='1'">
                     当为症状时，填写单系统名称需要与医学标准术语内容相对应，如果没有可以先在医学标准术语中建立相关信息！未建立相关信息可能会影响系统使用！
                 </span>
             </el-form-item>