成文修改

src/common/ComTextArea.vue

@@ -57,12 +57,6 @@ export default {
         return {'display':'block'}
       }
     },
-    changeVal(){
-      /*this.$emit('changeAreaVal',this.txt)
-      const newData = Object.assign({},this.item,{value:this.txt,valueP:this.txt});
-      this.$emit("updata",newData);*/
-
-    },
     blur(){
       setTimeout(()=>{
         $(".foot").css({'display':'block'})
@@ -77,7 +71,7 @@ export default {
     },
     makeSuer(){
       let n = this.num;
-      this.$emit("updata",'',this.txt||'无',++n);
+      this.$emit("updata",'',{val:this.txt||'无',valp:this.txt||'无'},++n);
     }
   },
 }

src/common/Input.vue

@@ -1,11 +1,14 @@
 <template>
   <div class="inp-wrap" :style="getStyle(detail,slide)">
-    <input :type="item.controlType==6?'text':'number'" 
-          :class="{'change':borColor}" 
-          v-model="val" 
-          @input="changeVal" 
+    <input :type="item.controlType==6?'text':'number'"
+          :class="{'change':borColor}"
+          v-model="val"
+          @input="changeVal"
           @focus="focus"
           @blur="blur">
+    <div class="realSure sure" @click="makeSuer">
+    确定
+  </div>
   </div>
 </template>
 <script type="text/javascript">
@@ -29,7 +32,7 @@
     data(){
       return{
         msg:"输入框",
-        val: this.item.value || '',
+        val: '',
         borColor:false
       }
     },
@@ -51,8 +54,10 @@
             this.val = e.target.value=e.target.value.replace(/^\.$/,'').slice(0,10)
         }
         this.borColor = false;
