Browse Source

修改方剂bug

csx 5 years ago
parent
commit
3cf4896162

+ 9 - 8
src/xt_pages/dialysis/batch_print/batch_print_order.vue View File

33
               <check-box text="住院" :checked="record.patient.source == 2"></check-box>
33
               <check-box text="住院" :checked="record.patient.source == 2"></check-box>
34
               <!-- TODO -->
34
               <!-- TODO -->
35
             </div>
35
             </div>
36
-          </div>
37
-          <div class="row flex">
38
             <div class="inline_block">
36
             <div class="inline_block">
39
               住院号/透析卡号:
37
               住院号/透析卡号:
40
               <div class="under_line" style="width: 100px;">
38
               <div class="under_line" style="width: 100px;">
41
                 {{record.patient.admission_number?record.patient.admission_number:'无'}}/{{ record.patient.dialysis_no }}
39
                 {{record.patient.admission_number?record.patient.admission_number:'无'}}/{{ record.patient.dialysis_no }}
42
               </div>
40
               </div>
43
             </div>
41
             </div>
42
+          </div>
43
+          <div class="row flex">
44
+
44
             <div class="inline_block">
45
             <div class="inline_block">
45
               诊断:
46
               诊断:
46
               <div class="under_line" style="width: 500px;">{{record.patient.diagnose}}</div>
47
               <div class="under_line" style="width: 500px;">{{record.patient.diagnose}}</div>
206
                     <div class="inline_block">
207
                     <div class="inline_block">
207
                       透析时间:
208
                       透析时间:
208
                       <div class="under_line" style="width: 30px;">
209
                       <div class="under_line" style="width: 30px;">
209
-                        {{record.prescription&&record.prescription.dialysis_duration_hour?record.prescription.dialysis_duration_hour:''}}
210
+                        {{record.prescription&&record.prescription.dialysis_duration_hour?record.prescription.dialysis_duration_hour:'0'}}
210
                       </div>
211
                       </div>
211
                       h
212
                       h
212
                       <div class="under_line" style="width: 30px;">
213
                       <div class="under_line" style="width: 30px;">
213
-                        {{record.prescription&&record.prescription.dialysis_duration_minute?record.prescription.dialysis_duration_minute:''}}
214
+                        {{record.prescription&&record.prescription.dialysis_duration_minute?record.prescription.dialysis_duration_minute:'0'}}
214
                       </div>
215
                       </div>
215
                       min
216
                       min
216
                     </div>
217
                     </div>
330
                       <div class="under_line" style="width: 100px;">
331
                       <div class="under_line" style="width: 100px;">
331
                         <span
332
                         <span
332
                           v-if="!record.advices || typeof(record.advices[0]) == 'undefined' || typeof(record.advices[0][0]) == 'undefined'"></span>
333
                           v-if="!record.advices || typeof(record.advices[0]) == 'undefined' || typeof(record.advices[0][0]) == 'undefined'"></span>
333
-                        <span v-else-if="setAdminUserES(record.advices[0][0], 'advice_doctor') == ''">{{getAdminUser(record.advices, 'advice_doctor')}}</span>
334
+                        <span v-else-if="setAdminUserES(record.advices[0][0], 'advice_doctor') == ''">{{getAdminUser(record.advices[0][0], 'advice_doctor')}}</span>
334
                         <img class="es-img" :src="setAdminUserES(record.advices[0][0], 'advice_doctor')" alt=""
335
                         <img class="es-img" :src="setAdminUserES(record.advices[0][0], 'advice_doctor')" alt=""
335
                              srcset="" v-else style="height: 20px;">
336
                              srcset="" v-else style="height: 20px;">
336
 
337
 
402
                     <div class="inline_block">
403
                     <div class="inline_block">
403
                       实际治疗时间:
404
                       实际治疗时间:
404
                       <div class="under_line" style="width: 30px;">
405
                       <div class="under_line" style="width: 30px;">
