Главная Обзор Помощь
Регистрация Вход
csx
/
Vue_New
Следить 2
В избранное 1
Форкнуть 1
Код Задачи 75 Pull Request'ы 0 Релизы 0 Вики Активность
Просмотр исходного кода

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

陈少旭 1 год назад
Родитель
2d47200d71 5734bcdc37
Сommit
40a7a40fea
6 измененных файлов: 155 добавлений и 32 удалений
Разделённый вид Показать статистику Diff
  1. 1 2
      src/xt_pages/dialysis/batch_print/batch_print_order_seventytwo.vue
  2. 4 4
      src/xt_pages/dialysis/batch_print/batch_print_order_six.vue
  3. 14 5
      src/xt_pages/dialysis/longSignPrint.vue
  4. 16 7
      src/xt_pages/dialysis/signPrint.vue
  5. 118 13
      src/xt_pages/user/Informed/components/Medicalhistory.vue
  6. 2 1
      src/xt_pages/user/components/PatientDetail.vue

+ 1 - 2
src/xt_pages/dialysis/batch_print/batch_print_order_seventytwo.vue Просмотреть файл 

@@ -58,7 +58,6 @@
58 58 
             <div class="inline_block" style="margin-left: 10px">
59 59 
               年龄：
60 60 
               <div class="under_line" style="width: 30px; text-align: center">
61 
-                <!-- {{ record.patient.age }} -->
62 61 
                 {{ getAge(record.patient) }}
63 62 
               </div>
64 63 
               岁
 
@@ -1179,7 +1178,7 @@
1179 1178 
                         </div>
1180 1179 
                     </div>
1181 1180 
                     <div style="display: flex;border-top: 1px solid black;text-align: center;"
1182 
-                        v-for="(monitor_record, j) in record.monitor_records" :key="monindex">
1181 
+                        v-for="(monitor_record, j) in record.monitor_records" >
1183 1182 
                       <div style="flex: 0.8;border-right: 1px solid black;">
1184 1183 
                         {{ getTime(monitor_record.operate_time, "{h}:{i}") }}
1185 1184 
                       </div>

+ 4 - 4
src/xt_pages/dialysis/batch_print/batch_print_order_six.vue Просмотреть файл 

@@ -1800,7 +1800,7 @@
1800 1800 
                     </table>
1801 1801 
                   </td>
1802 1802 
                 </tr>
1803 
-                <tr v-if="org_id!=10402 && org_id!=10206 && org_id!=0 && org_id!=10206">
1803 
+                <tr v-if="org_id!=10402 && org_id!=10206  && org_id!=10206">
1804 1804 
                   <td style="padding: 0; position: relative" colspan="2">
1805 1805 
                     <table class="inside_table">
1806 1806 
                       <tbody>
 
@@ -1864,8 +1864,8 @@
1864 1864 
                                   advice[0].advice_desc != undefined
1865 1865 
                                 "
1866 1866 
                               >
1867 
-                                <!-- ({{ advice[0].advice_desc
1868 
-                                }}{{ advice[0].drug_spec_unit }} ) -->
1867 
+                                ({{ advice[0].advice_desc
1868 
+                                }}{{ advice[0].drug_spec_unit }} )
1869 1869 
                               </span>
1870 1870
1871 1871 
                               <span v-if="advice[0].prescribing_number"
 
@@ -2151,7 +2151,7 @@
2151 2151 
                   </td>
2152 2152 
                 </tr>
2153 2153
2154 
-                <tr v-if="org_id == 0 || org_id == 10206">
2154 
+                <tr v-if="org_id == 10206">
2155 2155 
                   <td style="padding: 0; position: relative" colspan="2">
2156 2156 
                     <table class="inside_table">
2157 2157 
                       <tbody>

+ 14 - 5
src/xt_pages/dialysis/longSignPrint.vue Просмотреть файл 

@@ -17,7 +17,7 @@
17 17 
                         <div>姓名:{{item.patient.name}}</div>
