Merge branch '20200710_pc_vue_new_branch' of http://git.shengws.com/csx/Vue_New into 20200710_pc_vue_new_branch

src/xt_pages/dialysis/details/dialog/assessmentBeforeDislysisDialog.vue

@@ -694,6 +694,13 @@
         if(this.lastPredialysisEvaluation.catheter_bend == 2){
             this.lastPredialysisEvaluation.catheter_bend = "2"
         }
+        if(this.lastPredialysisEvaluation.is_infect == 1){
+          this.lastPredialysisEvaluation.is_infect ="1"
+        }
+        if(this.lastPredialysisEvaluation.is_infect == 2){
+         this.lastPredialysisEvaluation.is_infect = "2"
+        }
+
          console.log("22222222",this.lastPredialysisEvaluation)
         // console.log("乐行",typeof(this.lastPredialysisEvaluation.is_hemorrhage))
         this.assessment = assessment

src/xt_pages/dialysis/details/dialog/dialysisPrescriptionDialog.vue

@@ -1187,7 +1187,7 @@
             this.InnerDialogProps.values = this.dialyzerPerfusionApparatus
             this.InnerDialogProps.titles = '透析器/灌流器'
             this.InnerDialogProps.type = 'dialyzer_perfusion_apparatus'
-            this.InnerDialogProps.selected = this.dialysisPrescription.dialyzer_perfusion_apparatus
+            this.InnerDialogProps.selected = this.dialysisPrescription.dialyzer_perfusion_apparatus.toUpperCase()
             this.InnerDialogProps.isShowTextArea = false
             break
         }
@@ -1300,12 +1300,19 @@
           'vascular_access_desc'
         )
 
-        // console.log('血管通路', this.blood_access_option)
-        this.dialyzerPerfusionApparatus = getDataConfig(
+         console.log('血管通路', this.blood_access_option)
+         var  dialyzerPerfusionApparatus = getDataConfig(
           'hemodialysis',
           'dialyzer_perfusion_apparatus'
         )
-       console.log('灌流器', this.dialyzerPerfusionApparatus)
+       
+       dialyzerPerfusionApparatus.map(item => {
+         item.name = item.name.toUpperCase()
+       })
+       //去重
+        var arr = this.unique(dialyzerPerfusionApparatus)
+       this.dialyzerPerfusionApparatus = arr
+       console.log('灌流器', arr)
 
         if (this.$route.query && this.$route.query.date) {
           var date = this.$route.query && this.$route.query.date
@@ -3024,7 +3031,11 @@
               }
             }
           })
-      }
+      },
+      unique(arr) {
+        const res = new Map();
+        return arr.filter((arr) => !res.has(arr.name) && res.set(arr.name, 1));
+      },
     },
 
     watch: {

src/xt_pages/dialysis/template/DialysisPrintOrderTwenty.vue

@@ -45,7 +45,7 @@
             <td width="10">床</td>
             <td></td>
 
-            
+
           </tr>
         </tbody>
       </table>
@@ -140,7 +140,7 @@
                     </td>
                     <td width="35">℃</td>
                     <td width='10'></td>
-                    
+
                     <td></td>
                   </tr>
                 </tbody>
@@ -494,7 +494,7 @@
                         <label-box :isChecked="false" showValue="3.0mmol/L"></label-box>
                       )
                     </td>
-                    
+
                     <td></td>
                   </tr>
                 </tbody>
@@ -503,7 +503,7 @@
               <table class="table-box">
                 <tbody>
                   <tr>
-                    
+
                     <td width="70">治疗方式:</td>
                     <td width="50">
                       <label-box :isChecked="prescription.mode_id == 1 ? true : false" showValue="HD"></label-box>
@@ -1223,7 +1223,7 @@ export default {
             this.dialysisOrder.DeviceNumber.number
           );
         }
-        
+
       } else {
         if(this.patientInfo.DialysisSchedule.device_zone.name.indexOf("区") > -1){
           return (
@@ -1236,7 +1236,7 @@ export default {
             this.patientInfo.DialysisSchedule.device_number.number
           );
         }
-        
+
       }
     },
 
@@ -1304,7 +1304,7 @@ export default {
             this.predialysis.blood_access_part_opera_id
           )
           this.afterdialysis = response.data.data.AssessmentAfterDislysis
-          console.log('透后评估数据', this.afterdialysis)
+          // console.log('透后评估数据', this.afterdialysis)
           this.operators = response.data.data.operators
           this.dialysisOrder =
             response.data.data.dialysisOrder === null