XMLWAN пре 2 година
родитељ
комит
47ce935614

+ 32 - 1
src/xt_pages/dialysis/details/dialog/dialysisPrescriptionDialog.vue Прегледај датотеку

@@ -1223,7 +1223,7 @@
1223 1223
   import MsgTip from './MsgTip'
1224 1224
   import request from '@/utils/request'
1225 1225
   import multiSelectBox from './MultiSelectBox'
1226
-
1226
+  const moment = require('moment')
1227 1227
   export default {
1228 1228
     name: 'dialysisPrescriptionDialog',
1229 1229
     components: { MsgTip, multiSelectBox },
@@ -2578,7 +2578,38 @@ mu
2578 2578
 
2579 2579
         this.isVisibility = true
2580 2580
         this.checkedCities = []
2581
+        var total_day = ""
2582
+        if(moment().weekday() == 1){
2583
+           total_day ="周一"
2584
+        }
2585
+        if(moment().weekday() == 2){
2586
+           total_day ="周二"
2587
+        }
2588
+        if(moment().weekday() == 3){
2589
+           total_day ="周三"
2590
+        }
2591
+        if(moment().weekday() == 4){
2592
+           total_day ="周四"
2593
+        }
2594
+        if(moment().weekday() == 5){
2595
+           total_day ="周五"
2596
+        }
2597
+        if(moment().weekday() == 6){
2598
+           total_day ="周六"
2599
+        }
2600
+        if(moment().weekday() == 6){
2601
+           total_day ="周七"
2602
+        }
2603
+        console.log("---------",this.targetAdvices)
2604
+        if(this.targetAdvices!=null && this.targetAdvices.length >0){
2605
+            for (let i = 0; i < this.targetAdvices.length; i++) {
2606
+              if(this.targetAdvices[i].week_day.indexOf(total_day)!=-1){
2607
+                this.targetAdvices[i].isCheck = 1
2608
+              }
2609
+            }
2610
+        }
2581 2611
         for (let i = 0; i < this.targetAdvices.length; i++) {
2612
+         
2582 2613
           if (this.targetAdvices[i].isCheck == 1) {
2583 2614
             this.checkedCities.push(this.targetAdvices[i].id)
2584 2615
           }

+ 1 - 1
src/xt_pages/dialysis/details/dialog/monitor_dialog.vue Прегледај датотеку

@@ -864,7 +864,7 @@
864 864
             width="140"
865 865
             v-if="
866 866
               isShow('KT/V') &&
867
-              (org_id == 9987 || org_id == 10215 || org_id == 9800)
867
+              (org_id == 9987 || org_id == 10215 || org_id == 9800 || org_id == 9598)
868 868
             "
869 869
           >
870 870
             <template slot-scope="scope">

+ 2 - 2
src/xt_pages/dialysis/details/dialysisMonitoring.vue Прегледај датотеку

@@ -44,7 +44,7 @@
44 44
           <th v-if="isShow('肝素量')" width="92px">肝素量(mg)</th>
45 45
           <th v-if="isShow('脱水')" width="92px">脱水(L)</th>
46 46
           <th v-if="isShow('滤前压')" width="92px">滤前压(mmHg)</th>
47
-          <th v-if="isShow('KT/V') && (org_id == 9987 || org_id == 10215 || org_id ==  9800)" width="92px">KT/V</th>
47
+          <th v-if="isShow('KT/V') && (org_id == 9987 || org_id == 10215 || org_id ==  9800 || org_id ==  9598)" width="92px">KT/V</th>
48 48
           <th v-if="isShow('病情变化')" width="92px">病情变化</th>
49 49
 
50 50
           <th v-if="isShow('处理')" width="92px">处理</th>
@@ -96,7 +96,7 @@
96 96
           <th v-if="isShow('肝素量')" width="92px">{{monitor.heparin_amount ? monitor.heparin_amount : ""}}</th>
97 97
           <th v-if="isShow('脱水')" width="92px">{{monitor.dehydration ? monitor.dehydration : ""}}</th>
98 98
           <th v-if="isShow('滤前压')" width="92px">{{monitor.filter_pressure ? monitor.filter_pressure : ""}}</th>
99
-          <td v-if="isShow('KT/V') && (org_id == 9987 || org_id == 10215 || org_id ==  9800)">{{ monitor.ktv?monitor.ktv:""}}</td>
99
+          <td v-if="isShow('KT/V') && (org_id == 9987 || org_id == 10215 || org_id ==  9800 || org_id ==  9598)">{{ monitor.ktv?monitor.ktv:""}}</td>
100 100
           <td v-if="isShow('病情变化')">{{ monitor.symptom }}
101 101
             <span v-if="(index == monitores.length-1) && (org_id == 0 || org_id == 10340)">累计血容量:{{monitor.accumulated_blood_volume }}L</span>
102 102
           </td>

+ 6 - 6
src/xt_pages/outpatientCharges/statementTemplate/printThree.vue Прегледај датотеку

@@ -12,7 +12,7 @@
12 12
                 <div>透析号:<span style="display:inline-block;width:200px;">{{info.patient.dialysis_no ? info.patient.dialysis_no : ''}}</span>
13 13
                 </div>
14 14
                 <div style="margin-left:2px;">电脑号:<span
15
-                        style="display:inline-block;">{{info.psn_no ? info.psn_no : ''}}</span></div>
15
+                        style="display:inline-block;">{{info.new_order.psn_no ? info.new_order.psn_no : ''}}</span></div>
16 16
             </div>
17 17
             <div style="display:flex;justify-content: space-between;">
18 18
                 <div style="display:flex;">
@@ -26,7 +26,7 @@
26 26
                     </div>
27 27
                     <div>费别:<span style="display:inline-block;min-width:80px;">医保</span>
28 28
                     </div>
29
-                    <div>收费日期:<span style="display:inline-block;width:100px;">{{info.setl_time ? info.setl_time.split(' ')[0] : ''}}</span>
29
+                    <div>收费日期:<span style="display:inline-block;width:100px;">{{info.new_order.setl_time ? info.new_order.setl_time.split(' ')[0] : ''}}</span>
30 30
                     </div>
31 31
                 </div>
32 32
                 <div style="float:right">金额单位:元</div>
@@ -130,18 +130,18 @@
130 130
                             <div style="display:flex;flez-wrap:wrap;font-size:16px;">
131 131
                               <div style="width:33%;">医疗救助基金金额:{{info.maf_pay?info.maf_pay:info.new_order.maf_pay}}元</div>
132 132
 
133
-                              <div style="width:33%;">个人支付金额:{{ info.psn_pay?info.psn_pay:info.new_order.psn_pay }}元</div>
134
-                                <div style="width:33%;">个人账户金额:{{info.balc >= 0 ? info.balc : info.new_order.balc}}元</div>
133
+                              <div style="width:33%;">个人支付金额:{{ info.new_order.psn_cash_pay}}元</div>
134
+                                <div style="width:33%;">个人账户金额:{{info.new_order.balc}}元</div>
135 135
                             </div>
136 136
                         </td>
137
-                        <td style="font-size:16px;">合计:{{info.medfee_sumamt?info.medfee_sumamt:info.new_order.medfee_sumamt}}元</td>
137
+                        <td style="font-size:16px;">合计:{{info.new_order.medfee_sumamt}}元</td>
138 138
                     </tr>
139 139
 
140 140
                 </table>
141 141
             </div>
142 142
             <div style="float:right;margin:10px 0;display:flex;">
143 143
                 <div>操作人:<span style="width:100px;display:inline-block;">{{info.p_admin.user_name}}</span></div>
144
-                <div>操作日期:<span style="width:100px;display:inline-block;">{{info.setl_time ? info.setl_time.split(' ')[0] : ''}}</span>
144
+                <div>操作日期:<span style="width:100px;display:inline-block;">{{info.new_order.setl_time ? info.new_order.setl_time.split(' ')[0] : ''}}</span>
145 145
                 </div>
146 146
             </div>
147 147
             <img style="width:100%;" v-if="$store.getters.xt_user.org_id == 10138" src="https://kuyi.shengws.com/bailin/blend.jpg" alt="">

+ 2 - 2
src/xt_pages/workforce/remind_print_setting_one.vue Прегледај датотеку

@@ -383,12 +383,12 @@
383 383
         const style = '@media print {.signPrint{margin-left:30px;} .print_main_content { background-color: white; width:960px;  margin:0 auto; padding: 0 0 20px 0; } .order_title_panl { text-align: center; } .main_title { font-size: 18px; line-height: 40px; font-weight: 500; } .table_panel { } .table { width: 100%; border: 1px solid; border-collapse: collapse; padding: 2px; } thead tr td { border: 1px solid; text-align: center; font-size: 20px; padding: 15px 5px; } tbody tr td { border: 1px solid; text-align: center; font-size: 18px; padding: 10px 5px; } .proj { padding: 5px 0; text-align: left; } .proj_title { font-size: 16px; font-weight: 500; line-height: 25px; } .proj_item { font-size: 15px; line-height: 20px; } .zone_name { font-weight: 500; } .printCell span{display: inline-block;width: 220px;} @page {margin-top:10px;}}'
384 384
         const style1 = '@media print { .print_main_content { background-color: white; width:960px;  margin:0 auto; padding: 0 0 20px 0; } .order_title_panl { text-align: center; } .main_title { font-size: 18px; line-height: 40px; font-weight: 500; } .table_panel { } .table { width: 100%; border: 1px solid; border-collapse: collapse; padding: 2px; } thead tr td { border: 1px solid; text-align: center; font-size: 20px; padding: 15px 5px; } tbody tr td { border: 1px solid; text-align: center; font-size: 18px; padding: 10px 5px; } .proj { padding: 5px 0; text-align: left; } .proj_title { font-size: 16px; font-weight: 500; line-height: 25px; } .proj_item { font-size: 15px; line-height: 20px; } .zone_name { font-weight: 500; } .printCell span{display: inline-block;width: 220px;} @page {margin-top:10px;}}'
385 385
         const style2 = '@media print { .print_main_content { background-color: white; width:960px;  margin:0 auto; padding: 0 0 20px 0; } .page-break-after{page-break-after:always;}.signPrint{width:40%;float: left;margin-left: 5%; -webkit-box-shadow: 0 1px 4px rgba(0, 0, 0, 0.27), 0 0 60px rgba(0, 0, 0, 0.06) inset;-moz-box-shadow: 0 1px 4px rgba(0, 0, 0, 0.27), 0 0 40px rgba(0, 0, 0, 0.06) inset;box-shadow: 0 1px 4px rgba(0, 0, 0, 0.27), 0 0 40px rgba(0, 0, 0, 0.06) inset; margin-bottom: 20px;padding: 20px 10px;} .order_title_panl { text-align: center; } .main_title { font-size: 18px; line-height: 40px; font-weight: 500; } .table_panel { } .table { width: 100%; border: 1px solid; border-collapse: collapse; padding: 2px; } thead tr td { border: 1px solid; text-align: center; font-size: 20px; padding: 15px 5px; } tbody tr td { border: 1px solid; text-align: center; font-size: 18px; padding: 10px 5px; } .proj { padding: 5px 0; text-align: left; } .proj_title { font-size: 16px; font-weight: 500; line-height: 25px; } .proj_item { font-size: 15px; line-height: 20px; } .zone_name { font-weight: 500; } .printCell span{display: inline-block;width: 220px;} @page {margin-top:10px;}}'
386
-        if (this.org_id == 9671 || this.org_id == 10340) {
386
+        if (this.org_id == 9671 || this.org_id == 10340 || this.org_id == 0) {
387 387
           printJS({
388 388
             printable: 'print_content',
389 389
             type: 'html',
390 390
             documentTitle: '  ',
391
-            style: style2,
391
+            style: style,
392 392
             scanStyles: false
393 393
           })
394 394
         } else if (this.org_id == 10188 || this.org_id == 10217) {