Merge remote-tracking branch 'origin/new1.1.1'

src/common/PickTime.vue

@@ -12,7 +12,7 @@
 <script type="text/javascript">
   import $ from 'jquery';
   import Picker from './Picker.vue';
-  import carrousel from './PickSlide.vue';
+  // import carrousel from './PickSlide.vue';
   export default {
     name:'PickTime',
     props:{

src/common/UploadImg.vue

@@ -92,7 +92,7 @@ export default {
         var maxSize = 0.5 * 1024; // 4M
         var fileSize = file.size / 1024; //kb 图片大小
         var uploadSrc;
-        var uploadFile;
+        var uploadFile,imgWidth=image.width,imgHeight=image.height;
         // console.log(fileSize,'大小')
         if (fileSize > maxSize) { // 如果图片大小大于4m，进行压缩
           uploadSrc = canvas.toDataURL(file.type, 0.1);
@@ -112,7 +112,7 @@ export default {
           that.$set(that.imgs, key, uploadSrc);
           that.imgLen++;
           // 将图片信息存到store
-          that.$store.commit('setImgFile', { type: that.moduleType, pId: that.item.id, key: key, file: uploadFile })
+          that.$store.commit('setImgFile', { type: that.moduleType, pId: that.item.id, key: key, file: uploadFile,imgWidth:imgWidth, imgHeight:imgHeight})
           that.$store.commit('setImgSrc', { key: key, src: uploadSrc, type: that.moduleType })
           that.$previewRefresh(); //异步获取的图片需要刷新下
         }

src/components/Department.vue

@@ -2,11 +2,12 @@
     <div class="department">
         <div class="departmentView">
             <div class="content">
-                <div class="list" v-for="(item,index) in departmentLis" @click="goStart(index,item.recordTime)" :key="item.hospitalDeptName">
+                <div class="list" v-for="(item,index) in departmentLis" @click="goStart(index,item.recordTime)" :key="index">
                     <div class="top">
                         <p>挂号科室：{{item.hospitalDeptName}} <img src="../images/right.png" alt=""></p>
                     </div>
                     <div class="main">
+                        <p>预约医院：{{item.sonHospitalName?item.sonHospitalName:item.hospitalName}}</p>
                         <p>预约时间：{{item.recordTime}}</p>
                         <p>姓名：{{item.patientName}}</p>
                         <p>病历号：{{item.recordId}}</p>
@@ -146,6 +147,7 @@
                     doctorCode:msg.doctorCode,
                     patientCode:msg.patientCode,
                     recordId:msg.recordId,
+                    sonHospitalCode:msg.sonHospitalCode||'',
                     time:(new Date(time.replace(/\-/g, "/"))).getTime()
                 }
                 localStorage.setItem('loginParam',JSON.stringify(params))//保存登陆信息，扫码进入徐删除该参数
@@ -212,4 +214,6 @@
             }
         }
     }
-</style>
+</style>
+
+

src/components/PathInfo.vue