405
-                        {{record.assessment_after_dislysis&&record.assessment_after_dislysis.actual_treatment_hour?record.assessment_after_dislysis.actual_treatment_hour:''}}
406
+                        {{record.assessment_after_dislysis&&record.assessment_after_dislysis.actual_treatment_hour?record.assessment_after_dislysis.actual_treatment_hour:'0'}}
406
                       </div>
407
                       </div>
407
                       h
408
                       h
408
                       <div class="under_line" style="width: 30px;">
409
                       <div class="under_line" style="width: 30px;">
409
-                        {{record.assessment_after_dislysis&&record.assessment_after_dislysis.actual_treatment_minute?record.assessment_after_dislysis.actual_treatment_minute:''}}
410
+                        {{record.assessment_after_dislysis&&record.assessment_after_dislysis.actual_treatment_minute?record.assessment_after_dislysis.actual_treatment_minute:'0'}}
410
                       </div>
411
                       </div>
411
                       min
412
                       min
412
                     </div>
413
                     </div>
442
                       <check-box text="有"
443
                       <check-box text="有"
443
                                  :checked="isCheckBoxChecked(record.assessment_after_dislysis, 'puncture_point_oozing_blood', 1)"></check-box>
444
                                  :checked="isCheckBoxChecked(record.assessment_after_dislysis, 'puncture_point_oozing_blood', 1)"></check-box>
444
                       <check-box text="无"
445
                       <check-box text="无"
445
-                                 :checked="isCheckBoxChecked(record.assessment_after_dislysis, 'puncture_point_oozing_blood', 1)"></check-box>
446
+                                 :checked="isCheckBoxChecked(record.assessment_after_dislysis, 'puncture_point_oozing_blood', 2)"></check-box>
446
                     </div>
447
                     </div>
447
                     <div class="inline_block" style="margin-left: 40px;">
448
                     <div class="inline_block" style="margin-left: 40px;">
448
                       穿刺点血肿:
449
                       穿刺点血肿:

+ 4 - 4
src/xt_pages/dialysis/batch_print/batch_print_order_other.vue View File

45
 
45
 
46
             <div class="inline_block" style="margin-left: 10px;">
46
             <div class="inline_block" style="margin-left: 10px;">
47
               诊断:
47
               诊断:
48
-              <div class="under_line_two" style="width: 200px;text-align: left">{{record.patient.diagnose}}</div>
48
+              <div class="under_line_two" style="width: 180px;text-align: left">{{record.patient.diagnose}}</div>
49
             </div>
49
             </div>
50
 
50
 
51
           </div>
51
           </div>
333
 
333
 
334
               <div class="inline_block" style="margin-left: 10px;">
334
               <div class="inline_block" style="margin-left: 10px;">
335
                 诊断:
335
                 诊断:
336
-                <div class="under_line_two" style="width: 200px;text-align: left">{{record.patient.diagnose}}</div>
336
+                <div class="under_line_two" style="width: 180px;text-align: left">{{record.patient.diagnose}}</div>
337
               </div>
337
               </div>
338
 
338
 
339
             </div>
339
             </div>
644
 
644
 
645
             <div class="inline_block" style="margin-left: 10px;">
645
             <div class="inline_block" style="margin-left: 10px;">
646
               诊断:
646
               诊断:
647
-              <div class="under_line_two" style="width: 200px;text-align: left">{{record.patient.diagnose}}</div>
647
+              <div class="under_line_two" style="width: 180px;text-align: left">{{record.patient.diagnose}}</div>
648
             </div>
648
             </div>
649
 
649
 
650
           </div>
650
           </div>
980
 
980
 
981
                 <div class="inline_block" style="margin-left: 10px;">
981
                 <div class="inline_block" style="margin-left: 10px;">
982
                   诊断:
982
                   诊断:
983
-                  <div class="under_line_two" style="width: 200px;text-align: left">{{record.patient.diagnose}}</div>
983
+                  <div class="under_line_two" style="width: 180px;text-align: left">{{record.patient.diagnose}}</div>
984
                 </div>
984
                 </div>
985
 
985
 
986
               </div>
986
               </div>

+ 2 - 2
src/xt_pages/dialysis/batch_print/batch_print_order_other_one.vue View File

45
 
