Merge remote-tracking branch 'origin/testedMerge'

# Conflicts:
#	src/components/diagBase/AddDiagBase.vue
#	src/components/icss/AddMedicalName.vue

src/components/diagBase/AddDiagBase.vue

@@ -130,7 +130,7 @@
                                 :class="{borderRed:item.verifyFormula,inpDisabled:!item.type}"
                                 :title="item.formula" 
                                 v-model.trim="item.formula" 
-                                @input="handleInp(index,$event,'FormulaNumber',item.type)"  
+                                @input="handleInp(index,$event,'FormulaNumber',item.type)"
                                 @focus="clickItem(index,'FormulaNumber')">
                             </el-input>
                         </el-tooltip> 
@@ -147,9 +147,6 @@
             </table>
              <div class="btn clearfix">
                      <div class="btnBox">
-                        <!-- <el-button size="mini" @click="uploadClick">导入</el-button>
-                        <input type="file" name="uploadfile " id="upFile" @change="uploadFile($event)" accept=".csv, application/vnd.ms-excel, application/vnd.openxmlformats-officedocument.spreadsheetml.sheet">
-                          -->
                          <el-button
                                 type="primary"
                                 :disabled = "isReady"
@@ -323,94 +320,6 @@
                 this.disFormulaList.splice(index, 1)
             }
         },
