李帅 2 mēneši atpakaļ
vecāks
revīzija
af69b27b27

+ 1 - 0
.env.production

@@ -6,5 +6,6 @@ ENV = 'production'
6 6
 
7 7
 VUE_APP_BASE_API = 'http://39.105.121.97:8080/api'
8 8
 VUE_APP_BASE_WSS = 'ws://39.105.121.97:8002/ws'
9
+
9 10
 # VUE_APP_BASE_API = 'http://106.74.15.131:81/api'
10 11
 # VUE_APP_BASE_WSS = 'ws://106.74.15.131:8002/ws'

+ 18 - 17
src/views/medicalRecords/recordDetailDialog.vue

@@ -11,57 +11,57 @@
11 11
     >
12 12
     <div class="df_box">
13 13
       <div class="left_box">
14
-        <div style="display: flex; margin-top: 10px">
14
+        <div style="display: flex;">
15 15
           <div style="width: 80px; font-weight: 700">主诉:</div>
16 16
           <div style="flex: 1">
17 17
             {{ recordDetailObj.chiefComplaintContent }}
18 18
           </div>
19 19
         </div>
20
-        <div style="display: flex; margin-top: 10px">
20
+        <div style="display: flex; margin-top: 30px">
21 21
           <div style="width: 80px; font-weight: 700">现病史:</div>
22 22
           <div style="flex: 1">
23 23
             {{ recordDetailObj.presentIllnessContent }}
24 24
           </div>
25 25
         </div>
26
-        <div style="display: flex; margin-top: 10px">
26
+        <div style="display: flex; margin-top: 30px">
27 27
           <div style="width: 80px; font-weight: 700">既往史:</div>
28 28
           <div style="flex: 1">
29 29
             {{
30
-              recordDetailObj.doctorPastHistory.length > 0 ? recordDetailObj.doctorPastHistory.join() : '无'
30
+            recordDetailObj.doctorPastHistory ? recordDetailObj.doctorPastHistory.join() : '无'
31 31
             }}
32 32
           </div>
33 33
         </div>
34
-        <div style="display: flex; margin-top: 10px">
34
+        <div style="display: flex; margin-top: 30px">
35 35
           <div style="width: 80px; font-weight: 700">家族史:</div>
36 36
           <div style="flex: 1">
37
-            {{recordDetailObj.doctorFamilyHistory.length > 0 ? recordDetailObj.doctorFamilyHistory.join() : '无'}}
37
+            {{recordDetailObj.doctorFamilyHistory ? recordDetailObj.doctorFamilyHistory.join() : '无'}}
38 38
           </div>
39 39
         </div>
40
-        <div style="display: flex; margin-top: 10px">
40
+        <div style="display: flex; margin-top: 30px">
41 41
           <div style="width: 80px; font-weight: 700">过敏史:</div>
42 42
           <div style="flex: 1">
43
-            {{recordDetailObj.doctorAllergyHistory.length > 0 ? recordDetailObj.doctorAllergyHistory.join() : '无'}}
43
+            {{recordDetailObj.doctorAllergyHistory ? recordDetailObj.doctorAllergyHistory.join() : '无'}}
44 44
           </div>
45 45
         </div>
46
-        <div style="display: flex; margin-top: 10px">
46
+        <div style="display: flex; margin-top: 30px">
47 47
           <div style="width: 80px; font-weight: 700">检查:</div>
48 48
           <div style="flex: 1; display: flex; flex-direction: column">
49 49
             {{ recordDetailObj.inspectContent }}
50 50
           </div>
51 51
         </div>
52
-        <div style="display: flex; margin-top: 10px">
52
+        <div style="display: flex; margin-top: 30px">
53 53
           <div style="width: 80px; font-weight: 700">诊断:</div>
54 54
           <div style="flex: 1; display: flex; flex-direction: column">
55 55
             {{ recordDetailObj.diagnosisContent }}
56 56
           </div>
57 57
         </div>
58
-        <div style="display: flex; margin-top: 10px">
58
+        <div style="display: flex; margin-top: 30px">
59 59
           <div style="width: 80px; font-weight: 700">治疗计划:</div>
60 60
           <div style="flex: 1; display: flex; flex-direction: column">
61 61
             {{ recordDetailObj.treatmentPlanningContent }}
62 62
           </div>
63 63
         </div>
64
-        <div style="display: flex; margin-top: 10px">
64
+        <div style="display: flex; margin-top: 30px">
65 65
           <div style="width: 80px; font-weight: 700">
66 66
             处置:
67 67
           </div>