18 18
19 19 
                         <div>
20 
-                            <div>医嘱内容:{{ it.advice_name }}
20 
+                            <div>药名:{{ it.advice_name }}
21 21 
                             <span v-if="it.prescribing_number>0 && org_id !=0 && org_id!=10440">
22 22 
                                 {{it.prescribing_number}}{{ it.prescribing_number_unit }}
23 23 
                             
@@ -32,15 +32,19 @@
32 32 
                             规格:{{it.advice_desc}} {{ it.drug_spec_unit }}
33 33
34 34 
                             </div>
35 
-                            <div v-if="(org_id ==0 || org_id==10440 || org_id == 10478) && org_id!=10278">单次用量:{{it.single_dose}}{{it.single_dose_unit }}</div>
35 
+                            <div v-if="(org_id ==0 || org_id==10440 || org_id == 10478 || org_id ==10223) && org_id!=10278">单次用量:{{it.single_dose}}{{it.single_dose_unit }}</div>
36 36 
                             <div v-if="org_id!=0 && org_id!=10278 && org_id!=10138">执行频率:{{it.execution_frequency}}</div>
37 37 
                             <div v-if="org_id!=10278">给药途径:{{it.delivery_way}}</div>
38 
+                            <div v-if="org_id == 0 || org_id==10223">
39 
+                                <span>配药者:</span>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
40 
+                                <span>核对者:</span>
41 
+                           </div>
38 42
39 43 
                         </div>
40 44
41 45 
                        <span v-if="it.childAdvice.length >0">&nbsp;</span>
42 46 
                        <div v-for="its in it.childAdvice">
43 
-                            <div>医嘱内容:{{ its.advice_name }}
47 
+                            <div>药名:{{ its.advice_name }}
44 48 
                             <span v-if="its.prescribing_number>0 && org_id !=0 && org_id!=10440">
45 49 
                                 {{its.prescribing_number}}{{ its.prescribing_number_unit }}
46 50 
                             </span> 
@@ -49,11 +53,16 @@
49 53 
                             规格:{{getSpecialName(its.drug_id)}}
50 54
51 55 
                             </div>
52 
-                            <div v-if=" org_id ==0 || org_id==10440 || org_id == 10478">单次用量:{{its.single_dose}}{{its.single_dose_unit }}</div>
56 
+                            <div v-if=" org_id ==0 || org_id==10440 || org_id == 10478 || org_id ==10223">单次用量:{{its.single_dose}}{{its.single_dose_unit }}</div>
53 57 
                             <div v-if="org_id!=0 && org_id!=10278 && org_id!=10138">执行频率:{{its.execution_frequency}}</div>
54 58 
                             <div>给药途径:{{its.delivery_way}}</div>
59 
+                            <div v-if="org_id == 0 || org_id==10223">
60 
+                                <span>配药者:</span>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
61 
+                                <span>核对者:</span>
62 
+                           </div>
55 63 
                         </div>
56 
-                        <div>打印时间:{{time}}</div>
64 
+                        <div v-if="org_id!=10223 && org_id!=0">打印时间:{{time}}</div>
65 
+                        <div v-if="org_id==10223 || org_id == 0">配药时间:</div>
57 66 
                     </div>
58 67 
                 </div>
59 68 
             </div>

+ 16 - 7
src/xt_pages/dialysis/signPrint.vue Просмотреть файл 

@@ -17,7 +17,7 @@
17 17 
                         <div>姓名:{{item.patient.name}}</div>
18 18
19 19 
                         <div>
20 
-                            <div>医嘱内容:{{ it.advice_name }}
20 
+                            <div>药名:{{ it.advice_name }}
21 21 
                             <span v-if="it.prescribing_number>0 && org_id !=0 && org_id!=10440">
22 22 
                                 {{it.prescribing_number}}{{ it.prescribing_number_unit }}
23 23 
                             
