Browse Source

Merge remote-tracking branch 'origin/dev5.3.1' into test

zhouna 6 years ago
parent
commit
93126a367c

+ 4 - 1
src/api/utils.js

@@ -203,7 +203,8 @@ export default {
       "labelPrefix":'prefix',                                 //前缀
       "labelSuffix":'suffix',                                 //后缀
       "maxValue":'maxNormalVal',                                 //前缀
-      "minValue":'minNormalVal'                                 //后缀
+      "minValue":'minNormalVal',                                 //后缀
+      "specFlag": 'specFlag' //标记状态(0:没有标记,1:主诉高亮,2:诱因记录)
     };
     if (tagFlag == 2) {
       maps["tagType"] = 'region2'
@@ -272,6 +273,8 @@ export default {
       //controlType:isDpt?'region2':'',
       type:'region1',
       url:'region13',
+      specFlag:'specFlag',
+      required: 'required'
     };
     isDpt?maps.controlType = 'region2':maps.tagType = 'region2';
     let obj = {};

+ 1 - 0
src/components/icss/AddIndeptLabel.vue

@@ -173,6 +173,7 @@
             "labelSuffix":this.dataPub.suffix,                                 //后缀
             "minValue": this.dataPub.minNormalVal,        //化验最小正常值
             "maxValue": this.dataPub.maxNormalVal,         //化验最大正常值
+            "specFlag": this.dataPub.specFlag,  //标记状态(0:没有标记,1:主诉高亮,2:诱因记录)
             "questionDetails": this.options,
             "questionMappings": [],      //映射关系,
             "formulaCode": isEdit?data.formulaCode : ''

+ 18 - 0
src/components/icss/PubIndeptTag.vue

@@ -150,6 +150,19 @@
                   v-if="form.region1 == 5"
                   class="changeTips changeTipsName"
                 >标签界面名称需要与医学标准术语内容相对应,如果没有可以先在医学标准术语中建立相关信息!未建立相关信息可能会影响系统使用!当为化验推送项时标签界面名称应当检索医学术语库内容;</span>
+                <!-- 诱因记录暂时不做 -->
+                <!-- <span
+                  v-if="form.region1 == '1'&&form.region2 == '1'"
+                  class="changeTips changeTipsName checkSpecFlag"
+                >
+                   <el-checkbox v-model="form.specFlag"  label="诱因记录" true-label="2" false-label="0"  @change="sendData"></el-checkbox>
+                </span> -->
+                <span
+                  v-if="form.region1=='1'&&form.region2=='5'"
+                  class="changeTips changeTipsName checkSpecFlag"
+                >
+                   <el-checkbox v-model="form.specFlag" label="是否高亮" true-label="1" false-label="0"  @change="sendData"></el-checkbox>
+                </span>
             </el-form-item>
             <el-form-item
                     label="标签前后缀:"
@@ -347,6 +360,7 @@
           maxNormalVal: '',       //化验正常值最大值
           region12: '0',        //是否为查体推送   
           region13:'',
+          specFlag :'0',        //标记状态(0:没有标记,1:主诉高亮,2:诱因记录)
           prefix:'',            //前缀
           suffix:'',            //后缀
           tipLis:[],           //提示列表
@@ -642,6 +656,7 @@
         this.form.maxNormalVal = ''
         this.form.region5 = ''
         this.form.region12 = '0'
+        this.form.specFlag = '0'
         this.systemNameShow = false
         this.interfaceNameShow = false
       },
@@ -715,6 +730,9 @@
     .changeTips {
         width: 200%;
     }
+    .checkSpecFlag {
+      top: 5px;
+    }
     }
 </style>
 

+ 2 - 0
src/components/preTreat/AddSimpleQuestion.vue

@@ -139,6 +139,8 @@
             "ageEnd": this.dataPub.region9,              //最大年龄
             "itemType" :this.dataPub.region12,           //是否为主要内容
             "url":this.dataPub.region13,                  //上传图片
+            "specFlag": this.dataPub.specFlag,            //是否拼接到主诉
+            "required": this.dataPub.required,             //必填
             "questionDetails": this.options,                //明细项
             //"questionMappings": [],      //映射关系,
           }

+ 18 - 0
src/components/preTreat/PubIndeptQa.vue

@@ -100,6 +100,19 @@
                         @change="sendData"
                 ></el-input>
             </el-form-item>
+          <el-form-item  v-if="qaType =='1' && form.region2 != '4' || qaType =='1' &&form.region1=='1'&&form.region2=='1'">
+            <span
+                  v-if="qaType =='1' && form.region2 != '4'"
+                >
+                   <el-checkbox v-model="form.required"  label="必填" true-label="1" false-label="0"  @change="sendData"></el-checkbox>
+                </span>
+                <span
+                 class = "flagBox"
+                  v-if="qaType =='1' &&form.region1=='1'&&form.region2=='1'"
+                >
+                   <el-checkbox v-model="form.specFlag" label="拼接到主诉" true-label="1" false-label="0"  @change="sendData"></el-checkbox>
+                </span>
+          </el-form-item>
             <el-form-item
                     v-if="qaType==2"
                     label="填写单患者界面展示通俗内容:"
@@ -276,6 +289,8 @@
           region9: '200',         //最大年龄
           region12: '0',        //是否为主要内容
           region13:'',          //上传图片
+          specFlag:'0',         //拼接到主诉
+          required: '0',        //必填
         },
         //isNeedSearch: false, //是否需要查询(系统名称)
         imgList:[],
@@ -577,5 +592,8 @@
     .upload-hide .el-upload--picture{
         display: none;
     }
+    .flagBox {
+      margin-left: 20px;
+    }
 </style>