@@ -69,7 +69,7 @@
69 69
             {{ recordDetailObj.disposeContent }}
70 70
           </div>
71 71
         </div>
72
-        <div style="display: flex; margin-top: 10px">
72
+        <div style="display: flex; margin-top: 30px">
73 73
           <div style="width: 80px; font-weight: 700">便签:</div>
74 74
           <div style="flex: 1; display: flex; flex-direction: column">
75 75
             {{ recordDetailObj.noteContent }}
@@ -78,25 +78,25 @@
78 78
       </div>
79 79
       <div class="rigth_box">
80 80
         <el-card style="height: 100%; padding: 20px">
81
-          <div style="display: flex; margin-top: 10px">
81
+          <div style="display: flex;">
82 82
             <div style="width: 80px; font-weight: 700">科室:</div>
83 83
             <div style="flex: 1">
84 84
               {{ recordDetailObj.department }}
85 85
             </div>
86 86
           </div>
87
-          <div style="display: flex; margin-top: 10px">
87
+          <div style="display: flex; margin-top: 30px">
88 88
             <div style="width: 80px; font-weight: 700">医生:</div>
89 89
             <div style="flex: 1">
90 90
               {{ recordDetailObj.attendingDoctorName }}
91 91
             </div>
92 92
           </div>
93
-          <div style="display: flex; margin-top: 10px">
93
+          <div style="display: flex; margin-top: 30px">
94 94
             <div style="width: 80px; font-weight: 700">费用:</div>
95 95
             <div style="flex: 1">
96 96
               {{ recordDetailObj.cost }} 元
97 97
             </div>
98 98
           </div>
99
-          <div style="display: flex; margin-top: 10px">
99
+          <div style="display: flex; margin-top: 30px">
100 100
             <div style="width: 80px; font-weight: 700">诊所:</div>
101 101
             <div style="flex: 1">
102 102
               {{ recordDetailObj.outpatientService }}
@@ -142,6 +142,7 @@ export default {
142 142
   display: flex;
143 143
   max-height: 70vh;
144 144
   overflow: auto;
145
+  padding: 20px 0px;
145 146
 
146 147
   .left_box {
147 148
     flex: 1;

+ 3 - 3
src/views/operationsAnalysis/index.vue

@@ -30,11 +30,11 @@
30 30
         <p>预约个数: {{ tableForm.patientAppointmentCount }}</p>
31 31
       </el-col>
32 32
       <el-col :span="8" class="two_box">
33
-        <p>应收费用:{{ tableForm.receivableCost }}</p>
33
+        <p>应收费用:{{ tableForm.receivableCost }}(元)</p>
34 34
         <p>就诊数: {{ tableForm.medicalRecordCount }}</p>
35 35
       </el-col>
36 36
       <el-col :span="8" class="two_box">
37
-        <p>实收费用: {{ tableForm.netReceiptsCost }}</p>
37
+        <p>实收费用: {{ tableForm.netReceiptsCost }}(元)</p>
38 38
         <p>回访数: {{ tableForm.patientFollowUpCount }}</p>
39 39
       </el-col>
40 40
     </el-row>
@@ -212,7 +212,7 @@ export default {
212 212
               position: 'top' // 标签位置顶部
213 213
             },
214 214
             type: 'bar',
215
-            barWidth: '5%'
215
+            barWidth: '25%'
216 216
           }
217 217
         ]
218 218
       }

+ 4 - 4
src/views/patientCenter/medical/index.vue

@@ -24,9 +24,9 @@
24 24
       >
25 25
         <el-card>
26 26
           <el-collapse>
27
-            <el-collapse-item  >
27
+            <el-collapse-item>
28 28
               <template slot="title">
29
-                <div style="display: flex; align-items: center">
29
+                <div style="display: flex; max-width: 1200px; align-items: center;overflow:hidden;text-overflow:ellipsis;white-space:nowrap;">
30 30
                   <span> {{ item.visitType == 1 ? '初诊' : '复诊' }} </span>
31 31
                   <span class="span_heigth"> </span>
32 32
                   <span> 诊断:{{ item.diagnosisContent }} </span>
@@ -104,7 +104,7 @@
104 104
                   <div style="display: flex; margin-top: 10px">
105 105
                     <div style="width: 80px; font-weight: 700">处置:</div>
106 106
                     <div style="flex: 1; display: flex; flex-direction: column">
107
-                        {{ item.treatmentPlanningContent }}
107
+                        {{ item.disposeContent }}
108 108
                     </div>
109 109
                   </div>
110 110
                   <div style="display: flex; margin-top: 10px">