@@ -31,15 +31,19 @@
31 31 
                             <div v-if="org_id ==0 || org_id ==10223">
32 32 
                                 规格:{{it.advice_desc }} {{ it.drug_spec_unit }}
33 33 
                             </div>
34 
-                            <div v-if="(org_id ==0 || org_id==10440 || org_id == 10478 || org_id ==10571) && org_id!=10278">单次用量:{{it.single_dose}}{{it.single_dose_unit }}</div>
35 
-                            <div v-if="org_id!=0 && org_id!=10278 && org_id!=10138">执行频率:{{it.execution_frequency}}</div>
34 
+                            <div v-if="(org_id ==0 || org_id==10440 || org_id == 10478 || org_id ==10571 || org_id ==10223) && org_id!=10278">单次用量:{{it.single_dose}}{{it.single_dose_unit }}</div>
35 
+                            <div v-if="org_id!=0 && org_id!=10278 && org_id!=10138 && org_id!=10223">执行频率:{{it.execution_frequency}}</div>
36 36 
                             <div v-if="org_id!=10278">给药途径:{{it.delivery_way}}</div>
37 
+                            <div v-if="org_id == 0 || org_id==10223">
38 
+                                <span>配药者:</span>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
39 
+                                <span>核对者:</span>
40 
+                           </div>
37 41
38 42 
                         </div>
39 43
40 44 
                        <span v-if="it.childAdvice.length >0">&nbsp;</span>
41 45 
                        <div v-for="its in it.childAdvice">
42 
-                            <div>医嘱内容:{{ its.advice_name }}
46 
+                            <div>药名:{{ its.advice_name }}
43 47 
                             <span v-if="its.prescribing_number>0 && org_id !=0 && org_id!=10440">
44 48 
                                 {{its.prescribing_number}}{{ its.prescribing_number_unit }}
45 49 
                             </span> 
@@ -48,11 +52,16 @@
48 52 
                             规格:{{getSpecialName(its.drug_id)}}
49 53
50 54 
                             </div>
51 
-                            <div v-if=" org_id ==0 || org_id==10440 || org_id == 10478 || org_id ==10571">单次用量:{{its.single_dose}}{{its.single_dose_unit }}</div>
52 
-                            <div v-if="org_id!=0 && org_id!=10278 && org_id!=10138">执行频率:{{its.execution_frequency}}</div>
55 
+                            <div v-if=" org_id ==0 || org_id==10440 || org_id == 10478 || org_id ==10571 || org_id ==10223">单次用量:{{its.single_dose}}{{its.single_dose_unit }}</div>
56 
+                            <div v-if="org_id!=0 && org_id!=10278 && org_id!=10138 && org_id!=10223">执行频率:{{its.execution_frequency}}</div>
53 57 
                             <div>给药途径:{{its.delivery_way}}</div>
58 
+                            <div v-if="org_id == 0 || org_id==10223">
59 
+                                <span>配药者:</span>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
60 
+                                <span>核对者:</span>
61 
+                           </div>
54 62 
                         </div>
55 
-                        <div>打印时间:{{time}}</div>
63 
+                        <div v-if="org_id!=10223 && org_id!=0">打印时间:{{time}}</div>
64 
+                        <div v-if="org_id==10223 || org_id == 0">配药时间:</div>
56 65 
                     </div>
57 66 
                 </div>
58 67 
             </div>

+ 118 - 13
src/xt_pages/user/Informed/components/Medicalhistory.vue Просмотреть файл 

@@ -1,9 +1,9 @@
1 1 
 <template>
2 2 
   <div style="border:1px solid gainsboro ;padding:10px">
3 3 
     <div style="position: relative; left: 400px;width: 250px;margin: 20px 0;">
4 
-      <!-- <el-button type="primary" style=""  @click="bianji">
4 
+      <el-button type="primary" style=""  @click="bianji">
5 5 
             编辑
