|
@@ -21,65 +21,181 @@
|
21
|
21
|
>
|
22
|
22
|
{{ orgname }}处方笺
|
23
|
23
|
</div>
|
24
|
|
- <!--<div class="printTitle">{{orgname}}处方笺</div>-->
|
25
|
|
- <div class="infoTitle">
|
26
|
|
- <p>姓名:{{ item.patient.name ? item.patient.name : "" }}</p>
|
27
|
|
- <p>
|
28
|
|
- 性别:
|
29
|
|
- <span v-if="item.patient.gender == 1">男</span>
|
30
|
|
- <span v-if="item.patient.gender == 2">女</span>
|
31
|
|
- </p>
|
32
|
|
- <p>年龄:{{ getAge(item.patient) ? getAge(item.patient) : "" }}岁</p>
|
33
|
|
- </div>
|
34
|
|
- <div class="infoMain">
|
35
|
|
- <div style="margin-bottom: 10px">
|
36
|
|
- 门诊号:{{ hisPatient.number ? hisPatient.number : "" }}
|
37
|
|
- </div>
|
38
|
|
- <div style="margin-bottom: 10px">
|
39
|
|
- 科室:{{ item.info ? getDepart(item.info.departments) : "" }}
|
40
|
|
- </div>
|
41
|
|
- <div style="margin-bottom: 10px">
|
42
|
|
- 医保卡号:{{ item.hisPatient.number ? item.hisPatient.number : "" }}
|
|
24
|
+ <div >
|
|
25
|
+ <div class="infoTitle">
|
|
26
|
+ <p>姓名:{{ item.patient.name ? item.patient.name : "" }}</p>
|
|
27
|
+ <p>
|
|
28
|
+ 性别:
|
|
29
|
+ <span v-if="item.patient.gender == 1">男</span>
|
|
30
|
+ <span v-if="item.patient.gender == 2">女</span>
|
|
31
|
+ </p>
|
|
32
|
+ <p>年龄:{{ getAge(item.patient) ? getAge(item.patient) : "" }}岁</p>
|
43
|
33
|
</div>
|
44
|
|
- <div style="margin-bottom: 10px" v-if="org_id != 10188">
|
45
|
|
- 电话:{{ item.patient.phone }}
|
46
|
|
- </div>
|
47
|
|
- <div style="margin-bottom: 10px" v-else>
|
48
|
|
- 日期:{{ getTime(item.ctime) ? getTime(item.ctime) : "" }}
|
49
|
|
- </div>
|
50
|
|
- <div>地址:{{ item.patient.home_address }}</div>
|
51
|
|
- <div style="display: flex; width: 50%">
|
52
|
|
- 临床诊断:{{ getDiagnosis(item.info.diagnosis) }}
|
|
34
|
+ <div class="infoMain">
|
|
35
|
+ <div style="margin-bottom: 10px">
|
|
36
|
+ 门诊号:{{ hisPatient.number ? hisPatient.number : "" }}
|
|
37
|
+ </div>
|
|
38
|
+ <div style="margin-bottom: 10px">
|
|
39
|
+ 科室:{{ item.info ? getDepart(item.info.departments) : "" }}
|
|
40
|
+ </div>
|
|
41
|
+ <div style="margin-bottom: 10px">
|
|
42
|
+ 医保卡号:{{ item.hisPatient.number ? item.hisPatient.number : "" }}
|
|
43
|
+ </div>
|
|
44
|
+ <div style="margin-bottom: 10px" v-if="org_id != 10188">
|
|
45
|
+ 电话:{{ item.patient.phone }}
|
|
46
|
+ </div>
|
|
47
|
+ <div style="margin-bottom: 10px" v-else>
|
|
48
|
+ 日期:{{ getTime(item.ctime) ? getTime(item.ctime) : "" }}
|
|
49
|
+ </div>
|
|
50
|
+ <div>地址:{{ item.patient.home_address }}</div>
|
|
51
|
+ <div style="display: flex; width: 50%">
|
|
52
|
+ 临床诊断:{{ getDiagnosis(item.info.diagnosis) }}
|
|
53
|
+ </div>
|
53
|
54
|
</div>
|
54
|
55
|
</div>
|
55
|
56
|
<div class="prescriptionBox" >
|
56
|
57
|
<div class="Rp">Rp:</div>
|
57
|
58
|
<div
|
58
|
59
|
class="drugsBox"
|
59
|
|
- v-for="(it, index) in item.advices"
|
60
|
|
- :key="index"
|
|
60
|
+ v-for="(it, index) in advicess" :key="index"
|
61
|
61
|
:style="{'page-break-after':index==yi&&item.advices.length>5? 'always':'auto'}"
|
62
|
62
|
>
|
63
|
|
- <!-- class="drugsBox" item.advices.length>=5 ? 'danzhang' : 'drugsBox' 'page-break-after':item.advices.length>=3&& item.advices[2]?'always':'auto'-->
|
|
63
|
+ <!-- class="drugsBox" item.advices.length>=5 ? 'danzhang' : 'drugsBox' :style="{'page-break-after':index==yi&&item.advices.length>3? 'always':'auto'}"-->
|
64
|
64
|
<!-- <div class="drugsOne"><span style="font-weight:bold;">{{ index+1 + '.' }}</span>{{it.advice_name?it.advice_name:""}} {{it.single_dose}}{{it.single_dose_unit}} × {{it.prescribing_number}}{{it.prescribing_number_unit}}</div> -->
|
65
|
|
- <div class="drugsOne">
|
66
|
|
- <span style="font-weight: bold">{{ index + 1 + "." }}</span
|
67
|
|
- >{{ it.advice_name ? it.advice_name : "" }} <span
|
68
|
|
- v-if="it.drug.min_unit != it.drug.dose_unit"
|
69
|
|
- >{{ it.drug.dose }}{{ it.drug.dose_unit }} * </span
|
70
|
|
- >{{ it.drug.min_number }}{{ it.drug.min_unit }}/{{
|
71
|
|
- it.drug.max_unit
|
72
|
|
- }} × {{ it.prescribing_number
|
73
|
|
- }}{{ it.prescribing_number_unit }}
|
74
|
|
- </div>
|
75
|
|
- <div style="margin-left: 100px">
|
76
|
|
- <span>用法:{{ it.single_dose }}{{ it.single_dose_unit }}</span
|
77
|
|
- > <span
|
|
65
|
+ <template v-if="index==yi+1&&item.advices.length>5">
|
|
66
|
+ <div style="margin: 20px 0px;">
|
|
67
|
+ <div class="infoTitle">
|
|
68
|
+ <p>姓名:{{ item.patient.name ? item.patient.name : "" }}</p>
|
|
69
|
+ <p>
|
|
70
|
+ 性别:
|
|
71
|
+ <span v-if="item.patient.gender == 1">男</span>
|
|
72
|
+ <span v-if="item.patient.gender == 2">女</span>
|
|
73
|
+ </p>
|
|
74
|
+ <p>年龄:{{ getAge(item.patient) ? getAge(item.patient) : "" }}岁</p>
|
|
75
|
+ </div>
|
|
76
|
+ <div class="infoMain">
|
|
77
|
+ <div style="margin-bottom: 10px">
|
|
78
|
+ 门诊号:{{ hisPatient.number ? hisPatient.number : "" }}
|
|
79
|
+ </div>
|
|
80
|
+ <div style="margin-bottom: 10px">
|
|
81
|
+ 科室:{{ item.info ? getDepart(item.info.departments) : "" }}
|
|
82
|
+ </div>
|
|
83
|
+ <div style="margin-bottom: 10px">
|
|
84
|
+ 医保卡号:{{ item.hisPatient.number ? item.hisPatient.number : "" }}
|
|
85
|
+ </div>
|
|
86
|
+ <div style="margin-bottom: 10px" v-if="org_id != 10188">
|
|
87
|
+ 电话:{{ item.patient.phone }}
|
|
88
|
+ </div>
|
|
89
|
+ <div style="margin-bottom: 10px" v-else>
|
|
90
|
+ 日期:{{ getTime(item.ctime) ? getTime(item.ctime) : "" }}
|
|
91
|
+ </div>
|
|
92
|
+ <div>地址:{{ item.patient.home_address }}</div>
|
|
93
|
+ <div style="display: flex; width: 50%">
|
|
94
|
+ 临床诊断:{{ getDiagnosis(item.info.diagnosis) }}
|
|
95
|
+ </div>
|
|
96
|
+ </div>
|
|
97
|
+ </div>
|
|
98
|
+ </template>
|
|
99
|
+ <div style="position: relative;">
|
|
100
|
+ <div class="drugsOne" style="border-right: 1px solid black; width: 80%;">
|
|
101
|
+ <span style="font-weight: bold" >
|
|
102
|
+ {{ index + 1 + "." }}
|
|
103
|
+ </span>
|
|
104
|
+ {{ it.advice_name ? it.advice_name : "" }}
|
|
105
|
+ <span v-if="it.drug.min_unit != it.drug.dose_unit">
|
|
106
|
+ {{ it.drug.dose }}{{ it.drug.dose_unit }} * {{ it.drug.min_number }}{{ it.drug.min_unit }}/
|
|
107
|
+ {{it.drug.max_unit}}
|
|
108
|
+ </span>
|
|
109
|
+ <div>
|
|
110
|
+ <template v-if="arr.length>0 && arr[0][0].groupno==it.groupno">
|
|
111
|
+ <div >
|
|
112
|
+ <!-- v-for="(its,indexs) in arr" :key="indexs" -->
|
|
113
|
+ <span style="margin-left: 38px;">{{arr[0][0].advice_name ? arr[0][0].advice_name : ""}}</span>
|
|
114
|
+ <span v-if="arr[0][0].drug.min_unit != arr[0][0].drug.dose_unit">
|
|
115
|
+ {{ arr[0][0].drug.dose }}{{ arr[0][0].drug.dose_unit }} * {{ arr[0][0].drug.min_number }}{{ arr[0][0].drug.min_unit }}/
|
|
116
|
+ {{arr[0][0].drug.max_unit}}
|
|
117
|
+ </span>
|
|
118
|
+ </div>
|
|
119
|
+ </template>
|
|
120
|
+ </div>
|
|
121
|
+
|
|
122
|
+ <div style="margin-left: 70px">
|
|
123
|
+ <span >用法:{{ it.single_dose }}{{ it.single_dose_unit }}</span
|
|
124
|
+ > <span
|
78
|
125
|
>{{ it.execution_frequency }} {{
|
79
|
|
- it.delivery_way
|
80
|
|
- }} </span
|
81
|
|
- > <span>{{ it.advice_desc }}</span>
|
|
126
|
+ it.delivery_way
|
|
127
|
+ }} </span> <span>{{ it.advice_desc }}</span>
|
|
128
|
+ </div>
|
|
129
|
+
|
|
130
|
+ </div>
|
|
131
|
+ <div style="display: inline-block;position: absolute;left:85%;top:10px;margin-left: 10px;">
|
|
132
|
+ × {{ it.prescribing_number}}{{ it.prescribing_number_unit }}
|
|
133
|
+ </div>
|
82
|
134
|
</div>
|
|
135
|
+ <template v-if="index==yi&&item.advices.length>5">
|
|
136
|
+ <div style="margin: 20px 0px;">
|
|
137
|
+ <div class="doctorBox" v-if="org_id != 10188 && org_id != 0">
|
|
138
|
+ <p v-if="org_id == 10217 || org_id == 0">
|
|
139
|
+ 医师:
|
|
140
|
+ <span
|
|
141
|
+ style="width: 100px; display: inline-block"
|
|
142
|
+ v-if="item.creator == ''"
|
|
143
|
+ >
|
|
144
|
+ {{ item.doctor }}
|
|
145
|
+ </span>
|
|
146
|
+ <span
|
|
147
|
+ style="width: 100px; display: inline-block"
|
|
148
|
+ v-else-if="doc_name != ''"
|
|
149
|
+ >
|
|
150
|
+ {{ doc_name }}
|
|
151
|
+ </span>
|
|
152
|
+ <img
|
|
153
|
+ style="height: 50px;"
|
|
154
|
+ :src="setAdminUserES(item.creator,item.doctor)"
|
|
155
|
+ alt=""
|
|
156
|
+ srcset=""
|
|
157
|
+
|
|
158
|
+ />
|
|
159
|
+ </p>
|
|
160
|
+ <p v-else>
|
|
161
|
+ 医师: {{ item.doctor ? item.doctor : "" }}
|
|
162
|
+ </p>
|
|
163
|
+ <p>日期:{{ getTime(item.ctime) ? getTime(item.ctime) : "" }}</p>
|
|
164
|
+ </div>
|
|
165
|
+
|
|
166
|
+ <div class="doctorBoxs" style="border-bottom: 2px solid #000;" v-if="org_id == 10188 || org_id == 0">
|
|
167
|
+ <p>医师:{{ item.doctor ? item.doctor : "" }}</p>
|
|
168
|
+ </div>
|
|
169
|
+ <div class="actionBar" v-if="org_id != 10188 && org_id != 0">
|
|
170
|
+
|
|
171
|
+ <p>审核:</p>
|
|
172
|
+ <p>配对:</p>
|
|
173
|
+ <p>核对:</p>
|
|
174
|
+ <p>发药:</p>
|
|
175
|
+ <p>
|
|
176
|
+ 药费:{{
|
|
177
|
+ getTotalOne(item.id).toFixed(2)
|
|
178
|
+ ? getTotalOne(item.id).toFixed(2)
|
|
179
|
+ : 0
|
|
180
|
+ }}元
|
|
181
|
+ </p>
|
|
182
|
+ <!-- <p>药费:466.2元</p>-->
|
|
183
|
+ </div>
|
|
184
|
+ <div class="actionBar" v-else>
|
|
185
|
+ <p >审核、调配:</p>
|
|
186
|
+ <p >核对、发药:</p>
|
|
187
|
+ <p >
|
|
188
|
+ 药费:{{
|
|
189
|
+ getTotalOne(item.id).toFixed(2)
|
|
190
|
+ ? getTotalOne(item.id).toFixed(2)
|
|
191
|
+ : 0
|
|
192
|
+ }}元
|
|
193
|
+ </p>
|
|
194
|
+ <!-- <p>药费:551.2元</p>-->
|
|
195
|
+ <!-- <p>药费:466.2元</p>-->
|
|
196
|
+ </div>
|
|
197
|
+ </div>
|
|
198
|
+ </template>
|
83
|
199
|
</div>
|
84
|
200
|
|
85
|
201
|
<div
|
|
@@ -100,8 +216,8 @@
|
100
|
216
|
:key="index"
|
101
|
217
|
>
|
102
|
218
|
<div class="drugsOne">
|
103
|
|
- <span style="font-weight: bold">{{ index + 1 + "." }}</span
|
104
|
|
- >{{
|
|
219
|
+ <span style="font-weight: bold">{{ index + 1 + "." }}</span
|
|
220
|
+ >{{
|
105
|
221
|
it.type == 2
|
106
|
222
|
? getProjectName(it.project_id)
|
107
|
223
|
? getProjectName(it.project_id)
|
|
@@ -111,9 +227,9 @@
|
111
|
227
|
}}{{ it.single_dose_unit }} × {{ it.count }}{{ unit }}
|
112
|
228
|
</div>
|
113
|
229
|
<div style="margin-left: 100px">
|
114
|
|
- <span>用法:{{ it.single_dose }}{{ it.single_dose_unit }}</span
|
115
|
|
- > <span>{{ it.delivery_way }}</span
|
116
|
|
- > <span>{{ it.advice_desc }}</span>
|
|
230
|
+ <span>用法:{{ it.single_dose }}{{ it.single_dose_unit }}</span
|
|
231
|
+ > <span>{{ it.delivery_way }}</span
|
|
232
|
+ > <span>{{ it.advice_desc }}</span>
|
117
|
233
|
</div>
|
118
|
234
|
</div>
|
119
|
235
|
|
|
@@ -130,48 +246,22 @@
|
130
|
246
|
</div>
|
131
|
247
|
<div style="text-align: center">(以下空白)</div>
|
132
|
248
|
</div>
|
133
|
|
- <div class="doctorBox" v-if="org_id == 10217 || org_id == 0">
|
134
|
|
- <p v-if="org_id == 10217 || org_id == 0">
|
135
|
|
- 医师:
|
136
|
|
- <span
|
137
|
|
- style="width: 100px; display: inline-block"
|
138
|
|
- v-if="item.creator == ''"
|
139
|
|
- >
|
140
|
|
- {{ item.doctor }}
|
141
|
|
- </span>
|
142
|
|
- <span
|
143
|
|
- style="width: 100px; display: inline-block"
|
144
|
|
- v-else-if="doc_name != ''"
|
145
|
|
- >
|
146
|
|
- {{ doc_name }}
|
147
|
|
- </span>
|
148
|
|
- <img
|
149
|
|
- style="height: 50px;"
|
150
|
|
- :src="setAdminUserES(item.creator,item.doctor)"
|
151
|
|
- alt=""
|
152
|
|
- srcset=""
|
153
|
|
-
|
154
|
|
- />
|
155
|
|
- </p>
|
156
|
|
-
|
157
|
|
- <p >日期:{{ getTime(item.ctime) ? getTime(item.ctime) : "" }}</p>
|
158
|
|
- </div>
|
159
|
249
|
|
160
|
|
- <div class="doctorBoxxxx" v-if="org_id == 10188">
|
161
|
|
- <p >
|
|
250
|
+ <div class="doctorBox">
|
|
251
|
+ <p v-if="org_id == 10217">
|
162
|
252
|
医师:
|
163
|
253
|
<span
|
164
|
254
|
style="width: 100px; display: inline-block"
|
165
|
255
|
v-if="item.creator == ''"
|
166
|
256
|
>
|
167
|
|
- {{ item.doctor }}
|
168
|
|
- </span>
|
|
257
|
+ {{ item.doctor }}
|
|
258
|
+ </span>
|
169
|
259
|
<span
|
170
|
260
|
style="width: 100px; display: inline-block"
|
171
|
261
|
v-else-if="doc_name != ''"
|
172
|
262
|
>
|
173
|
|
- {{ doc_name }}
|
174
|
|
- </span>
|
|
263
|
+ {{ doc_name }}
|
|
264
|
+ </span>
|
175
|
265
|
<img
|
176
|
266
|
style="height: 50px;"
|
177
|
267
|
:src="setAdminUserES(item.creator,item.doctor)"
|
|
@@ -180,25 +270,13 @@
|
180
|
270
|
|
181
|
271
|
/>
|
182
|
272
|
</p>
|
|
273
|
+ <p v-else>
|
|
274
|
+ 医师: {{ item.doctor ? item.doctor : "" }}
|
|
275
|
+ </p>
|
|
276
|
+ <p>日期:{{ getTime(item.ctime) ? getTime(item.ctime) : "" }}</p>
|
183
|
277
|
</div>
|
184
|
278
|
|
185
|
|
-
|
186
|
|
-<!-- <div class="doctorBoxs" style="border-bottom: 2px solid #000;" v-if="org_id == 10188 || org_id == 0">-->
|
187
|
|
-<!-- <p>医师:{{ item.doctor ? item.doctor : "" }}</p>-->
|
188
|
|
-<!-- </div>-->
|
189
|
|
- <!-- <div class="doctorBoxtwo" v-if="org_id == 10188 || org_id == 0">
|
190
|
|
- <p >审核、调配:</p>
|
191
|
|
- <p >核对、发药:</p>
|
192
|
|
- <p style="margin-right: 43px">药师:</p>
|
193
|
|
- </div> -->
|
194
|
|
-
|
195
|
|
- <div class="actionBar" v-if="org_id != 10188">
|
196
|
|
- <!-- <p>审核:{{getDoctor(item.advices[0].checker)?getDoctor(item.advices[0].checker):""}}</p>
|
197
|
|
- <p>配对:</p>
|
198
|
|
- <p>核对:{{getDoctor(item.advices[0].checker)?getDoctor(item.advices[0].checker):""}}</p>
|
199
|
|
- <p>发药:{{getDoctor(item.advices[0].execution_staff)?getDoctor(item.advices[0].execution_staff):""}}</p>
|
200
|
|
- <p>药费:{{getTotalOne(item.id)?getTotalOne(item.id):0}}元</p> -->
|
201
|
|
-
|
|
279
|
+ <div class="actionBar">
|
202
|
280
|
<p>审核:</p>
|
203
|
281
|
<p>配对:</p>
|
204
|
282
|
<p>核对:</p>
|
|
@@ -210,22 +288,8 @@
|
210
|
288
|
: 0
|
211
|
289
|
}}元
|
212
|
290
|
</p>
|
213
|
|
- <!-- <p>药费:466.2元</p>-->
|
214
|
|
- </div>
|
215
|
|
- <div class="actionBar" v-else>
|
216
|
|
- <p >审核、调配:</p>
|
217
|
|
- <p >核对、发药:</p>
|
218
|
|
- <p >
|
219
|
|
- 药费:{{
|
220
|
|
- getTotalOne(item.id).toFixed(2)
|
221
|
|
- ? getTotalOne(item.id).toFixed(2)
|
222
|
|
- : 0
|
223
|
|
- }}元
|
224
|
|
- </p>
|
225
|
|
- <!-- <p>药费:551.2元</p>-->
|
226
|
|
- <!-- <p>药费:466.2元</p>-->
|
227
|
291
|
</div>
|
228
|
|
- <!-- <div style="page-break-after: always"></div> -->
|
|
292
|
+
|
229
|
293
|
</div>
|
230
|
294
|
</div>
|
231
|
295
|
</div>
|
|
@@ -251,6 +315,10 @@ export default{
|
251
|
315
|
doctorList: [],
|
252
|
316
|
advicePrint: {},
|
253
|
317
|
yi:4,
|
|
318
|
+ arr:[],
|
|
319
|
+ arrs:{},
|
|
320
|
+ advicess:[],
|
|
321
|
+ page:sessionStorage.getItem('dayin'),
|
254
|
322
|
patient: {},
|
255
|
323
|
tableData: [],
|
256
|
324
|
prescriptionInfo: [],
|
|
@@ -352,6 +420,21 @@ export default{
|
352
|
420
|
this.prescriptions = advicePrint;
|
353
|
421
|
|
354
|
422
|
this.doctorList_1 = response.data.data.eles;
|
|
423
|
+ for(let i=0;i<this.advicePrint.length;i++){
|
|
424
|
+ this.advicess=advicePrint[i].advices
|
|
425
|
+ }
|
|
426
|
+ for(let j=0;j<this.advicess.length;j++){
|
|
427
|
+ for(let x=j+1;x<this.advicess.length;x++){
|
|
428
|
+ if(this.advicess[j].groupno == this.advicess[x].groupno){
|
|
429
|
+ this.arr.push(this.advicess.splice(x,1))
|
|
430
|
+ // this.arrs=this.advicess.splice(x,1)
|
|
431
|
+ }
|
|
432
|
+ }
|
|
433
|
+ }
|
|
434
|
+ // this.merge(this.advicess)
|
|
435
|
+ // console.log('4444444',this.arrs);
|
|
436
|
+ console.log('55555555',this.arr);
|
|
437
|
+ console.log('6666666',this.advicess);
|
355
|
438
|
console.log(this.doctorList_1, "医生列表");
|
356
|
439
|
if (this.doctorList_1.length > 0) {
|
357
|
440
|
var operatorsLen = this.doctorList_1.length;
|
|
@@ -414,7 +497,7 @@ export default{
|
414
|
497
|
total =
|
415
|
498
|
total +
|
416
|
499
|
this.prescriptions[i].project[a].price *
|
417
|
|
- this.prescriptions[i].project[a].count;
|
|
500
|
+ this.prescriptions[i].project[a].count;
|
418
|
501
|
}
|
419
|
502
|
}
|
420
|
503
|
|
|
@@ -427,7 +510,7 @@ export default{
|
427
|
510
|
addtotal =
|
428
|
511
|
addtotal +
|
429
|
512
|
this.prescriptions[i].additionalcharge[a].price *
|
430
|
|
- this.prescriptions[i].additionalcharge[a].count;
|
|
513
|
+ this.prescriptions[i].additionalcharge[a].count;
|
431
|
514
|
}
|
432
|
515
|
}
|
433
|
516
|
addtotal = Math.floor(addtotal * 100) / 100;
|
|
@@ -441,7 +524,7 @@ export default{
|
441
|
524
|
total =
|
442
|
525
|
total +
|
443
|
526
|
this.prescriptions[i].advices[a].price *
|
444
|
|
- this.prescriptions[i].advices[a].prescribing_number;
|
|
527
|
+ this.prescriptions[i].advices[a].prescribing_number;
|
445
|
528
|
}
|
446
|
529
|
}
|
447
|
530
|
|
|
@@ -454,7 +537,7 @@ export default{
|
454
|
537
|
addtotal =
|
455
|
538
|
addtotal +
|
456
|
539
|
this.prescriptions[i].additionalcharge[a].price *
|
457
|
|
- this.prescriptions[i].additionalcharge[a].count;
|
|
540
|
+ this.prescriptions[i].additionalcharge[a].count;
|
458
|
541
|
}
|
459
|
542
|
}
|
460
|
543
|
addtotal = Math.floor(addtotal * 100) / 100;
|
|
@@ -484,6 +567,26 @@ export default{
|
484
|
567
|
}
|
485
|
568
|
return name;
|
486
|
569
|
},
|
|
570
|
+ merge(arrA){
|
|
571
|
+ var len=arrA.lenfth
|
|
572
|
+ // for(let j=0;j<this.advicess.length;j++){
|
|
573
|
+ // for(let x=j+1;x<this.advicess.length;x++){
|
|
574
|
+ // if(this.advicess[j].groupno == this.advicess[x].groupno){
|
|
575
|
+ // // this.arr.push(this.advicess.splice(x,1))
|
|
576
|
+ // this.arrs=this.advicess.splice(x,1)
|
|
577
|
+ // }
|
|
578
|
+ // }
|
|
579
|
+ // }
|
|
580
|
+ for(let j=0;j<len;j++){
|
|
581
|
+ for(let x=j+1;x<len;x++){
|
|
582
|
+ if(arrA[j].groupno == arrA[x].groupno){
|
|
583
|
+ this.arr.push(arrA.splice(x,1))
|
|
584
|
+ }
|
|
585
|
+ }
|
|
586
|
+ }
|
|
587
|
+ console.log('777777777',this.arr);
|
|
588
|
+ return this.arr
|
|
589
|
+ }
|
487
|
590
|
},
|
488
|
591
|
created() {
|
489
|
592
|
this.getAllDoctorList();
|
|
@@ -493,7 +596,20 @@ export default{
|
493
|
596
|
var xtuser = this.$store.getters.xt_user;
|
494
|
597
|
this.orgname = xtuser.org.org_name;
|
495
|
598
|
this.org_id = xtuser.org.id;
|
|
599
|
+
|
|
600
|
+ // for(let j=0;j<this.advicess.length;j++){
|
|
601
|
+ // console.log('44444444');
|
|
602
|
+ // for(let x=j+1;x<this.advicess.length;x++){
|
|
603
|
+ // if(this.advicess[j].groupno == this.advicess[x].groupno){
|
|
604
|
+ // this.arr.push(this.advicess.splice(x,1))
|
|
605
|
+ // }
|
|
606
|
+ // }
|
|
607
|
+ // }
|
|
608
|
+ // console.log('777777777',this.arr[0].advice_name);
|
|
609
|
+ // return this.arr
|
|
610
|
+
|
496
|
611
|
},
|
|
612
|
+
|
497
|
613
|
watch: {
|
498
|
614
|
ids: function (val) {
|
499
|
615
|
this.ids = val;
|
|
@@ -507,9 +623,9 @@ export default{
|
507
|
623
|
<style lang="scss" scoped>
|
508
|
624
|
.prescription-print {
|
509
|
625
|
-webkit-box-shadow: 0 1px 4px rgba(0, 0, 0, 0.27),
|
510
|
|
- 0 0 60px rgba(0, 0, 0, 0.06) inset;
|
|
626
|
+ 0 0 60px rgba(0, 0, 0, 0.06) inset;
|
511
|
627
|
-moz-box-shadow: 0 1px 4px rgba(0, 0, 0, 0.27),
|
512
|
|
- 0 0 40px rgba(0, 0, 0, 0.06) inset;
|
|
628
|
+ 0 0 40px rgba(0, 0, 0, 0.06) inset;
|
513
|
629
|
box-shadow: 0 1px 4px rgba(0, 0, 0, 0.27), 0 0 40px rgba(0, 0, 0, 0.06) inset;
|
514
|
630
|
margin-bottom: 20px;
|
515
|
631
|
padding: 20px 10px;
|
|
@@ -550,12 +666,14 @@ export default{
|
550
|
666
|
.drugsBox {
|
551
|
667
|
padding-left: 40px;
|
552
|
668
|
margin-bottom: 10px;
|
|
669
|
+ position: relative;
|
553
|
670
|
}
|
554
|
671
|
.drugsBox div {
|
555
|
672
|
line-height: 20px;
|
556
|
673
|
}
|
557
|
674
|
.drugsOne {
|
558
|
675
|
line-height: 24px;
|
|
676
|
+ display: inline-block;
|
559
|
677
|
}
|
560
|
678
|
.drugsOne span {
|
561
|
679
|
margin-right: 20px;
|
|
@@ -567,30 +685,6 @@ export default{
|
567
|
685
|
line-height: 24px;
|
568
|
686
|
border-bottom: 2px solid #000;
|
569
|
687
|
}
|
570
|
|
-
|
571
|
|
-.doctorBoxxxx {
|
572
|
|
- display: flex;
|
573
|
|
- justify-content: space-between;
|
574
|
|
- padding: 0 10px;
|
575
|
|
- line-height: 24px;
|
576
|
|
- border-bottom: 2px solid #000;
|
577
|
|
-}
|
578
|
|
-
|
579
|
|
-
|
580
|
|
-.doctorBoxxxx p{
|
581
|
|
- margin-left: auto
|
582
|
|
-}
|
583
|
|
-
|
584
|
|
-.doctorBoxsss {
|
585
|
|
- display: flex;
|
586
|
|
- float: right;
|
587
|
|
- margin-bottom: 60px;
|
588
|
|
- justify-content: space-between;
|
589
|
|
- padding: 0 10px;
|
590
|
|
- line-height: 24px;
|
591
|
|
- border-bottom: 2px solid #000;
|
592
|
|
-}
|
593
|
|
-
|
594
|
688
|
.doctorBoxs{
|
595
|
689
|
width: 100%;
|
596
|
690
|
margin-right: 30px;
|