@@ -131,7 +131,7 @@
131 131
                     <div style="display: flex; margin-top: 10px">
132 132
                       <div style="width: 80px; font-weight: 700">费用:</div>
133 133
                       <div style="flex: 1">
134
-                        {{ item.cost}} 元
134
+                        {{ item.cost}} 
135 135
                       </div>
136 136
                     </div>
137 137
                     <div style="display: flex; margin-top: 10px">

+ 42 - 154
src/views/returnVisit/addVisitDialog.vue

@@ -313,28 +313,28 @@
313 313
                     <el-collapse>
314 314
                       <el-collapse-item>
315 315
                         <template slot="title">
316
-                          <div style="display: flex; align-items: center">
316
+                          <div style="display: flex;width: 620px; align-items: center;overflow:hidden;text-overflow:ellipsis;white-space:nowrap;">
317 317
                             <span>
318 318
                               {{ item.visitType == 1 ? '初诊' : '复诊' }}
319 319
                             </span>
320 320
                             <span class="span_heigth"> </span>
321
-                            <span> 诊断:{{ item.diagnosisTypeCn }} </span>
321
+                            <span> 诊断:{{ item.diagnosisContent }} </span>
322 322
                             <span class="span_heigth"> </span>
323
-                            <span> 治疗:{{ item.treatment }} </span>
323
+                            <span> 治疗:{{ item.treatmentPlanningContent }} </span>
324 324
                           </div>
325 325
 
326
-                          <div
326
+                          <!-- <div
327 327
                             class="white dayin_box"
328 328
                             @click.prevent.stop="print(item.id)"
329 329
                           >
330 330
                             打印病历
331
-                          </div>
332
-                          <div v-if="item.status == 2" class="zhang_box">
331
+                          </div> -->
332
+                          <!-- <div v-if="item.status == 2" class="zhang_box">
333 333
                             已完成治疗
334 334
                           </div>
335 335
                           <div v-if="item.status == 1" class="zhang_box">
336 336
                             待复诊
337
-                          </div>
337
+                          </div> -->
338 338
                         </template>
339 339
                         <div class="df_box">
340 340
                           <div class="left_box">
@@ -343,12 +343,7 @@
343 343
                                 主诉:
344 344
                               </div>
345 345
                               <div style="flex: 1">
346
-                                {{
347
-                                  initToothPosition(
348
-                                    item.dataList[0].toothPosition
349
-                                  )
350
-                                }}
351
-                                {{ item.dataList[0].data[0].contentInfo }}
346
+                                {{ item.chiefComplaintContent }}
352 347
                               </div>
353 348
                             </div>
354 349
                             <div style="display: flex; margin-top: 10px">
@@ -356,12 +351,7 @@
356 351
                                 现病史:
357 352
                               </div>
358 353
                               <div style="flex: 1">
359
-                                {{
360
-                                  initToothPosition(
361
-                                    item.dataList[0].toothPosition
362
-                                  )
363
-                                }}
364
-                                {{ item.dataList[0].data[1].contentInfo }}
354
+                                {{ item.presentIllnessContent }}
365 355
                               </div>
366 356
                             </div>
367 357
                             <div style="display: flex; margin-top: 10px">
@@ -369,12 +359,7 @@
369 359
                                 既往史:
370 360
                               </div>
371 361
                               <div style="flex: 1">
372
-                                {{
373
-                                  item.dataList[0].data[2].formattedPartsList
374
-                                    .length > 0
375
-                                    ? item.dataList[0].data[2].formattedPartsList.join()
376
-                                    : '无'
377
-                                }}
362
+                                {{ Array.isArray(item.doctorPastHistory) && item.doctorPastHistory.length > 0 ? item.doctorPastHistory.join() : '无' }}
378 363
                               </div>
379 364
                             </div>
380 365
                             <div style="display: flex; margin-top: 10px">
@@ -382,12 +367,7 @@
382 367
                                 家族史:
383 368
                               </div>
384 369
                               <div style="flex: 1">
385
-                                {{
386
-                                  item.dataList[0].data[3].formattedPartsList
387
-                                    .length > 0
388
-                                    ? item.dataList[0].data[2].formattedPartsList.join()
389
-                                    : '无'
390
-                                }}
370
+                                {{ Array.isArray(item.doctorFamilyHistory) && item.doctorFamilyHistory.length > 0 ? item.doctorFamilyHistory.join() : '无' }}
391 371
                               </div>
392 372
                             </div>
393 373
                             <div style="display: flex; margin-top: 10px">