@@ -131,7 +131,7 @@
       },
       getSysConfig(){
         let query = this.$route.query
-        let hasQuery = JSON.stringify(query) == '{}'
+        let hasQuery = JSON.stringify(query) == '{}';
         const param = {
           'hospitalCode':!hasQuery&&query.hospitalCode||'',
         }

src/components/Preview.vue

@@ -230,7 +230,7 @@ export default {
             let result = data.data;
             for(let i = 0;i < result.length;i++){
               let obg = {}
-              obg.originalImage = result[i].url
+              obg.originalImage = result[i].url+'?width='+imgList[i].imgWidth+'&height='+imgList[i].imgHeight
               obg.originalName = result[i].original
               obg.orderNum = i+1
               obg.type = result[i].type
@@ -255,19 +255,18 @@ export default {
       }
     },
     getDetailText(textArr,flg){
-      console.log(textArr,flg)
       let msg = "",obg={},msgP = "";
       if(flg == 1){
-        for(let k in textArr){
-          let item = textArr[k]
+        // for(let k in textArr){
+          let item = textArr[0];
           if(item.special){
-            msg+=item.name+item.special+(k == textArr.length-1?'':'，')
-            msgP+=item.name+item.specialP+(k == textArr.length-1?'':'，')
+            msg+=item.name+item.special
+            msgP+=item.name+item.specialP
           }else{
-            msg+=item.name+(k == textArr.length-1?'':'，')
-            msgP+=item.name+(k == textArr.length-1?'':'，')
+            msg+=item.name
+            msgP+=item.name
           }
-        }
+        // }
       }else{
         for(let k in textArr){
           if(textArr[k] && Array.isArray(textArr[k])){
@@ -293,15 +292,20 @@ export default {
     },
     saveAllDate() {
       const {pathInfo,symptom,diagnose,others,addContent} = this
+      let tmpSymptom = JSON.parse(JSON.stringify(symptom))
       let detailList = [{type:1},{type:2},{type:3},{type:4}]
       for(let i = 0;i < detailList.length;i++){
         if(i == 0){
-          detailList[0]=this.getDetailText(symptom.choose,1)
+          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 < symptom.text.length;j++){
-            tmpArr.push(symptom.text[j].text)
+          for(let j = 0;j < tmpSymptom.text.length;j++){
+            if(j == 1){
+              let tmpTxt = '伴'+tmpSymptom.text[1].text
+              tmpSymptom.text[1].text = tmpTxt
+            }
+            tmpArr.push(tmpSymptom.text[j].text)
           }
           tmpStr.length>0?tmpArr.push(tmpStr):null
           detailList[1].content=tmpArr.join()

src/components/Symptom.vue

@@ -273,9 +273,9 @@ export default {
         this.$store.commit('setText', { type: moduleCP['symp'], text: (this.chooseSymp.length == 0?'患者出现':'')+item.name,textP: (this.chooseSymp.length == 0?'患者出现':'')+(item.description||item.name), pId: this.questId,idx:this.chooseSymp.length == 0?1:'' });
         api.getById(param).then((res) => {
           const result = res.data;
+          // this.labelDetail = result.data;
           if (result.code == 0) {
             const mapping = result.data.questionMapping;
-            this.labelDetail = result.data;
             if(this.chooseSymp.length == 0){
               result.data.idx = 1
             }
@@ -285,6 +285,7 @@ export default {
               let signNum = 1;//第一个打标的，保存为伴随
               for(let i = 0;i < mapping.length;i++){
                 let tmpMap = mapping[i]
+                tmpMap.slide = 1
                 if(tmpMap.flag == 3 && signNum == 1){
                   ++signNum
                   for(let j = 0;j < tmpMap.questionDetailList.length;j++){
@@ -306,6 +307,8 @@ export default {
               this.$store.commit('setSearchShow', false);
               this.chooseSymp.push(item);
             }
+            result.data.questionMapping = mapping
+            this.labelDetail = result.data;
             const sympText = this.getSympText();
             this.getPush(sympText);
           }
@@ -467,6 +470,8 @@ export default {
 }
 .choose{
   padding-bottom: .2rem;
+  position: relative;
+  left: -0.12rem;
   .choo-symp{
       display: inline-block;
       min-width:2rem;
@@ -474,7 +479,7 @@ export default {
       background: #colors[btn];
       border-radius: .08rem;
       white-space: nowrap;
-      margin: 0 .25rem .3rem 0;
+      margin: 0 .12rem .3rem 0.12rem;
       span{
         display: inline-block;
         vertical-align: top;
@@ -491,9 +496,9 @@ export default {
         height: .74rem;
       }
     }
-    .choo-symp:nth-child(3n+3){
-      margin-right: 0;
-    }
+    // .choo-symp:nth-child(3n+3){
+    //   margin-right: 0;
+    // }
   .label{
     .label;
   }