Merge branch 'test' into ChronicMag_zxc

src/api/config.js

@@ -120,7 +120,7 @@ export default {
     'delDiscInformation': 'api/knowledgeman/disclaimerInformation/cancelDisclaimerInformations', //免责声明-删除
     'closeInformation': 'api/knowledgeman/disclaimerInformation/endDisclaimerInformations', //免责声明-停用
     'openInformation': 'api/knowledgeman/disclaimerInformation/startDisclaimerInformations', //免责声明-启用
-    'getQuestionInfos': 'api/icssman/moduleInfo/getQuestionInfos', //模板维护标签池数据获取
+    'getQuestionInfos': 'api/icssman/moduleInfo/getQuestionInfos', //模板维护辅检标签池数据获取标准知识库
     'saveModuleInfo': 'api/icssman/moduleInfo/saveModuleInfo', //模板维护新增
     'updateModuleInfo': 'api/icssman/moduleInfo/updateModuleInfo', //模板维护修改
     'getModuleInfoList': 'api/icssman/moduleInfo/getModuleInfoList', //模板维护系统列表
@@ -198,7 +198,7 @@ export default {
     'searchKnowledgeLis': 'api/knowledgeman/scaleContent/index', //量表结构检索
     'getknowledgeList': 'api/knowledgeman/dictionaryInfo/getList', //量表结构字典信息
     'getModuleType': 'api/icssman/moduleInfo/getModuleType',  //模板维护 -- 类型筛选
-	'indexByLexicon': 'api/knowledgeman/commonconcept/indexByLexicon',  //知识库标准化-根据名称和术语库词性类型搜索
+    'indexByLexicon': 'api/icssman/questionInfo/indexByLexicon',  //知识库标准化-根据名称和术语库词性类型搜索
     'getAssaySon': 'api/knowledgeman/lisSonContact/lisSonContactList',  //化验子项维护
     'getAssaySonDetail': 'api/knowledgeman/lisSonContact/relationContactDetail',  //化验子项维护-详情
     'getConceptInfoAssay': '/api/knowledgeman/concept/getAllForRelation',  //化验子项维护-搜索术语
@@ -234,7 +234,7 @@ export default {
   },
   groupParams:[
     {controlType:[1,2],tagType:[1],notTagType:[8]},     //多列多选（杂音/初为）     notTagType为文字标签剔除
-    {controlType:[1,2,5,6,7,11],tagType:[1,2],notTagType:[8]},  //多项统一横铺标签（血压）
+    {controlType:[1,2,5,6,7],tagType:[1,2],notTagType:[8]},  //多项统一横铺标签（血压）
     {controlType:[0,1,2,5,6,7,11],tagType:[1,2],notTagType:[8]},  //症状详细（症状尾巴）
     {controlType:[0,1,2],tagType:[1,2,3,4],notTagType:[2,8]}, //组合项标签（既往史）
     {controlType:[1,6],tagType:[],notTagType:[8]},    //化验组合

src/components/icss/AddMedicalName.vue

@@ -455,9 +455,11 @@ import pinyin from '../../js/Convert_Pinyin.js';
         }
         // 校验是否有名称全为数字
         const pattern = /[^0-9]/g;
-        for(let i=0; i<detailList.length; i++){
-          if(detailList[i].name && !pattern.test(detailList[i].name)){
-            if(!this.unfit){
+        for(let d=0; d<detailList.length; d++){
+          let dname = detailList[d].name;
+          // if(detailList[d].name && !pattern.test(detailList[d].name)){
+          if(dname && !dname.match(pattern)){
+            if(!this.unfit){//避免和失焦事件同事弹出
               this.$message({
                 message:'无法输入纯数字，请输入正确数据！',
                 type:'warning'

src/components/icss/AddMedicalRelation.vue

@@ -72,7 +72,7 @@
         data:{
           startName:'',
           startType:'',
-          relationName:'包含',
+          relationName:'包含于',
           endName:'',
           endType:'',
         },

src/components/icss/BloodPressTagGroup.vue

@@ -295,6 +295,15 @@ export default {
       this.$emit('changeActionData', this.rightTagsList2, false);
     },
     toRightList() {
+      let rLength = this.rightTagsList.length
+      let lLength = this.selectLeftTagsList.length
+      if(rLength + lLength > 9){
+        this.$message({
+          message: '血压类型最多能添加9个标签，已添加'+rLength+'个',
+          type: 'warning'
+        });
+        return;
+      }
       this.rightTagsList.push(...this.selectLeftTagsList);
       let textItem = { text: '', type: 'input' }
       for (let i = 0; i < this.selectLeftTagsList.length; i++) { //选中标签每个前后加入输入框

src/components/icss/ChronicDiseaseAdd.vue

@@ -126,7 +126,7 @@ export default {
       for(let i = 0;i < tmpScale.length;i++){
         tmpScale[i].val = tmpScale[i].type
         tmpScale[i].order = tmpScale[i].orderNo
-        tmpScale[i].name = tmpScale[i].type == 1?'文本模块':'推送模块'
+        tmpScale[i].name = tmpScale[i].type == 0?'文本模块':'推送模块'
       }
       this.contentPool = tmpScale
     }
@@ -139,9 +139,9 @@ export default {
       if(JSON.stringify(tmpLeft) == '{}'){
         return
       }
-      if(tmpLeft.val == 2){
+      if(tmpLeft.val == 1){
         for(let i = 0;i < tmpPool.length;i++){
-          if(tmpPool[i].val == 2){
+          if(tmpPool[i].val == 1){
             // this.$message({
             //   message: '推送模块只能添加一次',
             //   type: 'warning'
@@ -222,9 +222,15 @@ export default {
       }
       api.searchKnowledgeLis({name: this.region}).then((res) => {
         if (res.data.code === '0') {
-          console.log(res)
-          this.AdscriptionsType = res.data.data
+          let result = res.data.data
+          this.AdscriptionsType = result
           this.showLis = this.AdscriptionsType.length > 0
+          if(result.length == 0){
+            this.$message({
+              message: '暂无搜索结果',
+              type: 'warning'
+            });
+          }
         }
       })
     },

src/components/icss/ConceptRelation.vue

@@ -115,7 +115,8 @@ export default {
         },
         modifyRelation(row) {
             const param = {
-              "conceptId": row.conceptId
+              "conceptId": row.conceptId,
+              "relationId":17
             }
             api.getConceptRelationDet(param).then((res) => {
               if(res.data.code=='0'){

src/components/icss/InspactTagGroup.vue

@@ -31,7 +31,7 @@
     </div>
     <div class="bottomPartRight inspectBottomPartRight">
       <p class="poolTitle">操作界面：</p>
-      <ul class="tagList operationPool">
+      <ul class="tagList operationPool operationPools">
             <li class = "tagItem"
                 v-for="(item) in rightTagsList" 
                 :key='item.id'
@@ -42,6 +42,10 @@
             </li>
         </ul>
     </div>
+        <div class="bottomPartMid bottomPartMidss fl" :class="(type == 1 && isSymp == 0)?'':'bottomPartMids'">
+            <p><span class="el-icon-arrow-up" @click="toggleTopDownList(1)"></span></p>
+            <p><span class="el-icon-arrow-down" @click="toggleTopDownList(2)"></span></p>
+        </div>
   </div>
 </template>
 <script>
@@ -118,6 +122,46 @@ export default {
         
     },
     methods: {
+        toggleTopDownList(type){
+          if(this.selectRightTagsList.length == 0 || this.rightTagsList.length == 0){
+            return
+          }
+          const tmpRightSelect = JSON.parse(JSON.stringify(this.selectRightTagsList))
+          const tmpRightLis = JSON.parse(JSON.stringify(this.rightTagsList))
+          const numLen = tmpRightLis.length
+          const numId = tmpRightSelect[0].id
+          if(type == 1){
+            for(let i = 0;i < tmpRightLis.length;i++){
+              if(numId === tmpRightLis[i].id){//选中的是第几个
+                if(i == 0){//第一个不能往上移动
+                  return;
+                }else{//先把这个元素从数组中删除，再添加到数组里
+                  let tmp1 = tmpRightLis[i]
+                  tmpRightLis.splice(i,1)
+                  tmpRightLis.splice(i-1,0,tmp1)
+                  this.rightTagsList = [...tmpRightLis]
+                  this.$emit('changeActionData',this.rightTagsList, false);
+                  return
+                }
+              }
+            }
+          }else if(type == 2){
+            for(let i = 0;i < tmpRightLis.length;i++){
+              if(numId === tmpRightLis[i].id){
+                if(i == numLen){
+                  return;
+                }else{
+                  let tmp1 = tmpRightLis[i]
+                  tmpRightLis.splice(i,1)
+                  tmpRightLis.splice(i+1,0,tmp1)
+                  this.rightTagsList = [...tmpRightLis]
+                  this.$emit('changeActionData',this.rightTagsList, false);
+                  return
+                }
+              }
+            }
+          }
+        },
         selectLeftTag(tag, index, e) {
             const hasTag = this.isHasTag(tag, this.selectLeftTagsList)
             if (hasTag) {
@@ -131,7 +175,9 @@ export default {
             if (hasTag) {
                 this.selectRightTagsList = this.selectRightTagsList.filter(item => item.id !== tag.id)
             } else {
-                this.selectRightTagsList.push(tag);
+                let tmpArr = [];
+                tmpArr.push(tag);
+                this.selectRightTagsList=tmpArr;
             }
             
         },
@@ -218,6 +264,9 @@ export default {
 <style lang="less" >
 @import '../../less/common.less';
 .symptomTagGroupWrapper {
+  .operationPools {
+    width: 100% !important;
+  }
     .bottomPartLeft {
         width: 30%;
         box-sizing: border-box;

src/components/icss/NoiseTemplate.vue

@@ -136,7 +136,8 @@ export default {
     if(isEdit){
       this.txt = '标签组维护-修改标签组';
       this.editData = data;
-      // console.log('回读数据', this.editData)
+      this.form.currentOrder = data.textGenerate+''
+      // console.log('回读数据', data)
     }
   },
   computed: {
@@ -146,7 +147,8 @@ export default {
   },
   watch: {
     newSign(nextVal, prevVal) {
-      if (nextVal != prevVal) {
+      const {isEdit} = this.$route.params;
+      if (nextVal != prevVal && !isEdit) {
         this.form.currentOrder = '0'
       }
     },

src/components/icss/PubIndeptTag.vue

@@ -506,7 +506,8 @@
           }
           let params = {
             "libType": tmpArr,
-            "name": this.form.region3
+            "name": this.form.region3,
+            "type":this.form.region1
           }
           api.indexByLexicon(params).then((res) => {
             if (res.data.code === '0') {

src/components/icss/PubTagGroup.vue

@@ -458,7 +458,8 @@ export default {
         }
         let params = {
           "libType": tmpArr,
-          "name": this.form.region3
+          "name": this.form.region3,
+          "type":this.form.region1
         }
         api.indexByLexicon(params).then((res) => {
           if (res.data.code === '0') {

src/components/icss/PubTemplateGroup.vue

@@ -147,7 +147,7 @@ export default {
   watch: {
     tmpType(newVal, preVal){
       if(newVal != preVal){
-        if(newVal == 1){
+        if(newVal == 1){//科室
           let tmpDeptDTOS = this.deptDis.deptDTOS
           // let obj = {id:-1,name:'通用'}
           // if(tmpDeptDTOS[0].id != 0){
@@ -158,7 +158,7 @@ export default {
             this.form.region4 = ''
             this.form.region1 = ''
           }
-        }else if(newVal == 2){
+        }else if(newVal == 2){//慢病
           let tmpDisDTOS = this.deptDis.disDTOS
           // let obj = {id:-1,name:'通用'}
           // if(tmpDisDTOS[0].id != 0){
@@ -222,7 +222,9 @@ export default {
           if (res.data.code === '0') {//获取科室和疾病所有信息
             let result = res.data.data
             this.deptDis = result
-            this.sonLis = result.deptDTOS
+            if(this.editData.id){
+              this.sonLis = result.deptDTOS
+            }
           }
         })
       },

vue.config.js

@@ -1,6 +1,6 @@
 const path = require('path');
-const proxy_path = 'http://192.168.2.236:80';
-// const proxy_path = 'http://192.168.2.241:88';
+// const proxy_path = 'http://192.168.2.236:80';
+const proxy_path = 'http://192.168.2.241:88';
 // const proxy_path = 'http://192.168.2.236:88';
 // const proxy_path = 'http://192.168.3.101:5050';
 // const proxy_path = 'http://192.168.3.117:5050';//周铁刚