-        const newData = Object.assign({},this.item,{value:this.val,valueP:this.val});
-        this.$emit("updata",newData);
+      },
+      makeSuer(){
+        let n = this.num;
+        this.$emit("updata",'',{val:this.val||'无',valp:this.val||'无'},++n);
       },
       blur(){
         setTimeout(()=>{
@@ -83,7 +88,7 @@
 <style lang="less" scoped>
 @import '../less/base.less';
   .inp-wrap{
-    .bgques;    
+    .bgques;
     padding-bottom: 0;
     input{
       width: 100%;

src/common/MultSelect.vue

@@ -93,25 +93,27 @@ export default {
     makeSuer() {
       let result = this.result;
       // if(this.numPlus == 1){
-        let tmpResult=[];
-        for (let i = 0; i < result.length; i++) {
-          const text=result[i].description||result[i].name;
-          const msg = getExpStr(text);
-          if(result[i].name.indexOf("${input")!==-1){
-            tmpResult.push(msg.prefix+(result[i].value||"")+msg.suffix);
-          }else {
-            //tmpIds=tmpIds.concat(result[i].connectId)
-            tmpResult.push(text);
-          }
+      let tmpResult=[],tmpResultp=[];
+      for (let i = 0; i < result.length; i++) {
+        const text=result[i].name;
+        const textp=result[i].description||result[i].name;
+        const msg = getExpStr(text);
+        const msgp = getExpStr(text);
+        if(result[i].name.indexOf("${input")!==-1){
+          tmpResult.push(msg.prefix+(result[i].value||"")+msg.suffix);
+          tmpResultp.push(msgp.prefix+(result[i].value||"")+msgp.suffix);
+        }else {
+          //tmpIds=tmpIds.concat(result[i].connectId)
+          tmpResult.push(text);
+          tmpResultp.push(textp);
+        }
         }
-        //tmpIds=tmpIds.concat(staticArr)
-        //this.connectResult = tmpIds
-        this.contentResult = tmpResult.join(',');
       // }else{
 
       // }
       let number = this.num;
-      this.$emit("updataResult", this.result,  this.contentResult,++number);
+      this.$emit("updataResult", this.symptomResult,  {val:tmpResult.join('、'),valp:tmpResultp.join('、')},++number);
+
     },
     /*selectResult(item,idx) {
       const { exclusion, select } = item;

src/common/Picker.vue

@@ -23,6 +23,7 @@
 export default {
     name:"Picker",
     props: {
+      symptomResult:{default:{}},
       defaultIndex:{default:0},
       num:{default:0},
       defaultVal:{default:"37.3°C"},
@@ -51,7 +52,15 @@ export default {
         },
         onConfirm() {
             let number = this.num;
-            this.$emit('confirm','', this.selectValue, ++number)
+            const value = this.selectValue;
+            if(+this.symptomResult.flag===1){   //为时间控件
+              const orgChoose = this.$store.state.symptom.choose;
+              orgChoose[0].special = value;
+              orgChoose[0].specialP = value;
+              this.$store.commit('setChoose', { choose: orgChoose, type: 1 });
+            }
+            this.$emit('confirm','', {val:value,valp:value,flag:this.symptomResult.flag}, ++number)
+
         },
 
     }

src/common/PushSymptom.vue

@@ -52,7 +52,7 @@
     mounted() {
       //this.numPlus = this.num
       //this.result = this.symptomResult.questionDetailList;
-      this.getPush(this.chooseSymp.name);
+      this.getPush(this.chooseSymp[0].name);
     },
     methods: {
       getSympText() {//推送使用医生端信息
@@ -107,15 +107,19 @@
       makeSuer() {
         if(!this.selecteds.length>0){return}
         let number = this.num;
-        this.$emit("updataResult", '',this.selectedsName,++number);
+        this.$emit("updataResult", '',{val:this.selectedsName,valp:this.selectedsNamep,idx:2},++number);
+        this.$store.commit("setChoose",{choose:[...this.chooseSymp,...this.selecteds]});
       },
       selectResult(item) {
         if(this.selecteds.length>2){
 
         }
-        this.selectedsName = this.selectedsName?this.selectedsName+"、"+item.name:item.name;
+        const name = item.name;
+        const namep=item.description||item.name;
+        this.selectedsName = this.selectedsName?this.selectedsName+"、"+name:name;
+        this.selectedsNamep = this.selectedsNamep?this.selectedsNamep+"、"+namep:namep;
         this.selecteds.push(item);
-        this.getPush(this.chooseSymp.name+this.selectedsName);
+        this.getPush(this.chooseSymp[0].name+this.selectedsName);
       },
       delSelected(item){    //删除已选伴随症状
         const selecteds = JSON.parse(JSON.stringify(this.selecteds));
@@ -124,6 +128,7 @@
         });
         if(inx!==-1){
           this.selectedsName = this.selectedsName.replace(item.name,"").replace("、、","、");
+          this.selectedsNamep = this.selectedsNamep.replace(item.description||item.name,"").replace("、、","、");
           selecteds.splice(inx,1);
         }
         this.selecteds = selecteds;

src/common/Radio.vue

@@ -97,20 +97,30 @@ export default {
     makeSuer() {
       if(!this.sure){return}
       let result = this.result;
-      let number = this.numPlus,tmpResult='';
+      let number = this.numPlus,tmpResult='',tmpResultp='';
       for (let i = 0; i < result.length; i++) {
-          const text=result[i].description||result[i].name;
+          const textp=result[i].description||result[i].name;
+          const text=result[i].name;
           const msg = getExpStr(text);
+          const msgp = getExpStr(text);
           if(result[i].select){
             if(result[i].name.indexOf("${input")!==-1){
               tmpResult=msg.prefix+(result[i].value||"")+msg.suffix;
+              tmpResultp=msgp.prefix+(result[i].value||"")+msgp.suffix;
             }else{
-              tmpResult=text
+              tmpResult=text;
+              tmpResultp=textp;
             }
           }
         }
-        this.contentResult = tmpResult;
-      this.$emit("updataResultSingle", this.result, this.contentResult,++number);
+        if(+this.symptomResult.flag===2){   //为诱因控件
+          const orgChoose = this.$store.state.symptom.choose;
+          orgChoose[0].reason = tmpResult;
+          orgChoose[0].reasonP = tmpResultp;
+          this.$store.commit('setChoose', { choose: orgChoose, type: 1 });
+        }
+        //this.contentResult = tmpResult;
+      this.$emit("updataResultSingle", this.symptomResult, {val:tmpResult,valp:tmpResultp,flag:this.symptomResult.flag},++number);
     },
     selectResult(item,idx) {
       const { select } = item;

src/common/Select.vue

@@ -101,27 +101,31 @@ export default {
       if(!this.sure){return}
       let result = this.result;
       // if(this.numPlus == 1){
-        let tmpResult=[];
+        let tmpResult=[],tmpResultp=[];
         for (let i = 0; i < result.length; i++) {
-          const text=result[i].description||result[i].name;
+          const text=result[i].name;
+          const textp=result[i].description||result[i].name;
           const msg = getExpStr(text);
+          const msgp = getExpStr(text);
           if(result[i].select){
             if(result[i].name.indexOf("${input")!==-1){
               tmpResult.push(msg.prefix+(result[i].value||"")+msg.suffix);
+              tmpResultp.push(msgp.prefix+(result[i].value||"")+msgp.suffix);
             }else {
               //tmpIds=tmpIds.concat(result[i].connectId)
               tmpResult.push(text);
+              tmpResultp.push(textp);
             }
           }
         }
         //tmpIds=tmpIds.concat(staticArr)
         //this.connectResult = tmpIds
-        this.contentResult = tmpResult.join('、')
+        //this.contentResult = tmpResult.join('、')
       // }else{
 
       // }
       let number = this.num;
-      this.$emit("updataResult", this.result,  this.contentResult,++number);
+      this.$emit("updataResult", this.symptomResult,  {val:tmpResult.join('、'),valp:tmpResultp.join('、')},++number);
     },
     selectResult(item,idx) {
       const { exclusion, select } = item;

src/common/TipWarning.vue

@@ -0,0 +1,74 @@
+<template>
+  <div v-if="show" class="tip">{{text}}</div>
+</template>
+<script>
+  export default {
+    props:['timer','text'],
+    data(){
+      return {
+        show:true
+      }
+    },
+    methods:{
+      close(){
+        const that = this;
+        setTimeout(()=>{
+          that.show=false;
+          that.$emit("close");
+        },4000);
+      }
+    }
+  }
+</script>
+<style lang="less" scoped>
+
+  .tip {
+    max-width: 80%;
+    font-size: .28rem;
+    padding: .2rem;
+    border-radius: .1rem;
+    background-color:rgba(0,0,0,0.7);
+    position: fixed;
+    top: 40%;
+    left: 50%;
+    animation:toHidden 4s ease;
+    -moz-animation: toHidden 4s ease;	/* Firefox */
+    -webkit-animation: toHidden 4s ease;	/* Safari 和 Chrome */
+    -o-animation: toHidden 4s ease;
+    transform: translateX(-50%);
+    color: #fff;
+  }
+
+  @keyframes toHidden{
+    from{
+      opacity: 1;
+    }
+    to{
+      opacity: 0;
+    }
+  }
+  @-moz-keyframes toHidden{
+    from{
+      opacity: 1;
+    }
+    to{
+      opacity: 0;
+    }
+  }
+  @-webkit-keyframes toHidden{
+    from{
+      opacity: 1;
+    }
+    to{
+      opacity: 0;
+    }
+  }
+  @-o-keyframes toHidden{
+    from{
+      opacity: 1;
+    }
+    to{
+      opacity: 0;
+    }
+  }
+</style>

src/common/UploadImg.vue

@@ -74,7 +74,7 @@ export default {
   methods: {
     saveAllImage() {
       let n = this.num;
-      this.$emit("updataResult",this.item,this.imgs,++n);
+      this.$emit("updataResult",this.item,{val:this.imgs,valp:this.imgs},++n);
       return;
       let formData = new FormData();
       let imgList = this.$store.state.diagnose.imgFile;

src/common/UsualSymptom.vue

@@ -85,6 +85,8 @@
       selectResult(item,idx){
         this.$emit('selectUsual',item,idx);
         this.$store.commit('setSearchShow', false);
+        this.$store.commit('setText', { type: 1, text: '患者出现'+item.name,textP: '患者出现'+(item.description||item.name),flag:true,arrFlag:true, pId: item.questionId,idx:1 });
+
         let obj = {
               "labelName": item.tagName||item.name,//标签名称
               "operationNum": 1,//次数

src/components/MainPage.vue

@@ -54,7 +54,7 @@
     <!--普通单列拨盘-->
     <Picker v-if="type==10" @confirm="updataResultSingle" :num="num" :defaultIndex = "defaultIndex"></Picker>
     <!--时间拨盘，拨盘内容写死-->
-    <Picker v-if="type == 9" :columns="getTimeColumns()" :defaultVal="pickDVal" @confirm="updataResultSingle" :num="num" :defaultIndex = "defaultIndex"></Picker>
+    <Picker v-if="type == 9" :symptomResult="symptomResult" :columns="getTimeColumns()" :defaultVal="pickDVal" @confirm="updataResultSingle" :num="num" :defaultIndex = "defaultIndex"></Picker>
     <PushSymptom v-if="type == 99" @updataResult="updataResultSingle" :num="num"></PushSymptom>
     <!-- 上传图片 -->
     <UploadImg v-if="type==4"
@@ -78,7 +78,8 @@
     <div class="submit" v-if="showPreview">
       <a href="javascript:void(0)" @click="previewRes">提交并预览</a>
     </div>
-    <div v-if="wrong" class="tip">{{waring}}</div>
+    <!--<div v-if="wrong" class="tip">{{waring}}</div>-->
+    <TipWarning v-if="wrong" :text="waring" @close="closeTip"/>
   </div>
 </template>
 <script>
@@ -96,6 +97,7 @@ import PushSymptom from '../common/PushSymptom.vue';
 import ConfirmBox from '../common/ConfirmBox'
 import UsualSymptom from '../common/UsualSymptom';
 import MultSelect from '../common/MultSelect.vue';
+import TipWarning from '../common/TipWarning.vue';
 import api from "../utils/api.js";
 import {mapState} from 'vuex';
 import {moduleCP} from '@utils/tools'
@@ -114,10 +116,11 @@ export default {
       selectedSymptom:{},
       symptomResult:'',//症状选择
       connectResult:[],//关联问题的id
-      contentResult:'',//选中的结果name
+      contentResult:{},//选中的结果val医生端显示，valp患者端显示
       allquestionLis:[],//症状详情所有的问题
       diagQasList:[], //诊疗详情所有问题
       otherQasList:[],//其他情况所有问题
+      moduleKeys:[1,51,3,52],
       listMap:{
         0:'allquestionLis',
         1:'diagQasList',
@@ -132,8 +135,8 @@ export default {
       order:0,
       userInfo: {}, //用户信息
       pdbm:'8.5rem',
-      waring:'',
-      wrong:false,
+      waring:'',        //错误提示语
+      wrong:false,      //是否显示错误toast
       showConfirm: false,
       time:1000,
     }
@@ -214,11 +217,12 @@ export default {
       this.type = -1;
       let moduleName = this.listMap[this.activeTab];
       let tmpArr = JSON.parse(JSON.stringify(this[moduleName]));
-      tmpArr[num-1].content = contentResult;
+      tmpArr[num-1].content = contentResult.valp;
       /*if(this.symptomResult.id===999999&&contentResult.indexOf("没有")!==-1){   //datas中show要处理
         this[moduleName] = JSON.parse(JSON.stringify(this.$store.state.diagnose.datas));
       }else{*/
         this[moduleName] = tmpArr;
+      this.$store.commit('setText', { type: this.moduleKeys[this.activeTab], text: contentResult.val,textP: contentResult.valp,idx:contentResult.idx,flag:contentResult.flag });
       /*}*/
       console.log(this.$store.state);   //最后一题答完
       if(+num===this[moduleName].length){
@@ -226,6 +230,7 @@ export default {
           this.showPreview=true;
           return;
         }
+        //this.$store.commit('setText', { type: this.moduleKeys[this.activeTab], text: contentResult.val,textP: contentResult.valp, pId: tmpNowItem.questionId,idx:'' });
         const state = this.$store.state;
         this.activeTab++;   //进入下一个阶段问题
         this.num = 0;
@@ -262,9 +267,13 @@ export default {
         this.scroll.scrollTo(0, this.scroll.maxScrollY,500)
       })
     },
+    closeTip(){
+      this.wrong=false;
+    },
     selectUsual(sym){
       this.getSymptomQas(sym.questionId);     //获取症状下的关联问题
-      this.$store.commit('setChoose', { choose: sym, type: moduleCP['symp'] });
+      sym.idx=1;    //标记主诉
+      this.$store.commit('setChoose', { choose: [sym], type: moduleCP['symp'] });
       this.selectedSymptom = sym;   //设置搜索选中症状
       this.showUsual=false; //关闭症状选择进入下一个问题
     },
@@ -282,6 +291,11 @@ export default {
             return ;
           }
           let qaLis = data.questionMapping;
+          if(qaLis.length===0){
+            this.wrong = true;
+            this.waring ='该症状数据未维护';
+            return ;
+          }
           //qaLis.length=2;     //开发测试代码，要删除
           qaLis[0].show=true;   //第一题自动显示
           this.type = qaLis[0].controlType;
@@ -310,7 +324,8 @@ export default {
     PushSymptom,
     ConfirmBox,
     UsualSymptom,
-    MultSelect
+    MultSelect,
+    TipWarning
   }
 }
 </script>
@@ -400,17 +415,6 @@ export default {
     height: 0.8rem;
     margin-right: .24rem;
   }
-}
-.tip {
-  max-width: 80%;
-  padding: .2rem;
-  border-radius: .1rem;
-  background-color:rgba(0,0,0,0.7);
-  position: fixed;
-  top: 40%;
-  left: 50%;
-  transform: translateX(-50%);
-  color: #fff;
 }
   .submit{
     position: fixed;

src/components/Preview.vue

@@ -35,12 +35,13 @@
             <li>
               <h4><i></i> 现病史：</h4>
               <p>
+                  <!-- 患者于时间单位前诱因出现症状，其余题目的内容； -->
+                <span>{{mainText+","}}</span>
                 <template v-for="(value,index) in checkText">
                   <!-- 患者于时间单位前诱因出现症状，其余题目的内容； -->
-                  <span :key="index" v-if="index==0">{{(value.idx==1?'':'伴')+value.textP}}{{checkText.length==1?'':'，'}}</span>
-                  <span :key="index" v-if="index==1">{{(checkText[0].idx == 1?'伴':'')+value.textP}}{{checkText.length==2?'':'、'}}</span>
-                  <span :key="index" v-if="index>1">{{value.textP}}{{index == checkText.length-1?'':'、'}}</span>
+                  <span :key="index" v-if="index>2&&index<checkText.length-1">{{value.textP+","}}</span>
                 </template>
+                <span>{{banText}}</span>
               </p>
               <p><span>{{getDetailText(diagnose.text,false).view}}</span></p>
             </li>
@@ -156,6 +157,11 @@ export default {
       others: othersDate,
       addContent: addContentDate,
       checkText: symptomDate.text, //症状情况文字
+      symChoose:symptomDate.choose,
+      mainText:"",      //患者于**前**出现
+      banText:"",     //伴**
+      mainTextP:"",      //患者于**前**出现
+      banTextP:"",     //伴**
       submit: false,
       showType: 'fail',
       imgList:[],
@@ -192,8 +198,9 @@ export default {
     }
   },
   mounted() {
-    let scroll = setScroll(BScroll,true,'.previewper')
-    this.scroll = scroll
+    let scroll = setScroll(BScroll,true,'.previewper');
+    this.scroll = scroll;
+    this.formatSymText();     //拼出现病史规则句型
   },
   methods: {
     getTime() {
@@ -253,6 +260,22 @@ export default {
       obg.type=flg
       return obg;
     },
+    formatSymText(){
+      const symChoose = this.symptom.choose;
+      const symText = this.symptom.text;
+      const bans = symText[symText.length-1];
+      const call = this.pathInfo.patientAge>18?'患者':'患儿';
+      const times = symChoose[0].special;
+      const reason = symChoose[0].reason;
+      const timesp = symChoose[0].specialP;
+      const reasonp = symChoose[0].reasonP;
+      const timeText = times?"于"+times+"前"+reason+"出现":reason+"出现";
+      const timeTextp = times?"于"+timesp+"前"+reasonp+"出现":reasonp+"出现";
+      this.mainText = call+timeText+symChoose[0].name;
+      this.mainTextP = call+timeTextp+symChoose[0].name;
+      this.banText = bans.text==="无"?"":"伴"+bans.text;
+      this.banTextP = bans.text==="无"?"":"伴"+bans.textP;
+    },
     saveAllDate() {
       const {pathInfo,symptom,diagnose,others,addContent} = this
       let tmpSymptom = JSON.parse(JSON.stringify(symptom))
@@ -261,19 +284,18 @@ export default {
         if(i == 0){
           detailList[0]=this.getDetailText(tmpSymptom.choose,1)
         }else if(i == 1){
-          let tmpArr = []
-          let tmpStr = this.getDetailText(diagnose.text,2).content
-          for(let j = 0;j < tmpSymptom.text.length;j++){
-            if(j == 1){
-              let tmpTxt = '伴'+tmpSymptom.text[1].text
-              tmpSymptom.text[1].text = tmpTxt
+          let tmpArr = [this.mainText];
+          let tmpStr = this.banText;
+          let symText = tmpSymptom.text;
+          for(let j = 1;j < symText.length-1;j++){
+            if(+symText[j].flag!==1&&+symText[j].flag!==2){   //非诱因和时间
+              tmpArr.push(symText[j].text);
             }
-            tmpArr.push(tmpSymptom.text[j].text)
           }
-          tmpStr.length>0?tmpArr.push(tmpStr):null
-          detailList[1].content=tmpArr.join()
-          detailList[1].contentJson=JSON.stringify(tmpArr)
-          detailList[1].contentValue=tmpArr.join()
+          tmpStr?tmpArr.push(tmpStr):null;
+          detailList[1].content=tmpArr.join();
+          detailList[1].contentJson=JSON.stringify(tmpArr);
+          detailList[1].contentValue=tmpArr.join();
         }else if(i == 2){
           detailList[2] = this.getDetailText(others.text,3)
         }else if(i == 3){

src/components/Search.vue

@@ -88,10 +88,11 @@ export default {
       let timer = setTimeout(() => {
         this.$emit('showDetil',item);
         let obj = {
-              "labelName": item.tagName||item.name,//标签名称
-              "operationNum": 1,//次数
-              "operationType": 2,//1常见2搜索
-            }
+          "labelName": item.tagName||item.name,//标签名称
+          "operationNum": 1,//次数
+          "operationType": 2,//1常见2搜索
+        };
+        this.$store.commit('setText', { type: 1, text: '患者出现'+item.name,textP: '患者出现'+(item.description||item.name), pId: item.questionId,idx:'' });
         this.$store.commit('addBuriedSome', obj);
         clearTimeout(timer)
       }, 250);

src/store.js

@@ -277,52 +277,16 @@ const store = new Vuex.Store({
           // 对象易更新但顺序无法控制
           // state.symptom.text = Object.assign({},state.symptom.text,{[param.pId]:param.text});
           let text = state.symptom.text;
-          if(text.length > 0){
-            for(let i in text){
-              // 点完成时才覆盖，单纯点开再关闭不覆盖flag
-              if(text[i].pId==param.pId){
-                if(param.flag){
-                  text.splice(i,1,param);
-                }
-                return
-              }
-            }
-          }
           text.push(param);
           break;
         case moduleCP['diagT']: //诊疗情况
-          let diaText = JSON.parse(JSON.stringify(state.diagnose.text));
-          // 先判断order，然后判断index
-          let item = diaText[param.order];
-          if(item){
-            // 判断是对象还是数组--数组则区分index
-            if(Array.isArray(item)){
-              if(param.flag){//详情完成-覆盖
-                item[param.index] = param;
-              }else{ //直接点label--无则覆盖
-                if(!item[param.index]){
-                  item[param.index] = param;
-                }
-              }
-            }else{
-              if(param.flag){
-                diaText[param.order] = param;
-              }
-            }
-          }else{
-            if(param.arrFlag){
-              let temp = [];
-              temp[param.index] = param;
-              diaText[param.order] = temp;
-            }else{
-              diaText[param.order] = param;
-            }
-          }
-          state.diagnose.text = diaText;
+          let dtext = state.diagnose.text;
+          dtext.push(param);
           break;
         case moduleCP['other']: //其他情况
-          let otherText = JSON.parse(JSON.stringify(state.others.text));
-          let oitem = otherText[param.order];
+          let otherText = state.others.text;
+          otherText.push(param);
+          /*let oitem = otherText[param.order];
           if(oitem){
             // 判断是对象还是数组--数组则区分index
             if(Array.isArray(oitem)){
@@ -347,7 +311,7 @@ const store = new Vuex.Store({
               otherText[param.order] = param;
             }
           }
-          state.others.text = otherText;
+          state.others.text = otherText;*/
           break;
         case moduleCP['suplement']:
           let addText = state.addContent.txt