-        //导入
-        // uploadClick() {
-        //     let inp = document.getElementById("upFile");
-        //     inp.click();
-        // },
-        // uploadFile(e){
-        //     let fileInfo = e.target.files[0];
-        //     e.preventDefault();
-        //     let formData = new FormData();
-        //     formData.append('uploadfile', fileInfo);
-        //     const header = {
-        //         headers:{
-        //         'Content-Type': 'multipart/form-data'
-        //         }
-        //     }
-        //     api.importDiagnosticBasis(formData,header).then((res)=>{
-        //         console.log('ress', res)
-        //         if(res.data.code==0){
-        //             const data = res.data.data
-        //             this.warning('上传成功','success')
-        //             let feature = data.feature
-        //             let equation = data.equation
-        //             const featureList = []
-        //             const formulaList = []
-
-        //             if(feature&&feature.length > 0) {
-        //                for(let i = 1; i <feature.length; i++) {
-        //                    const item = {}
-        //                    item.type = '';
-        //                    for (let j = 0; j < this.featureTypeList.length; j++) {
-        //                        if(feature[i].type.indexOf(this.featureTypeList[j].name) > -1) {
-        //                            item.type = this.featureTypeList[j].key
-        //                            break;
-        //                        }
-        //                    }
-                           
-        //                    item.code = feature[i].code
-        //                    item.standard = feature[i].standard
-        //                    item.relation = feature[i].associated
-        //                    if(item.type === 4) {
-        //                        item.result = ''
-        //                    } else {
-        //                         item.result = feature[i].result
-        //                    }
-        //                    featureList.push(item)
-        //                }
-        //             }
-        //             if(equation&&equation.length > 0) {
-        //                for(let i = 1; i <equation.length; i++) {
-        //                    const item = {}
-        //                    item.type = '';
-        //                    for (let j = 0; j < this.formulaTypeList.length; j++) {
-        //                        if(equation[i].type.indexOf(this.formulaTypeList[j].name) > -1) {
-        //                            item.type = this.formulaTypeList[j].key
-        //                            break;
-        //                        }
-        //                    }
-        //                    item.formula = equation[i].associated
-                           
-        //                    formulaList.push(item)
-        //                }
-        //             }
-        //             this.disFeatureList = featureList
-        //             this.disFormulaList = formulaList
-        //             console.log(' this.disFormulaListResult',  this.disFormulaListResult)
-        //         }else{
-        //         /*this.$message({
-        //             dangerouslyUseHTMLString: true,
-        //             message:res.data.msg,
-        //             type:'warning'
-        //         });*/
-        //         this.$alert(res.data.msg,'错误信息',{
-        //             dangerouslyUseHTMLString: true,
-        //             confirmButtonText: '确定',
-        //             callback: action => {
-        //             /*this.$message({
-        //                 type: 'info',
-        //                 message: `action: ${ action }`
-        //             });*/
-        //             }
-        //         });
-        //         }
-        //     })
-            
-        //     //解决上传相同文件不触发change
-        //     let inp = document.getElementById("upFile");
-        //     inp.value = "";   
-        // },
         updateNeo() {
             this.submitForm('updateNeo').then(() => {
                 if(this.hasQuestion == 0) {
@@ -522,22 +431,6 @@
                     errStrList.push(errStr)
                 }
                
-                //导入后判断
-                // let regexPause = new RegExp(`、`)      //判断标准词是否有顿号
-                //  if(disFeatureList[i].standard &&regexPause.test(disFeatureList[i].standard)) {
-                //     disFeatureList[i].verifyStandard ='数据异常'
-                //     const errStr = "疾病特征第" + (i+ 1) +"行标准词数据异常"
-                //     errStrList.push(errStr)
-                // }
-
-                // if(disFeatureList[i].type == '3'&&regexPause.test(disFeatureList[i].relation)) {
-                //     disFeatureList[i].verifyRelation ='数据异常'
-                //     const errStr = "疾病特征第" + (i+ 1) +"行化验关联词数据异常"
-                //     errStrList.push(errStr)
-                // }
-                //导入后判断
-
-
                 if(disFeatureList[i].type == '3' && !disFeatureList[i].result ) { //化验项下面诊断公式如果有用到，判断是否填写结果项
                     const regex2 = new RegExp(`(?<=\\D|\\s?)${disFeatureList[i].code}(?=\\D|\\s?)`)
                     //  const regex2 = new RegExp(`、\\s*、{1,}`) 
@@ -575,7 +468,6 @@
                 }
                 
                 
-                
             }
             this.disFeatureList = JSON.parse(JSON.stringify(disFeatureList))
             let formulaListErrNum = 0
@@ -591,28 +483,6 @@
                         errStrList.push(errStr)
                         formulaListErrNum++;
                    }
-                    
-                    //导入后判断
-                    // if(disFormulaList[i].type == 91) { //确诊中有没有包含其他不可输入内容
-                    //     let regexDisFormula = /[^\u4EFB\u4E00\u4E8C\u4E09\u56DB\u4E94\u516D\u4E03\u516B\u4E5D\u5341\u62df\u8bca0-9\/\.+\(\)\（\）]/g
-                    //     if(regexDisFormula.test(disFormulaList[i].formula)) {
-                    //          disFormulaList[i].verifyFormula = "公式格式错误"
-                    //          const errStr = "诊断公式第" + (i+ 1) +"行公式格式错误,"
-                    //         errStrList.push(errStr)
-                    //         formulaListErrNum++;
-                    //     }
-                    // } else {   //其他诊断中有没有包含其他不可输入内容
-                    // //计算公式只能输入以下内容： 任、一、二、三、四、五、六、七、八、九、十、0-9、/、.、(、)、（、）
-                    //     let regexDisFormula = /[^\u4EFB\u4E00\u4E8C\u4E09\u56DB\u4E94\u516D\u4E03\u516B\u4E5D\u53410-9\/\.+\(\)\（\）]/g
-                    //     if(regexDisFormula.test(disFormulaList[i].formula)) {
-                    //          disFormulaList[i].verifyFormula = "公式格式错误"
-                    //          const errStr = "诊断公式第" + (i+ 1) +"行公式格式错误。"
-                    //         errStrList.push(errStr)
-                    //         formulaListErrNum++;
-                    //     }
-                    // }
-                    //导入后判断
-
                    if(disFormulaList[i].type == 91 && disFormulaList[i].formula.indexOf("拟诊") > -1) { //确诊项如果有拟诊这两个字，判断公式列表中有没有拟诊这项
                        const noError = disFormulaList.filter(item => item.type == 92).length > 0
                        if(!noError) {
@@ -620,7 +490,7 @@
                             const errStr = "诊断公式第" + (i+ 1) +"行公式格式错误"
                             errStrList.push(errStr)
                             formulaListErrNum++;
-                       } 
+                       }
                    }
 
             }