6 
-        </el-button> -->
6 
+      </el-button>
7 7 
       <!-- <el-button type="danger" style=""  @click="">
8 8 
             删除
9 9 
       </el-button> -->
 
@@ -14,7 +14,6 @@
14 14 
     <div id="print_content">
15 15 
       <div class="print_page_main_content">
16 16 
         <div class="content">
17 
-
18 17 
           <h2 style="text-align: center;margin-bottom: 20px;">门诊血液透析治疗病历首页</h2>
19 18 
           <div style="display: flex;padding: 10px 5px">
20 19 
             <div style="flex: 1;">门诊号<span class="unile">{{ patient.admission_number }}</span></div>
 
@@ -70,7 +69,9 @@
70 69 
           <div style="padding: 10px 5px">
71 70 
             合并症或并发症 <span class="unile"></span>
72 71 
           </div>
73 
-          <div>
72 
+          <div V-html="content"></div>
73 
+          <div v-html="content"></div>
74 
+          <!-- <div>
74 75 
             <table border="1" style="border-collapse: collapse;width: 100%;text-align: center;">
75 76 
               <tr>
76 77 
                 <td colspan="2" class="tablepadd">干体重</td>
 
@@ -85,7 +86,7 @@
85 86 
                 <td>日期</td>
86 87 
                 <td>种类</td>
87 88 
               </tr>
88 
-              <tr v-for="item in 1">
89 
+              <tr v-for="item in 4">
89 90 
                 <td class="tablepadd"></td>
90 91 
                 <td></td>
91 92 
                 <td></td>
 
@@ -106,9 +107,9 @@
106 107 
                 <td>日期</td>
107 108 
                 <td>药物名称</td>
108 109 
               </tr>
109 
-              <tr v-for="item in 1">
110 
+              <tr v-for="item in 4">
110 111 
                 <td class="tablepadd"></td>
111 
-                <td></td>
112 
+                <td ></td>
112 113 
                 <td></td>
113 114 
                 <td></td>
114 115 
                 <td></td>
 
@@ -125,7 +126,7 @@
125 126 
                 <td>透析液钙浓度</td>
126 127 
                 <td>调整日期</td>
127 128 
               </tr>
128 
-              <tr v-for="item in 1">
129 
+              <tr v-for="item in 4">
129 130 
                 <td class="tablepadd"></td>
130 131 
                 <td></td>
131 132 
                 <td></td>
 
@@ -134,15 +135,49 @@
134 135 
                 <td></td>
135 136 
               </tr>
136 137 
             </table>
137 
-          </div>
138 
+          </div> -->
138 139 
         </div>
139 140 
       </div>
140 141 
     </div>
141 
-    <!-- <el-dialog
142 
+    <!-- 编辑 -->
143 
+    <el-dialog
142 144 
       title="提示"
143 145 
       :visible.sync="dialogVisible"
144 146 
       width="60%">
145 147 
         <div>
148 
+          <h2 style="text-align: center;margin-bottom: 20px;">门诊血液透析治疗病历首页</h2>
149 
+          <div style="display: flex;padding: 10px 5px">
150 
+            <div style="flex: 1;">门诊号
151 
+              <span style="display: inline-block;border-bottom: 1px solid black;width: 60%;">{{ patient.admission_number }}</span>
152 
+            </div>
153 
+            <div style="flex: 1;">住院号
154 
+              <span style="display: inline-block;border-bottom: 1px solid black;width: 60%;">{{ patient.admission_number }}</span>
155 
+            </div>
156 
+            <div style="flex: 1;">姓名：
157 
+              <span style="display: inline-block;border-bottom: 1px solid black;width: 60%;">{{ patient.name }}</span>
158 
+            </div>
159 
+            <div style="flex: 1;">性别：
160 
+              <span style="display: inline-block;border-bottom: 1px solid black;width: 60%;">
161 
+                <span v-if="sex==1">男</span>
162 
+                <span v-if="sex==2">女</span>
163 
+              </span>
164 
+              <!-- <input type="checkbox" v-model="nv" class="nv"/>女
165 
+              <input type="checkbox" v-model="nan" class="nan"/>男 -->
166 
+            </div>
167 
+          </div>
168 
+          <!-- <div style="display: flex;padding: 10px 5px">
169 
+            <div style="flex: 1;">姓名：<span class="unile">{{ patient.name }}</span></div>
170 
+            <div style="flex: 1;">性别：
171 
+              <span v-if="sex==1">男</span>
172 
+              <span v-if="sex==2">女</span>
173 
+            </div>
174 
+          </div> -->
175 
+          <div style="padding: 10px 5px">诊断：
176 
+            <span style="display: inline-block;border-bottom: 1px solid black;width: 60%;">{{ patient.diagnose }}</span>
177 
+          </div>
178 
+          <div style="padding: 10px 5px">合并症或并发症
179 
+            <span style="display: inline-block;border-bottom: 1px solid black;width: 60%;"></span>
180 
+          </div>
146 181 
           <keep-alive>