@@ -395,12 +375,7 @@
395 375
                                 过敏史:
396 376
                               </div>
397 377
                               <div style="flex: 1">
398
-                                {{
399
-                                  item.dataList[0].data[4].formattedPartsList
400
-                                    .length > 0
401
-                                    ? item.dataList[0].data[2].formattedPartsList.join()
402
-                                    : '无'
403
-                                }}
378
+                                {{ Array.isArray(item.doctorAllergyHistory) && item.doctorAllergyHistory.length > 0 ? item.doctorAllergyHistory.join() : '无' }}
404 379
                               </div>
405 380
                             </div>
406 381
                             <div style="display: flex; margin-top: 10px">
@@ -414,43 +389,7 @@
414 389
                                   flex-direction: column;
415 390
                                 "
416 391
                               >
417
-                                <span
418
-                                  v-for="(it, ind) in item.dataList"
419
-                                  :key="ind"
420
-                                  style="margin-top: 5px"
421
-                                >
422
-                                  {{
423
-                                    initToothPosition(
424
-                                      item.dataList[ind].toothPosition
425
-                                    )
426
-                                  }}
427
-                                  {{ it.data[5].contentInfo }}
428
-                                </span>
429
-                              </div>
430
-                            </div>
431
-                            <div style="display: flex; margin-top: 10px">
432
-                              <div style="width: 80px; font-weight: 700">
433
-                                X线片示(影像):
434
-                              </div>
435
-                              <div
436
-                                style="
437
-                                  flex: 1;
438
-                                  display: flex;
439
-                                  flex-direction: column;
440
-                                "
441
-                              >
442
-                                <span
443
-                                  v-for="(it, ind) in item.dataList"
444
-                                  :key="ind"
445
-                                  style="margin-top: 5px"
446
-                                >
447
-                                  {{
448
-                                    initToothPosition(
449
-                                      item.dataList[ind].toothPosition
450
-                                    )
451
-                                  }}
452
-                                  {{ it.data[6].contentInfo }}
453
-                                </span>
392
+                                {{ item.inspectContent }}
454 393
                               </div>
455 394
                             </div>
456 395
                             <div style="display: flex; margin-top: 10px">
@@ -464,18 +403,7 @@
464 403
                                   flex-direction: column;
465 404
                                 "
466 405
                               >
467
-                                <span
468
-                                  v-for="(it, ind) in item.dataList"
469
-                                  :key="ind"
470
-                                  style="margin-top: 5px"
471
-                                >
472
-                                  {{
473
-                                    initToothPosition(
474
-                                      item.dataList[ind].toothPosition
475
-                                    )
476
-                                  }}
477
-                                  {{ it.data[7].contentInfo }}
478
-                                </span>
406
+                              {{ item.diagnosisContent }}
479 407
                               </div>
480 408
                             </div>
481 409
                             <div style="display: flex; margin-top: 10px">
@@ -489,43 +417,7 @@
489 417
                                   flex-direction: column;
490 418
                                 "
491 419
                               >
492
-                                <span
493
-                                  v-for="(it, ind) in item.dataList"
494
-                                  :key="ind"
495
-                                  style="margin-top: 5px"
496
-                                >
497
-                                  {{
498
-                                    initToothPosition(
499
-                                      item.dataList[ind].toothPosition
500
-                                    )
501
-                                  }}
502
-                                  {{ it.data[8].contentInfo }}
503
-                                </span>
504
-                              </div>
505
-                            </div>
506
-                            <div style="display: flex; margin-top: 10px">
507
-                              <div style="width: 80px; font-weight: 700">
508
-                                处置(基础模版公用):
509
-                              </div>
510
-                              <div
511
-                                style="
512
-                                  flex: 1;
513
-                                  display: flex;
514
-                                  flex-direction: column;
515
-                                "
516
-                              >
517
-                                <span
518
-                                  v-for="(it, ind) in item.dataList"
519
-                                  :key="ind"
520
-                                  style="margin-top: 5px"
521
-                                >
522
-                                  {{
523
-                                    initToothPosition(
524
-                                      item.dataList[ind].toothPosition
525
-                                    )
526
-                                  }}
527
-                                  {{ it.data[9].contentInfo }}
528
-                                </span>
420
+                              {{ item.treatmentPlanningContent }}
529 421
                               </div>
530 422
                             </div>
531 423
                             <div style="display: flex; margin-top: 10px">
@@ -539,23 +431,12 @@
539 431
                                   flex-direction: column;
540 432
                                 "
541 433
                               >
