1

src/xt_pages/outpatientCharges/summary.vue

@@ -6,7 +6,7 @@
         <div class="app-container">
             <div style="display: flex;justify-content: space-between;margin-bottom:10px;">
                 <div>
-                    <el-input size="small" style="width:150px;" v-model="keywords"
+                    <el-input size="small" style="width:150px;" v-model="keywords" @input="searchAction" @keyup.enter.native='searchAction'
                               class="filter-item"/>
                     <el-button size="small" style="margin-left:10px;" class="filter-item" type="primary"
                                @click="searchAction">

src/xt_pages/outpatientDoctorStation/checkTemplate/printOne.vue

@@ -252,18 +252,40 @@ export default {
      },
 
      getDiagnosis(ids){
-        let id = ids.split(',')
+        let newIds = ids.split(',').sort(function(a,b){
+          return a-b;
+        })
+        
+        let diagnoses = this.diagnoses.sort(this.compare('id'))
         var name = ""
-        for(let i=0;i<this.diagnoses.length;i++){
+        let nameArr = []
+        for(let i=0;i<diagnoses.length;i++){
           // if(id == this.diagnoses[i].id){
           //    name = this.diagnoses[i].class_name
           // }
-          if(id.indexOf(this.diagnoses[i].id.toString()) > -1){
-            name += this.diagnoses[i].class_name + ' '
+          
+          if(newIds.indexOf(diagnoses[i].id.toString()) > -1){
+            // name += diagnoses[i].class_name + ' '
+            nameArr.push(diagnoses[i].class_name)
           }
         }
-        return name
+        let newNameArr = []
+        nameArr.map((item,index) => {
+          if(item == '尿毒症'){
+            newNameArr.push(item)
+            nameArr.splice(index,1,'') 
+          }
+        })
+        newNameArr.push(...nameArr)
+        return newNameArr.join(' ')
      },
+     compare(property) {
+        return function(a,b){
+          var value1 = a[property];
+          var value2 = b[property];
+          return value1 - value2;//升序排序
+        }
+      },
      getPage(){
         this.page = 1
         this.pageArr = []

src/xt_pages/outpatientDoctorStation/template/printThree.vue

@@ -261,18 +261,40 @@ export default {
      },
 
      getDiagnosis(ids){
-        let id = ids.split(',')
+        let newIds = ids.split(',').sort(function(a,b){
+          return a-b;
+        })
+        
+        let diagnoses = this.diagnoses.sort(this.compare('id'))
         var name = ""
-        for(let i=0;i<this.diagnoses.length;i++){
+        let nameArr = []
+        for(let i=0;i<diagnoses.length;i++){
           // if(id == this.diagnoses[i].id){
           //    name = this.diagnoses[i].class_name
           // }
-          if(id.indexOf(this.diagnoses[i].id.toString()) > -1){
-            name += this.diagnoses[i].class_name + ' '
+          
+          if(newIds.indexOf(diagnoses[i].id.toString()) > -1){
+            // name += diagnoses[i].class_name + ' '
+            nameArr.push(diagnoses[i].class_name)
           }
         }
-        return name
+        let newNameArr = []
+        nameArr.map((item,index) => {
+          if(item == '尿毒症'){
+            newNameArr.push(item)
+            nameArr.splice(index,1,'') 
+          }
+        })
+        newNameArr.push(...nameArr)
+        return newNameArr.join(' ')
      },
+     compare(property) {
+        return function(a,b){
+          var value1 = a[property];
+          var value2 = b[property];
+          return value1 - value2;//升序排序
+        }
+      },
      getPage(){
         this.page = 1
         this.pageArr = []

src/xt_pages/outpatientDoctorStation/treatTemplate/printTwo.vue

@@ -395,18 +395,40 @@ export default {
        })
      },
      getDiagnosis(ids){
-        let id = ids.split(',')
+        let newIds = ids.split(',').sort(function(a,b){
+          return a-b;
+        })
+        
+        let diagnoses = this.diagnoses.sort(this.compare('id'))
         var name = ""
-        for(let i=0;i<this.diagnoses.length;i++){
+        let nameArr = []
+        for(let i=0;i<diagnoses.length;i++){
           // if(id == this.diagnoses[i].id){
           //    name = this.diagnoses[i].class_name
           // }
-          if(id.indexOf(this.diagnoses[i].id.toString()) > -1){
-            name += this.diagnoses[i].class_name + ' '
+          
+          if(newIds.indexOf(diagnoses[i].id.toString()) > -1){
+            // name += diagnoses[i].class_name + ' '
+            nameArr.push(diagnoses[i].class_name)
           }
         }
-        return name
+        let newNameArr = []
+        nameArr.map((item,index) => {
+          if(item == '尿毒症'){
+            newNameArr.push(item)
+            nameArr.splice(index,1,'') 
+          }
+        })
+        newNameArr.push(...nameArr)
+        return newNameArr.join(' ')
      },
+     compare(property) {
+        return function(a,b){
+          var value1 = a[property];
+          var value2 = b[property];
+          return value1 - value2;//升序排序
+        }
+      },
      getName(list) {
         console.log('list',list)
         let new_list = []

src/xt_pages/workforce/remind_print_setting.vue

@@ -22,8 +22,8 @@
               <div class="signPrint">
                 <div>分区/床位号:{{main_collection.zone.name}}/{{main_collection.number.number}}</div> 
                 <div>姓名:{{main_collection.patient.name}}</div> 
-                <div>抗凝剂: {{ main_collection.prescription.anticoagulant ? anticoagulants_confit[main_collection.prescription.anticoagulant].name : ''}} </div> 
-                <div>总量:  
+                <div>抗凝剂: {{ main_collection.prescription.anticoagulant ? anticoagulants_confit[main_collection.prescription.anticoagulant].name + ' 5000iu/瓶' : ''}}</div> 
+                <div>用量:  
                   <span v-if="main_collection.prescription.anticoagulant == 1">{{main_collection.prescription.anticoagulant_zongliang?main_collection.prescription.anticoagulant_zongliang+'mg':''}}</span>
                   <span v-if="main_collection.prescription.anticoagulant == 2">{{main_collection.prescription.anticoagulant_zongliang?main_collection.prescription.anticoagulant_zongliang+'iu':''}}</span>
                   <span v-if="main_collection.prescription.anticoagulant == 3">{{main_collection.prescription.anticoagulant_zongliang?main_collection.prescription.anticoagulant_zongliang+'iu':''}}</span>
@@ -32,7 +32,7 @@
                   <span v-if="main_collection.prescription.anticoagulant == 6">{{main_collection.prescription.anticoagulant_zongliang?main_collection.prescription.anticoagulant_zongliang+'iu':''}}</span>
                   <span v-if="main_collection.prescription.anticoagulant == 7">{{main_collection.prescription.anticoagulant_zongliang?main_collection.prescription.anticoagulant_zongliang+'iu':''}}</span>
                 </div> 
-                <div>用法:透析备用</div> 
+                <div>用法:静脉注射</div> 
                 <div>打印时间:{{currentDate}}</div>
               </div>
            </div>