147 182 
             <editor ref="editor"
148 183 
                     id="editor"
 
@@ -155,7 +190,7 @@
155 190 
           <el-button @click="dialogVisible = false">取 消</el-button>
156 191 
           <el-button type="primary" @click="dialogVisible = false">确 定</el-button>
157 192 
         </span>
158 
-    </el-dialog> -->
193 
+    </el-dialog>
159 194 
   </div>
160 195 
 </template>
161 196 
 <script>
 
@@ -164,6 +199,70 @@ import { getPatientDetailInformedconsent  } from '@/api/patient'
164 199 
 import print from "print-js";
165 200 
 import Editor from '@/components/Editor'
166 201 
 import { uParseTime } from '@/utils/tools'
202 
+const content=`<div>
203 
+            <table border="1" style="border-collapse: collapse;width: 100%;text-align: center;">
204 
+              <tr>
205 
+                <td colspan="2" class="tablepadd">干体重</td><td colspan="2" class="tablepadd">血管通路</td>
206 
+                <td colspan="2" class="tablepadd">抗凝剂</td>
207 
+              </tr>
208 
+              <tr>
209 
+                <td class="tablepadd">日期</td><td>体重(kg)</td><td>日期</td>
210 
+                <td>名称</td><td>日期</td><td>种类</td>
211 
+              </tr>
212 
+              <tr>
213 
+                <td class="tablepadd"></td><td></td><td></td><td></td><td></td><td></td>
214 
+              </tr>
215 
+              <tr>
216 
+                <td class="tablepadd"></td><td></td><td></td><td></td><td></td><td></td>
217 
+              </tr>
218 
+              <tr>
219 
+                <td class="tablepadd"></td><td></td><td></td><td></td><td></td><td></td>
220 
+              </tr>
221 
+              <tr>
222 
+                <td class="tablepadd"></td><td></td><td></td><td></td><td></td><td></td>
223 
+              </tr>
224 
+              <tr>
225 
+                <td colspan="2" class="tablepadd">传染病登记</td><td colspan="2" class="tablepadd">肿瘤登记</td>
226 
+                <td colspan="2" class="tablepadd">药物过敏史</td>
227 
+              </tr>
228 
+              <tr>
229 
+                <td class="tablepadd">日期</td><td>名称</td><td>日期</td>
230 
+                <td>名称</td><td>日期</td><td>药物名称</td>
231 
+              </tr>
232 
+              <tr>
233 
+                <td class="tablepadd"></td><td ></td><td></td><td></td><td></td><td></td>
234 
+              </tr>
235 
+              <tr>
236 
+                <td class="tablepadd"></td><td ></td><td></td><td></td><td></td><td></td>
237 
+              </tr>
238 
+              <tr>
239 
+                <td class="tablepadd"></td><td ></td><td></td><td></td><td></td><td></td>
240 
+              </tr>
241 
+              <tr>
242 
+                <td class="tablepadd"></td><td ></td><td></td><td></td><td></td><td></td>
243 
+              </tr>
244 
+              <tr>
245 
+                <td colspan="6" class="tablepadd">血液透析治疗方案调整</td>
246 
+              </tr>
247 
+              <tr>
248 
+                <td class="tablepadd">治疗频率</td><td>调整日期</td><td>治疗方式</td>
249 
+                <td>调整日期</td><td>透析液钙浓度</td><td>调整日期</td>
250 
+              </tr>
251 
+              <tr>
252 
+                <td class="tablepadd"></td><td></td><td></td><td></td><td></td><td></td>
253 
+              </tr>
254 
+              <tr>
255 
+                <td class="tablepadd"></td><td ></td><td></td><td></td><td></td><td></td>
256 
+              </tr>
257 
+              <tr>
258 
+                <td class="tablepadd"></td><td ></td><td></td><td></td><td></td><td></td>
259 
+              </tr>
260 
+              <tr>
261 
+                <td class="tablepadd"></td><td ></td><td></td><td></td><td></td><td></td>
262 
+              </tr>
263 
+
264 
+            </table>
265 
+          </div>`
167 266 
 export default{
168 267 
   props: {
169 268 
     patient_id: {
 
@@ -177,6 +276,9 @@ export default{
177 276 
     return{
178 277 
       patient:{},
179 278 
       dialogVisible:false,
279 
+      content:content,
280 
+
281 
+      number:'',
180 282 
       sex:'',
181 283 
       sheng:'',
182 284 
       shi:'',
 
@@ -187,7 +289,7 @@ export default{
187 289 
   },
188 290 
   created(){
189 291 
     this.getlist()
190 
-
292 
+    // this.number = 1233444
191 293 
     // }
192 294 
   },
193 295 
   methods:{
 
@@ -227,7 +329,7 @@ export default{
227 329 
       })
228 330 
     },
229 331 
     printThisPage(){
230 
-        const style = '@media print {.content p{font-size: 16px;font-family: 新宋体; padding-left: 20px; margin-bottom: 5px;}.unile{display: inline-block;border-bottom: 1px solid black;width: 60%;}.unile2{display: inline-block;border-bottom: 1px solid black;width: 150px;padding: 15px 0;}}'
332 
+        const style = '@media print {.content p{font-size: 16px;font-family: 新宋体; padding-left: 20px; margin-bottom: 5px;}.unile{display: inline-block;border-bottom: 1px solid black;width: 60%;}.unile2{display: inline-block;border-bottom: 1px solid black;width: 150px;padding: 15px 0;}.tablepadd{padding: 0 5px; height: 35px;}}'
231 333 
         printJS({
232 334 
             printable: 'print_content',
233 335 
             type: 'html',
 
@@ -269,6 +371,9 @@ export default{
269 371 
         return sex2.checked=false
270 372 
       }
271 373 
     }
374 
+  },
375 
+  mounted(){
376 
+    this.number = 1233444
272 377 
   }
273 378 
 }
274 379

+ 2 - 1
src/xt_pages/user/components/PatientDetail.vue Просмотреть файл 

@@ -978,7 +978,7 @@
978 978 
     <!-- 打印预览 -->
979 979 
     <div style="display: none">
980 980 
       <div id="print-info-box">
981 
-        <div class="print_main_content" >
981 
+        <div class="print_main_content" style="margin-top: 70px;">
982 982 
           <div class="order_title" v-if="org_id!=10210">{{ orgname }} 血液透析门诊病历</div>
983 983 
           <div class="order_title" v-if="org_id==10210">{{ orgname }} 血液透析住院病历</div>
984 984 
           <div >
 
@@ -2264,6 +2264,7 @@ export default {
2264 2264 
     //    })
2265 2265 
     // }
2266 2266 
   },
2267 
+
2267 2268 
 };
2268 2269 
 </script>
2269 2270