45
 
46
             <div class="inline_block" style="margin-left: 10px;">
46
             <div class="inline_block" style="margin-left: 10px;">
47
               诊断:
47
               诊断:
48
-              <div class="under_line_two" style="width: 200px;text-align: left">{{record.patient.diagnose}}</div>
48
+              <div class="under_line_two" style="width: 180px;text-align: left">{{record.patient.diagnose}}</div>
49
             </div>
49
             </div>
50
 
50
 
51
           </div>
51
           </div>
330
 
330
 
331
               <div class="inline_block" style="margin-left: 10px;">
331
               <div class="inline_block" style="margin-left: 10px;">
332
                 诊断:
332
                 诊断:
333
-                <div class="under_line_two" style="width: 200px;text-align: left">{{record.patient.diagnose}}</div>
333
+                <div class="under_line_two" style="width: 180px;text-align: left">{{record.patient.diagnose}}</div>
334
               </div>
334
               </div>
335
 
335
 
336
             </div>
336
             </div>

+ 2 - 44
src/xt_pages/dialysis/batch_print/batch_print_order_other_two.vue View File

45
 
45
 
46
             <div class="inline_block" style="margin-left: 10px;">
46
             <div class="inline_block" style="margin-left: 10px;">
47
               诊断:
47
               诊断:
48
-              <div class="under_line_two" style="width: 200px;text-align: left">{{record.patient.diagnose}}</div>
48
+              <div class="under_line_two" style="width: 180px;text-align: left">{{record.patient.diagnose}}</div>
49
             </div>
49
             </div>
50
 
50
 
51
           </div>
51
           </div>
52
-          <div class="row">
53
-            <div class="inline_block">
54
-              科室:
55
-              <check-box text="门诊透析" :checked="record.patient.source == 1"></check-box>
56
-              &nbsp;
57
-              <check-box text="住院" :checked="record.patient.source == 2"></check-box>
58
-              <!-- TODO -->
59
-            </div>
60
-            <div class="inline_block" style="margin-left: 5px;">
61
-              住院号:
62
-              <div class="under_line" style="width: 70px;text-align: left" v-if="record.patient.admission_number">
63
-                {{record.patient.admission_number}}
64
-              </div>
65
-              <div class="under_line" style="width: 70px;" v-else>
66
-                {{'/'}}
67
-              </div>
68
-            </div>
69
-            <div class="inline_block" style="margin-left:10px;">
70
-              姓名:
71
-              <div class="under_line" style="width: 50px;text-align: left">{{ record.patient.name }}</div>
72
-            </div>
73
-            <div class="inline_block" style="margin-left: 10px;">
74
-              性别:
75
-              <check-box text="男" :checked="record.patient.gender == 1"></check-box>
76
-              &nbsp
77
-              <check-box text="女" :checked="record.patient.gender == 2"></check-box>
78
-            </div>
79
-            <div class="inline_block" style="margin-left: 10px;">
80
-              年龄:
81
-              <div class="under_line" style="width:30px;text-align: left">{{getAge(record.patient)}}</div>
82
-              岁
83
-            </div>
84
-
85
-            <div class="inline_block" style="margin-left: 10px;">
86
-              诊断:
87
-              <div class="under_line_two" style="width: 200px;text-align: left">{{record.patient.diagnose}}</div>
88
-            </div>
89
-
90
-          </div>
91
-
92
-
93
-
94
           <table class="proj_table">
52
           <table class="proj_table">
95
             <tbody>
53
             <tbody>
96
               <tr>
54
               <tr>
413
 
371
 
414
                 <div class="inline_block" style="margin-left: 10px;">
372
                 <div class="inline_block" style="margin-left: 10px;">
415
                   诊断:
373
                   诊断:
416
-                  <div class="under_line_two" style="width: 200px;text-align: left">{{record.patient.diagnose}}</div>
374
+                  <div class="under_line_two" style="width: 180px;text-align: left">{{record.patient.diagnose}}</div>
417
                 </div>
375
                 </div>
418
 
376
 
419
               </div>
377
               </div>