542
-                                <span
543
-                                  v-for="(it, ind) in item.dataList"
544
-                                  :key="ind"
545
-                                  style="margin-top: 5px"
546
-                                >
547
-                                  {{
548
-                                    initToothPosition(
549
-                                      item.dataList[ind].toothPosition
550
-                                    )
551
-                                  }}
552
-                                  {{ it.data[10].contentInfo }}
553
-                                </span>
434
+                              {{ item.disposeContent }}
554 435
                               </div>
555 436
                             </div>
556 437
                             <div style="display: flex; margin-top: 10px">
557 438
                               <div style="width: 80px; font-weight: 700">
558
-                                医嘱
439
+                                便签:
559 440
                               </div>
560 441
                               <div
561 442
                                 style="
@@ -564,18 +445,7 @@
564 445
                                   flex-direction: column;
565 446
                                 "
566 447
                               >
567
-                                <span
568
-                                  v-for="(it, ind) in item.dataList"
569
-                                  :key="ind"
570
-                                  style="margin-top: 5px"
571
-                                >
572
-                                  {{
573
-                                    initToothPosition(
574
-                                      item.dataList[ind].toothPosition
575
-                                    )
576
-                                  }}
577
-                                  {{ it.data[11].contentInfo }}
578
-                                </span>
448
+                              {{ item.noteContent }}
579 449
                               </div>
580 450
                             </div>
581 451
                           </div>
@@ -586,7 +456,7 @@
586 456
                                   科室:
587 457
                                 </div>
588 458
                                 <div style="flex: 1">
589
-                                  {{ list[0].department }}
459
+                                  {{ item.department }}
590 460
                                 </div>
591 461
                               </div>
592 462
                               <div style="display: flex; margin-top: 10px">
@@ -594,7 +464,7 @@
594 464
                                   医生:
595 465
                                 </div>
596 466
                                 <div style="flex: 1">
597
-                                  {{ list[0].attendingDoctorName }}
467
+                                  {{ item.attendingDoctorName }}
598 468
                                 </div>
599 469
                               </div>
600 470
                               <div style="display: flex; margin-top: 10px">
@@ -602,7 +472,7 @@
602 472
                                   费用:
603 473
                                 </div>
604 474
                                 <div style="flex: 1">
605
-                                  {{ list[0].cost }}
475
+                                  {{ item.cost }} (元)
606 476
                                 </div>
607 477
                               </div>
608 478
                               <div style="display: flex; margin-top: 10px">
@@ -610,7 +480,7 @@
610 480
                                   诊所:
611 481
                                 </div>
612 482
                                 <div style="flex: 1">
613
-                                  {{ list[0].clinicName }}
483
+                                  {{ item.outpatientService }}
614 484
                                 </div>
615 485
                               </div>
616 486
                             </el-card>
@@ -987,7 +857,7 @@ export default {
987 857
         patientId: this.patientId,
988 858
         queryScope: this.date
989 859
       })
990
-      console.log(res.data,"res.data");
860
+      console.log(res.data,"res.data3");
991 861
       this.list = res.data
992 862
     },
993 863
     getAgeFromIdCard(idCard) {
@@ -1152,7 +1022,7 @@ export default {
1152 1022
       padding-left: 10px;
1153 1023
     }
1154 1024
     .rigth_box {
1155
-      width: 300px;
1025
+      width: 200px;
1156 1026
     }
1157 1027
   }
1158 1028
 }
@@ -1212,4 +1082,22 @@ ul {
1212 1082
     }
1213 1083
   }
1214 1084
 }
1085
+
1086
+.white {
1087
+  display: inline-block;
1088
+  background-color: #fff;
1089
+  color: #606266;
1090
+  border: 1px solid #dcdfe6;
1091
+  line-height: 30px;
1092
+  border-radius: 5%;
1093
+  min-width: 80px;
1094
+  text-align: center;
1095
+  cursor: pointer;
1096
+}
1097
+
1098
+.dayin_box {
1099
+  position: absolute;
1100
+  left: 85%;
1101
+  top: 5;
1102
+}
1215 1103
 </style>

+ 3 - 3
src/views/system/user/index.vue

@@ -829,9 +829,9 @@ export default {
829 829
   created() {
830 830
     this.getList()
831 831
     this.getDeptTree()
832
-    this.getConfigKey('sys.user.initPassword').then((response) => {
833
-      this.initPassword = response.msg
834
-    })
832
+    // this.getConfigKey('sys.user.initPassword').then((response) => {
833
+    //   this.initPassword = response.msg
834
+    // })
835 835
     this.initBusinessDictData()
836 836
   },
837 837
   methods: {