@@ -725,7 +595,7 @@
                 //计算公式确诊只能输入以下内容： 任、一、二、三、四、五、六、七、八、九、十、拟、诊、0-9、/、.、(、)、（、）
                 if(itemType == 91) {
                     this.$nextTick(() => {
-                       
+
                         this.disFormulaList[index].formula =  value.replace(/[^\u4EFB\u4E00\u4E8C\u4E09\u56DB\u4E94\u516D\u4E03\u516B\u4E5D\u5341\u62df\u8bca0-9\/\.+\(\)\（\）]/g,'').replace(/[\（]/g, '(').replace(/[\）]/g, ')').replace(/' '/g, '')
                     })
                 } else {    //计算公式其他只能输入以下内容： 任、一、二、三、四、五、六、七、八、九、十、0-9、/、.、(、)、（、）

src/components/icss/AddMedicalName.vue

@@ -182,7 +182,7 @@
                 @input="inputAge"
               ></el-input>
             </el-form-item>
-            <!--<el-form-item label="科室：" v-if="dioType" class="marT">
+            <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>
@@ -191,7 +191,7 @@
                 <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-item>
           </el-form> 
         </div>
         <div class="btn">
@@ -346,12 +346,12 @@ import pinyin from '../../js/Convert_Pinyin.js';
               this.maxAge = result.data.maxAge;
               this.minAge = result.data.minAge;
               const type = result.data.type;
-              /*if(type == '诊断'){
-                this.dioType = result.data.classify; //类型
+              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)=>{
@@ -596,17 +596,8 @@ 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){
+          
+          if(this.dioType){
             const deptList = this.deptList;
             let conptId = null;
             for(let i in deptList){
@@ -637,7 +628,7 @@ import pinyin from '../../js/Convert_Pinyin.js';
               'maxAge':this.maxAge,
               'minAge':this.minAge
             }
-          }*/
+          }
           
         }else{
           params = {
@@ -676,13 +667,13 @@ import pinyin from '../../js/Convert_Pinyin.js';
             this.showMore = v.isHasCommon;
           }
         })
-        /*if(e == '诊断'){
+        if(e == '诊断'){
           this.getDioType();
           this.getDdeptList();
         }else{
           this.dioType = '';
           this.dept = '';
-        }*/
+        } 
       }
     }
   }
@@ -822,7 +813,7 @@ import pinyin from '../../js/Convert_Pinyin.js';
       margin: 0 35px;
      }
    }
-  /*/deep/ .marT{
+  /deep/ .marT{
     margin-top: 20px;
-  }*/
+  }
 </style>

src/components/icss/MedicineInfoPg.vue

@@ -6,12 +6,12 @@
                 <el-checkbox v-for="it in positions" :key="it.key" :label="it.key">{{it.name}}</el-checkbox>
             </el-checkbox-group>
         </el-form-item>
-        <el-form-item label="是否属于诊断依据：" prop="isReason" label-width="160px">
+        <!-- <el-form-item label="是否属于诊断依据：" prop="isReason" label-width="160px">
             <el-select v-model="data.isReason" placeholder="请选择">
                 <el-option label="否" :value="0"></el-option>
                 <el-option label="是" :value="1"></el-option>
             </el-select>
-        </el-form-item>
+        </el-form-item> -->
         <el-form-item label="标题名称：" prop="title" label-width="160px">
             <el-input v-model="data.title"></el-input>
         </el-form-item>
@@ -99,9 +99,9 @@
         },
         positions:[],               //位置列表
         rules:{
-          isReason: [
-            { required: true, message: '请选择是否属于诊断', trigger: 'change' }
-          ],
+          // isReason: [
+          //   { required: true, message: '请选择是否属于诊断', trigger: 'change' }
+          // ],
           position: [
             { required: true, message: '请选择显示位置', trigger: 'change' }
           ],

src/components/icss/PubIndeptTag.vue

@@ -304,12 +304,12 @@
               ></el-input>
             </el-form-item>
           </div>
-           <!--<el-form-item v-if="form.region1 == 4">
+           <el-form-item v-if="form.region1 == 4">
             <span>
                 <el-checkbox v-model="form.specFlag"  label="是否为生命体征" true-label="4" false-label="0"  @change="sendData"></el-checkbox>
             </span>
                 
-          </el-form-item>-->
+          </el-form-item>
           
         </el-form>
     </div>

src/components/icss/PubTagGroup.vue

@@ -258,11 +258,11 @@
           ></el-option>
         </el-select>
       </el-form-item>
-      <!--<el-form-item v-if="form.region1 == 4">
+      <el-form-item v-if="form.region1 == 4">
           <span>
               <el-checkbox v-model="form.specFlag"  label="是否为生命体征" true-label="4" false-label="0"  @change="sendData"></el-checkbox>
           </span>
-      </el-form-item>-->
+      </el-form-item>
     </el-form>
   </div>
 </template>