+ 15 - 14
src/xt_pages/dialysis/template/DialysisPrintOrderOne.vue View File

1
-<template>   
1
+<template>
2
   <div id="dialysis-print-box">
2
   <div id="dialysis-print-box">
3
         <div class="dialysis-print-order">
3
         <div class="dialysis-print-order">
4
           <div class="order-yy-name">{{orgname}}</div>
4
           <div class="order-yy-name">{{orgname}}</div>
10
               <td width="90">
10
               <td width="90">
11
                 <div class="under-line">&nbsp;{{patientInfo.name}}</div>
11
                 <div class="under-line">&nbsp;{{patientInfo.name}}</div>
12
               </td>
12
               </td>
13
+              <td width="30"></td>
13
               <td width="50">性 别:</td>
14
               <td width="50">性 别:</td>
14
               <td width="120">
15
               <td width="120">
15
                 <div>
16
                 <div>
16
                   <label-box :isChecked='patientInfo_gender_1' showValue='男'></label-box>
17
                   <label-box :isChecked='patientInfo_gender_1' showValue='男'></label-box>
17
-                  &nbsp;
18
                   <label-box :isChecked='patientInfo_gender_2' showValue='女'></label-box>
18
                   <label-box :isChecked='patientInfo_gender_2' showValue='女'></label-box>
19
                 </div>
19
                 </div>
20
               </td>
20
               </td>
21
+
21
               <td width="50">年 龄:</td>
22
               <td width="50">年 龄:</td>
22
               <td width="40">
23
               <td width="40">
23
                 <div class="under-line">{{getAge(patientInfo)}}</div>
24
                 <div class="under-line">{{getAge(patientInfo)}}</div>
24
               </td>
25
               </td>
25
               <td>岁</td>
26
               <td>岁</td>
26
-              <td width="10">&nbsp;</td>
27
+              <td width="30"></td>
27
 
28
 
28
               <td width="50">科 室:</td>
29
               <td width="50">科 室:</td>
29
               <td width="200">
30
               <td width="200">
30
                 <div>
31
                 <div>
31
                   <label-box :isChecked='patientInfo_source_1' showValue='门 诊 透 析'></label-box>
32
                   <label-box :isChecked='patientInfo_source_1' showValue='门 诊 透 析'></label-box>
32
-                  &nbsp;
33
                   <label-box :isChecked='patientInfo_source_2' showValue='住 院'></label-box>
33
                   <label-box :isChecked='patientInfo_source_2' showValue='住 院'></label-box>
34
                 </div>
34
                 </div>
35
               </td>
35
               </td>
36
 
36
 
37
+              <td width="120" >住院号/透析卡号:</td>
38
+              <td width="130">
39
+                <div class="under-line">&nbsp;{{patientInfo.admission_number?patientInfo.admission_number:'无'}}
40
+                  /{{patientInfo.dialysis_no}}
41
+                </div>
42
+              </td>
43
+              <td></td>
37
             </tr>
44
             </tr>
38
             </tbody>
45
             </tbody>
39
           </table>
46
           </table>
40
           <table class="table-box" style="margin-top: 10px;">
47
           <table class="table-box" style="margin-top: 10px;">
41
             <tbody>
48
             <tbody>
42
             <tr>
49
             <tr>
43
-              <td width="130">住院号/透析卡号:</td>
44
-              <td width="90">
45
-                <div class="under-line">&nbsp;{{patientInfo.admission_number?patientInfo.admission_number:'无'}}
46
-                  /{{patientInfo.dialysis_no}}
47
-                </div>
48
-              </td>
49
 
50
 
50
               <td width="40">诊 断:</td>
51
               <td width="40">诊 断:</td>
51
               <td width="">
52
               <td width="">
308
                   <tr>
309
                   <tr>
309
                     <td width="70">透析时间:</td>
310
                     <td width="70">透析时间:</td>
310
                     <td width="40">
311
                     <td width="40">
311
-                      <div class="under-line">&nbsp;{{prescription.dialysis_duration_hour?prescription.dialysis_duration_hour:''}}</div>
312
+                      <div class="under-line">&nbsp;{{prescription.dialysis_duration_hour?prescription.dialysis_duration_hour:'0'}}</div>
312
                     </td>
