Browse Source

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

陈少旭 2 months ago
parent
commit
0510a44419

+ 3 - 1
src/xt_pages/dialysis/template/DialysisPrintOrderSop.vue View File

105
                 <div style="line-height:30px;">
105
                 <div style="line-height:30px;">
106
                  <span v-if="org_id != 9779">处方脱水量: {{ prescription.prescription_water ? prescription.prescription_water : "" }} ml&nbsp;&nbsp;</span> 
106
                  <span v-if="org_id != 9779">处方脱水量: {{ prescription.prescription_water ? prescription.prescription_water : "" }} ml&nbsp;&nbsp;</span> 
107
                  <span v-if="org_id == 9779">目标脱水量:{{ prescription.target_ultrafiltration ? prescription.target_ultrafiltration : "" }} L&nbsp;&nbsp;</span>
107
                  <span v-if="org_id == 9779">目标脱水量:{{ prescription.target_ultrafiltration ? prescription.target_ultrafiltration : "" }} L&nbsp;&nbsp;</span>
108
-                 <span>透析液流量: {{ prescription.dialysate_flow ? prescription.dialysate_flow : "" }} </span>ml/h
108
+                 <span>透析液流量: {{ prescription.dialysate_flow ? prescription.dialysate_flow : "" }} </span>
109
+                  <span v-if="org_id !=9779">ml/h</span>
110
+                  <span v-if="org_id ==9779">ml/min</span>
109
                 </div>
111
                 </div>
110
               </td>
112
               </td>
111
               <td >
113
               <td >

+ 3 - 0
src/xt_pages/dialysis/template/DialysisPrintOrderThirtyOne.vue View File

1435
           if (prescription.anticoagulant == 7) {
1435
           if (prescription.anticoagulant == 7) {
1436
             prescription.anticoagulant = '低分子肝素钠'
1436
             prescription.anticoagulant = '低分子肝素钠'
1437
           }
1437
           }
1438
+          if (prescription.anticoagulant == 15) {
1439
+            prescription.anticoagulant = '甲磺酸萘莫司他'
1440
+          }
1438
           if (prescription.blood_access === 1) {
1441
           if (prescription.blood_access === 1) {
1439
             prescription.blood_access = '正常'
1442
             prescription.blood_access = '正常'
1440
           }
1443
           }

+ 3 - 1
src/xt_pages/outpatientCharges/listTemplate/batch_listPrint.vue View File

172
       list_batch(this.list_id).then(res =>{
172
       list_batch(this.list_id).then(res =>{
173
         console.log('res',res);
173
         console.log('res',res);
174
         this.list_arr = res.data.data.orders
174
         this.list_arr = res.data.data.orders
175
+        console.log("listArr=======",this.list_arr)
175
         for(let x in this.list_arr){
176
         for(let x in this.list_arr){
176
           this.list_arr[x]['lists']=[]
177
           this.list_arr[x]['lists']=[]
177
           for (let i = 0; i < this.list_arr[x].order_info.length; i++) {
178
           for (let i = 0; i < this.list_arr[x].order_info.length; i++) {
194
               obj['unit'] =  infos.project.project.unit
195
               obj['unit'] =  infos.project.project.unit
195
               obj['is_total']= 0
196
               obj['is_total']= 0
196
               obj['record_date'] = infos.project.record_date
197
               obj['record_date'] = infos.project.record_date
198
+              obj['spec'] = ""
197
 
199
 
198
             }else if (infos.project.type == 3){
200
             }else if (infos.project.type == 3){
199
               obj['name'] = infos.project.good_info.good_name
201
               obj['name'] = infos.project.good_info.good_name
200
-              obj['spec'] = ""
202
+              obj['spec'] = infos.project.good_info.specification_name
201
               obj['code'] = infos.project.good_info.medical_insurance_number
203
               obj['code'] = infos.project.good_info.medical_insurance_number
202
               obj['unit'] = infos.project.good_info.packing_unit
204
               obj['unit'] = infos.project.good_info.packing_unit
203
               obj['is_total']= 0
205
               obj['is_total']= 0