313
                     </td>
313
                     <td width="10">h</td>
314
                     <td width="10">h</td>
314
                     <td width="40">
315
                     <td width="40">
315
-                      <div class="under-line">&nbsp;{{prescription.dialysis_duration_minute?prescription.dialysis_duration_minute:''}}</div>
316
+                      <div class="under-line">&nbsp;{{prescription.dialysis_duration_minute?prescription.dialysis_duration_minute:'0'}}</div>
316
                     </td>
317
                     </td>
317
                     <td width="35">min</td>
318
                     <td width="35">min</td>
318
                     <td></td>
319
                     <td></td>
596
                   <tr>
597
                   <tr>
597
                     <td width="90">实际治疗时间</td>
598
                     <td width="90">实际治疗时间</td>
598
                     <td width="40">
599
                     <td width="40">
599
-                      <div class="under-line">&nbsp;{{afterdialysis.actual_treatment_hour?afterdialysis.actual_treatment_hour:''}}</div>
600
+                      <div class="under-line">&nbsp;{{afterdialysis.actual_treatment_hour?afterdialysis.actual_treatment_hour:'0'}}</div>
600
                     </td>
601
                     </td>
601
                     <td width="10">h</td>
602
                     <td width="10">h</td>
602
                     <td width="40">
603
                     <td width="40">
603
-                      <div class="under-line">&nbsp;{{afterdialysis.actual_treatment_minute?afterdialysis.actual_treatment_minute:''}}</div>
604
+                      <div class="under-line">&nbsp;{{afterdialysis.actual_treatment_minute?afterdialysis.actual_treatment_minute:'0'}}</div>
604
                     </td>
605
                     </td>
605
                     <td width="35">min</td>
606
                     <td width="35">min</td>
606
                     <td></td>
607
                     <td></td>

+ 4 - 4
src/xt_pages/dialysis/template/dialysisPrintOrderTwo.vue View File

36
         </div>
36
         </div>
37
         <div class="inline_block" style="margin-left: 10px;">
37
         <div class="inline_block" style="margin-left: 10px;">
38
           诊断:
38
           诊断:
39
-          <div class="under_line" style="width: 200px;text-align: left">{{patientInfo.diagnose}}</div>
39
+          <div class="under_line" style="width: 180px;text-align: left">{{patientInfo.diagnose}}</div>
40
         </div>
40
         </div>
41
       </div>
41
       </div>
42
 
42
 
320
           </div>
320
           </div>
321
           <div class="inline_block" style="margin-left: 10px;">
321
           <div class="inline_block" style="margin-left: 10px;">
322
             诊断:
322
             诊断:
323
-            <div class="under_line" style="width: 200px;text-align: left">{{patientInfo.diagnose}}</div>
323
+            <div class="under_line" style="width: 180px;text-align: left">{{patientInfo.diagnose}}</div>
324
           </div>
324
           </div>
325
         </div>
325
         </div>
326
 
326
 
616
         </div>
616
         </div>
617
         <div class="inline_block" style="margin-left: 10px;">
617
         <div class="inline_block" style="margin-left: 10px;">
618
           诊断:
618
           诊断:
619
-          <div class="under_line" style="width: 200px;text-align: left">{{patientInfo.diagnose}}</div>
619
+          <div class="under_line" style="width:180px;text-align: left">{{patientInfo.diagnose}}</div>
620
         </div>
620
         </div>
621
       </div>
621
       </div>
622
 
622
 
940
             </div>
940
             </div>
941
             <div class="inline_block" style="margin-left: 10px;">
941
             <div class="inline_block" style="margin-left: 10px;">
942
               诊断:
942
               诊断:
943
-              <div class="under_line" style="width: 200px;text-align: left">{{patientInfo.diagnose}}</div>
943
+              <div class="under_line" style="width: 180px;text-align: left">{{patientInfo.diagnose}}</div>
944
             </div>
944
             </div>
945
           </div>
945
           </div>
946
 
946