Bladeren bron

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

csx 3 jaren geleden
bovenliggende
commit
9fa79c5e5e

+ 1 - 1
src/utils/request.js Bestand weergeven

@@ -6,7 +6,7 @@ import store from '@/store'
6 6
 // create an axios instance
7 7
 const service = axios.create({
8 8
   baseURL: process.env.BASE_API, // api的base_url
9
-  timeout: 30000, // request timeout
9
+  timeout: 60000, // request timeout
10 10
   withCredentials: true
11 11
 })
12 12
 

+ 1 - 1
src/xt_pages/hospitalStation/components/ChargePrescriptionTable.vue Bestand weergeven

@@ -123,7 +123,7 @@
123 123
         <template slot-scope="scope">{{ scope.row.project_name }}</template>
124 124
       </el-table-column>
125 125
       <el-table-column align="center" prop="statistical_classification" width="100" label="组">
126
-        <template slot-scope="scope">{{scope.row.type == 2 ?getGroup(scope.row.statistical_classification):'耗材'}}</template>
126
+        <template slot-scope="scope">{{scope.row.statistical_classification}}</template>
127 127
       </el-table-column>
128 128
       <el-table-column align="center" prop="single_dose" width="80" label="单次用量">
129 129
         <template slot-scope="scope">{{scope.row.single_dose}}{{scope.row.unit}}</template>

Diff onderdrukt omdat het te groot bestand
+ 2954 - 2958
src/xt_pages/hospitalStation/components/deskPrescription.vue


+ 2 - 2
src/xt_pages/hospitalStation/components/inquiriesDetail.vue Bestand weergeven

@@ -296,7 +296,7 @@
296 296
                   unit:prescription.project[b].project.unit,
297 297
                 };
298 298
                 if(prescription.project[b].type == 2){
299
-                  obj['statistical_classification'] =  prescription.project[b].project.statistical_classification
299
+                  obj['statistical_classification'] =  prescription.project[b].team.project_team
300 300
                   obj['medical_code'] =  prescription.project[b].project.medical_code
301 301
                   obj['project_name'] =  prescription.project[b].project.project_name
302 302
                   obj['type'] =  2
@@ -304,7 +304,7 @@
304 304
 
305 305
 
306 306
                 }else if(prescription.project[b].type == 3){
307
-                  obj['statistical_classification'] = ""
307
+                  obj['statistical_classification'] = prescription.project[b].team.project_team
308 308
                   obj['medical_code'] =  prescription.project[b].good_info.medical_insurance_number
309 309
                   obj['project_name'] =  prescription.project[b].good_info.good_name
310 310
                   obj['type'] =  3

+ 1 - 1
src/xt_pages/hospitalStation/components/newPrescriptionTable.vue Bestand weergeven

@@ -63,7 +63,7 @@
63 63
       </el-table-column>
64 64
       <el-table-column align="center" prop="statistical_classification" width="100" label="组">
65 65
         <template slot-scope="scope">
66
-          <div>{{scope.row.type == 2?getGroup(scope.row.statistical_classification):"耗材"}}</div>
66
+          <div>{{scope.row.statistical_classification}}</div>
67 67
         </template>
68 68
       </el-table-column>
69 69
       <el-table-column align="center" prop="single_dose" width="100" label="单次用量">

+ 5 - 5
src/xt_pages/hospitalStation/outpatientChargesManagement.vue Bestand weergeven

@@ -832,14 +832,14 @@
832 832
 
833 833
                 }
834 834
                 if (prescription.project[b].type == 2) {
835
-                  obj['statistical_classification'] = prescription.project[b].project.statistical_classification
835
+                  obj['statistical_classification'] = prescription.project[b].team.project_team
836 836
                   obj['medical_code'] = prescription.project[b].project.medical_code
837 837
                   obj['project_name'] = prescription.project[b].project.project_name
838 838
                   obj['spec'] = ""
839 839
                   obj['name_id'] = 0
840 840
 
841 841
                 } else if (prescription.project[b].type == 3) {
842
-                  obj['statistical_classification'] = ''
842
+                  obj['statistical_classification'] = prescription.project[b].team.project_team
843 843
                   obj['medical_code'] = prescription.project[b].good_info.medical_insurance_number
844 844
                   obj['project_name'] = prescription.project[b].good_info.good_name
845 845
                   obj['spec'] = prescription.project[b].good_info.specification_name
@@ -2581,7 +2581,7 @@
2581 2581
             if (project_ids[i].price == project_month_prescriptions.project[a].price && project_ids[i].id == project_month_prescriptions.project[a].project_id) {
2582 2582
 
2583 2583
               if (project_month_prescriptions.project[a].type == 2) {
2584
-                obj['statistical_classification'] = project_month_prescriptions.project[a].project.statistical_classification
2584
+                obj['statistical_classification'] = ''
2585 2585
                 obj['medical_code'] = project_month_prescriptions.project[a].project.medical_code
2586 2586
                 obj['project_name'] = project_month_prescriptions.project[a].project.project_name
2587 2587
                 obj['type'] = 2
@@ -2813,7 +2813,7 @@
2813 2813
                 }
2814 2814
 
2815 2815
                 if (prescription.project[b].type == 2) {
2816
-                  obj['statistical_classification'] = prescription.project[b].project.statistical_classification
2816
+                  obj['statistical_classification'] = prescription.project[b].team.project_team
2817 2817
                   obj['medical_code'] = prescription.project[b].project.medical_code
2818 2818
                   obj['project_name'] = prescription.project[b].project.project_name
2819 2819
                   obj['spec'] = ""
@@ -2821,7 +2821,7 @@
2821 2821
 
2822 2822
 
2823 2823
                 } else if (prescription.project[b].type == 3) {
2824
-                  obj['statistical_classification'] = ''
2824
+                  obj['statistical_classification'] = prescription.project[b].team.project_team
2825 2825
                   obj['medical_code'] = prescription.project[b].good_info.medical_insurance_number
2826 2826
                   obj['project_name'] = prescription.project[b].good_info.good_name
2827 2827
                   obj['spec'] = prescription.project[b].good_info.specification_name

+ 3 - 3
src/xt_pages/hospitalStation/print.vue Bestand weergeven

@@ -16,7 +16,7 @@
16 16
             <div v-if="org_id != 10138">
17 17
                 <printOne v-if="org_id != 10088 && org_id != 10215" v-bind:childResponse="childResponse" :advicePrint="advicePrint" :ids="ids" :patient="patient" :hisPatient="hisPatient" :doctorPorject="doctorPorject" :patient_id="patient_id" :record_date="record_date" :prescription_id="prescription_id"></printOne>
18 18
                 <printFour v-if="org_id == 10088" v-bind:childResponse="childResponse" :advicePrint="advicePrint" :ids="ids" :patient="patient" :hisPatient="hisPatient" :doctorPorject="doctorPorject" :patient_id="patient_id" :record_date="record_date" :prescription_id="prescription_id"></printFour>
19
-                <printFive v-if="org_id == 10215" v-bind:childResponse="childResponse" :advicePrint="advicePrint" :ids="ids" :patient="patient" :hisPatient="hisPatient" :doctorPorject="doctorPorject" :patient_id="patient_id" :record_date="record_date" :prescription_id="prescription_id"></printFive>
19
+                <printFive v-if="org_id == 10215 || org_id == 0" v-bind:childResponse="childResponse" :advicePrint="advicePrint" :ids="ids" :patient="patient" :hisPatient="hisPatient" :doctorPorject="doctorPorject" :patient_id="patient_id" :record_date="record_date" :prescription_id="prescription_id"></printFive>
20 20
             </div>
21 21
             <div v-else>
22 22
                 <printThree v-bind:childResponse="childResponse" :advicePrint="advicePrint" :ids="ids" :patient="patient" :hisPatient="hisPatient" :doctorPorject="doctorPorject" :patient_id="patient_id" :record_date="record_date" :prescription_id="prescription_id"></printThree>
@@ -382,8 +382,8 @@
382 382
     .dialysisPage::-webkit-scrollbar {
383 383
         height: 15px;
384 384
     }
385
-    
386
-    
385
+
386
+
387 387
 
388 388
     .el-date-editor{
389 389
     .el-input__inner{

+ 370 - 301
src/xt_pages/hospitalStation/template/printFive.vue Bestand weergeven

@@ -2,85 +2,120 @@
2 2
   <div id='prescriptionPrint'>
3 3
     <div v-for="(item,index) in advicePrint" :key="index">
4 4
       <div id='prescription-print' class="prescription-print" style="page-break-after: always;">
5
-          <div class="printTitle" v-if="prescriptions[0].med_type == '1111'">{{orgname}}第一类精神处方笺</div>
6
-          <div class="printTitle"  v-if="prescriptions[0].med_type == '1112'">{{orgname}}第二类精神处方笺</div>
7
-          <div class="printTitle" v-if="prescriptions[0].med_type != '1111' && prescriptions[0].med_type != '1112'">{{orgname}}处方笺</div>
8
-          <div class="NoCell">
9
-              <div><span style="font-size:20px;font-weight:bold;">No</span><div class="underLine" style="width:120px;">{{ (item.prescription_number + (index + 1)).substring(item.prescription_number.length-6) }}</div></div>
10
-              <div style="display:flex;">
11
-                  <div style="display: flex;flex-direction: column-reverse;">开具日期</div>
12
-                  <div class="underLine" style="width:60px;">{{getTime(item.ctime)?getTime(item.ctime).split(' ')[0].slice(0,4):""}}</div><div style="display: flex;flex-direction: column-reverse;">年</div>
13
-                  <div class="underLine" style="width:60px;">{{getTime(item.ctime)?getTime(item.ctime).split(' ')[0].slice(5,7):""}}</div><div style="display: flex;flex-direction: column-reverse;">月</div>
14
-                  <div class="underLine" style="width:60px;">{{getTime(item.ctime)?getTime(item.ctime).split(' ')[0].slice(8,11):""}}</div><div style="display: flex;flex-direction: column-reverse;">日</div>
15
-              </div>
5
+        <div  style="float: right" v-if="prescriptions[0].med_type == '1111'">{{ orgname }}精一</div>
6
+        <div  style="float: right" v-if="prescriptions[0].med_type == '1112'">{{ orgname }}精二</div>
7
+        <div  style="float: right"
8
+             v-if="prescriptions[0].med_type != '1111' && prescriptions[0].med_type != '1112'">普通
9
+        </div>
10
+
11
+        <div class="printTitle">{{ orgname }}处方笺</div>
12
+        <div class="NoCell">
13
+          <div><span style="font-size:20px;font-weight:bold;">No</span>
14
+            <div class="underLine" style="width:120px;">
15
+              {{ (item.prescription_number + (index + 1)).substring(item.prescription_number.length - 6) }}
16
+            </div>
16 17
           </div>
17
-          <div class="basicCell">
18
-              <span>透析号</span>
19
-              <span class="underLine" style="width:100px;">{{ item.patient.dialysis_no ? item.patient.dialysis_no : '' }}</span>
20
-              <span>治疗区</span>
21
-              <span class="underLine" style="width:100px;">{{item.info?getDepart(item.info.departments):''}}</span>
22
-              <span>费别</span>
23
-              <span class="underLine" style="width:100px;"></span>
18
+          <div style="display:flex;">
19
+            <div style="display: flex;flex-direction: column-reverse;">开具日期</div>
20
+            <div class="underLine" style="width:60px;">
21
+              {{ getTime(item.ctime) ? getTime(item.ctime).split(' ')[0].slice(0, 4) : '' }}
22
+            </div>
23
+            <div style="display: flex;flex-direction: column-reverse;">年</div>
24
+            <div class="underLine" style="width:60px;">
25
+              {{ getTime(item.ctime) ? getTime(item.ctime).split(' ')[0].slice(5, 7) : '' }}
26
+            </div>
27
+            <div style="display: flex;flex-direction: column-reverse;">月</div>
28
+            <div class="underLine" style="width:60px;">
29
+              {{ getTime(item.ctime) ? getTime(item.ctime).split(' ')[0].slice(8, 11) : '' }}
30
+            </div>
31
+            <div style="display: flex;flex-direction: column-reverse;">日</div>
24 32
           </div>
25
-          <div class="basicCell">
26
-              <span>姓名</span>
27
-              <span class="underLine" style="width:100px;">{{item.patient.name?item.patient.name:""}}</span>
28
-              <span>性别</span>
29
-              <span class="underLine" style="width:60px;">
33
+        </div>
34
+        <div class="basicCell">
35
+          <span>透析号</span>
36
+          <span class="underLine" style="width:100px;">{{
37
+              item.patient.dialysis_no ? item.patient.dialysis_no : ''
38
+            }}</span>
39
+          <span>治疗区</span>
40
+          <span class="underLine" style="width:100px;">{{ item.info ? getDepart(item.info.departments) : '' }}</span>
41
+          <span>费别</span>
42
+          <span class="underLine" style="width:100px;"></span>
43
+        </div>
44
+        <div class="basicCell">
45
+          <span>姓名</span>
46
+          <span class="underLine" style="width:100px;">{{ item.patient.name ? item.patient.name : '' }}</span>
47
+          <span>性别</span>
48
+          <span class="underLine" style="width:60px;">
30 49
                 <span v-if="item.patient.gender == 1">男</span>
31 50
                 <span v-if="item.patient.gender == 2">女</span>
32 51
               </span>
33
-              <span>年龄</span>
34
-              <span class="underLine" style="width:60px;">{{getAge(item.patient)?getAge(item.patient):""}}岁</span>
35
-              <span>电话</span>
36
-              <span class="underLine" style="width:120px;">{{item.patient.phone}}</span>
52
+          <span>年龄</span>
53
+          <span class="underLine" style="width:60px;">{{ getAge(item.patient) ? getAge(item.patient) : '' }}岁</span>
54
+          <span>电话</span>
55
+          <span class="underLine" style="width:120px;">{{ item.patient.phone }}</span>
56
+        </div>
57
+        <div class="basicCell" style="margin-bottom:30px;">
58
+          <span>临床诊断</span>
59
+          <span class="underLine"
60
+                style="width:100%;flex:1;text-align:left;padding-left:10px;">{{ getDiagnosis(item.info.diagnosis) }}</span>
61
+        </div>
62
+        <div class="prescriptionBox" style="border-top: 1px solid #000;border-bottom: 1px solid #000;">
63
+          <div class="Rp">Rp:</div>
64
+          <div class="drugsBox" v-for="(it,index) in item.advices" :key="index">
65
+            <!-- <div class="drugsOne"><span style="font-weight:bold;">{{ index+1 + '.' }}</span>{{it.advice_name?it.advice_name:""}}&nbsp;&nbsp;{{it.single_dose}}{{it.single_dose_unit}}&nbsp;×&nbsp; {{it.prescribing_number}}{{it.prescribing_number_unit}}</div> -->
66
+            <div class="drugsOne"><span style="font-weight:bold;">{{
67
+                index + 1 + '.'
68
+              }}</span>{{ it.advice_name ? it.advice_name : '' }}&nbsp;&nbsp;<span
69
+                v-if="it.drug.min_unit != it.drug.dose_unit">{{ it.drug.dose }}{{ it.drug.dose_unit }}&nbsp;* &nbsp;</span>{{ it.drug.min_number }}{{ it.drug.min_unit }}/{{ it.drug.max_unit }}&nbsp;×&nbsp;
70
+              {{ it.prescribing_number }}{{ it.prescribing_number_unit }}
71
+            </div>
72
+            <div style="margin-left:100px;">
73
+              <span>用法:{{ it.single_dose }}{{ it.single_dose_unit }}</span>&nbsp;&nbsp;<span>{{ it.execution_frequency }}&nbsp;{{ it.delivery_way }}&nbsp;</span>&nbsp;&nbsp;<span>{{ it.advice_desc }}</span>
74
+            </div>
37 75
           </div>
38
-          <div class="basicCell" style="margin-bottom:30px;">
39
-              <span>临床诊断</span>
40
-              <span class="underLine" style="width:100%;flex:1;text-align:left;padding-left:10px;">{{getDiagnosis(item.info.diagnosis)}}</span>
76
+          <div class="drugsBox" v-for="(it,i) in item.additionalcharge" :key="i">
77
+            <div class="drugsOne">{{ it.item_name ? it.item_name : '' }}:&nbsp;{{ it.price }}元/{{ it.count }}次</div>
41 78
           </div>
42
-          <div class="prescriptionBox" style="border-top: 1px solid #000;border-bottom: 1px solid #000;">
43
-              <div class="Rp">Rp:</div>
44
-              <div class="drugsBox" v-for="(it,index) in item.advices" :key="index">
45
-                  <!-- <div class="drugsOne"><span style="font-weight:bold;">{{ index+1 + '.' }}</span>{{it.advice_name?it.advice_name:""}}&nbsp;&nbsp;{{it.single_dose}}{{it.single_dose_unit}}&nbsp;×&nbsp; {{it.prescribing_number}}{{it.prescribing_number_unit}}</div> -->
46
-                  <div class="drugsOne"><span style="font-weight:bold;">{{ index+1 + '.' }}</span>{{it.advice_name?it.advice_name:""}}&nbsp;&nbsp;<span v-if="it.drug.min_unit != it.drug.dose_unit">{{it.drug.dose}}{{it.drug.dose_unit}}&nbsp;* &nbsp;</span>{{it.drug.min_number}}{{it.drug.min_unit}}/{{it.drug.max_unit}}&nbsp;×&nbsp; {{it.prescribing_number}}{{it.prescribing_number_unit}}</div>
47
-                  <div style="margin-left:100px;"><span>用法:{{it.single_dose}}{{it.single_dose_unit}}</span>&nbsp;&nbsp;<span>{{it.execution_frequency}}&nbsp;{{it.delivery_way}}&nbsp;</span>&nbsp;&nbsp;<span>{{it.advice_desc}}</span></div>
48
-              </div>
49
-              <div class="drugsBox" v-for="(it,i) in item.additionalcharge" :key="i">
50
-                <div class="drugsOne">{{it.item_name?it.item_name:""}}:&nbsp;{{it.price}}元/{{it.count}}次</div>
51
-               </div>
52
-
53
-              <div class="drugsBox" v-for="(it,index) in item.project" :key="index">
54
-                  <div class="drugsOne"><span style="font-weight:bold;">{{ index+1 + '.' }}</span>{{it.type == 2?getProjectName(it.project_id)?getProjectName(it.project_id):"":it.good_info.good_name}}&nbsp;&nbsp;{{it.single_dose}}{{it.single_dose_unit}}&nbsp;×&nbsp; {{it.count}}{{unit}}</div>
55
-                  <div style="margin-left:100px;"><span>用法:{{it.single_dose}}{{it.single_dose_unit}}</span>&nbsp;&nbsp;<span>{{it.delivery_way}}</span>&nbsp;&nbsp;<span>{{it.advice_desc}}</span></div>
56
-              </div>
57
-              <div class="drugsBox" v-for="(it,i) in item.additionalcharge" :key="i">
58
-                <div class="drugsOne">{{it.project_id?it.project_id:""}}:&nbsp;{{it.price.toFixed(2)}}元/{{it.count}}次</div>
59
-               </div>
60
-               <div style="text-align:center;" >(以下空白)</div>
61 79
 
80
+          <div class="drugsBox" v-for="(it,index) in item.project" :key="index">
81
+            <div class="drugsOne"><span style="font-weight:bold;">{{
82
+                index + 1 + '.'
83
+              }}</span>{{ it.type == 2 ? getProjectName(it.project_id) ? getProjectName(it.project_id) : '' : it.good_info.good_name }}&nbsp;&nbsp;{{ it.single_dose }}{{ it.single_dose_unit }}&nbsp;×&nbsp;
84
+              {{ it.count }}{{ unit }}
85
+            </div>
86
+            <div style="margin-left:100px;">
87
+              <span>用法:{{ it.single_dose }}{{ it.single_dose_unit }}</span>&nbsp;&nbsp;<span>{{ it.delivery_way }}</span>&nbsp;&nbsp;<span>{{ it.advice_desc }}</span>
88
+            </div>
89
+          </div>
90
+          <div class="drugsBox" v-for="(it,i) in item.additionalcharge" :key="i">
91
+            <div class="drugsOne">
92
+              {{ it.project_id ? it.project_id : '' }}:&nbsp;{{ it.price.toFixed(2) }}元/{{ it.count }}次
93
+            </div>
94
+          </div>
95
+          <div style="text-align:center;">(以下空白)</div>
96
+
97
+        </div>
98
+        <div class="NoCell" style="margin-top:20px;">
99
+          <div style="display:flex;">
100
+            <span>医师</span>
101
+            <span class="underLine" style="width:100px;">{{ item.doctor ? item.doctor : '' }}</span>
102
+          </div>
103
+          <div style="display:flex;">
104
+            <span>金额</span>
105
+            <span class="underLine" style="width:100px;"></span>
62 106
           </div>
63
-          <div class="NoCell" style="margin-top:20px;">
64
-              <div style="display:flex;">
65
-                <span>医师</span>
66
-                <span class="underLine" style="width:100px;">{{item.doctor?item.doctor:""}}</span>
67
-              </div>
68
-              <div style="display:flex;">
69
-                <span>金额</span>
70
-                <span class="underLine" style="width:100px;"></span>
71
-              </div>
107
+        </div>
108
+        <div class="NoCell">
109
+          <div style="display:flex;">
110
+            <span>药师(审核、核对、发药)</span>
111
+            <span class="underLine" style="width:100px;"></span>
72 112
           </div>
73
-          <div class="NoCell">
74
-              <div style="display:flex;">
75
-                <span>药师(审核、核对、发药)</span>
76
-                <span class="underLine" style="width:100px;"></span>
77
-              </div>
78
-              <div style="display:flex;">
79
-                <span>调配</span>
80
-                <span class="underLine" style="width:100px;"></span>
81
-              </div>
113
+          <div style="display:flex;">
114
+            <span>调配</span>
115
+            <span class="underLine" style="width:100px;"></span>
82 116
           </div>
83
-          <div style="page-break-after:always"></div>
117
+        </div>
118
+        <div style="page-break-after:always"></div>
84 119
       </div>
85 120
     </div>
86 121
 
@@ -90,286 +125,320 @@
90 125
 </template>
91 126
 <script>
92 127
 import { jsGetAge, uParseTime } from '@/utils/tools'
93
-import {getAllDoctorList,getPrescriptionPrint,getHisPatientDetail} from "@/api/project/project"
94
-import {getInitData} from "@/api/his/his"
128
+import { getAllDoctorList, getHisPatientDetail, getPrescriptionPrint } from '@/api/project/project'
129
+import { getInitData } from '@/api/his/his'
130
+
95 131
 export default {
96
-    props:{
97
-      patient_id:Number,
98
-      record_date:String,
99
-      prescription_id:Number,
100
-      ids:String
132
+  props: {
133
+    patient_id: Number,
134
+    record_date: String,
135
+    prescription_id: Number,
136
+    ids: String
137
+  },
138
+  data() {
139
+    return {
140
+      doctorList: [],
141
+      advicePrint: {},
142
+      patient: {},
143
+      tableData: [],
144
+      prescriptionInfo: [],
145
+      hisPatient: {},
146
+      department: [],
147
+      prescriptions: [],
148
+      projectList: [],
149
+      orgname: '',
150
+      diagnoses: [],
151
+      org_id: 0
152
+    }
153
+  },
154
+  methods: {
155
+    getAge(patient) {
156
+      var thisLen = patient.id_card_no.length
157
+      var birth = ''
158
+      if (thisLen == 15) {
159
+        birth = '19' + patient.id_card_no.substr(6, 6)
160
+      } else {
161
+        birth = patient.id_card_no.substr(6, 8)
162
+      }
163
+      var births =
164
+          birth.substr(0, 4) +
165
+          '-' +
166
+          birth.substr(4, 2) +
167
+          '-' +
168
+          birth.substr(6, 2)
169
+      return jsGetAge(births, '-')
170
+
101 171
     },
102
-    data(){
103
-      return {
104
-        doctorList:[],
105
-        advicePrint:{},
106
-        patient:{},
107
-        tableData:[],
108
-        prescriptionInfo:[],
109
-        hisPatient:{},
110
-        department:[],
111
-        prescriptions:[],
112
-        projectList:[],
113
-        orgname:"",
114
-        diagnoses:[],
115
-        org_id: 0
172
+
173
+    getAllDoctorList() {
174
+      getAllDoctorList().then(response => {
175
+        if (response.data.state == 1) {
176
+          var doctor = response.data.data.doctor
177
+
178
+          this.doctorList = doctor
179
+        }
180
+      })
181
+    },
182
+
183
+    getDoctor(id) {
184
+      var name = ''
185
+      for (let i = 0; i < this.doctorList.length; i++) {
186
+        if (id == this.doctorList[i].admin_user_id) {
187
+          name = this.doctorList[i].user_name
188
+        }
116 189
       }
190
+      return name
117 191
     },
118
-   methods:{
119
-     getAge(patient){
120
-       var thisLen = patient.id_card_no.length
121
-       var birth = ''
122
-       if (thisLen == 15) {
123
-         birth = '19' + patient.id_card_no.substr(6, 6)
124
-       } else {
125
-         birth = patient.id_card_no.substr(6, 8)
126
-       }
127
-       var births =
128
-         birth.substr(0, 4) +
129
-         '-' +
130
-         birth.substr(4, 2) +
131
-         '-' +
132
-         birth.substr(6, 2)
133
-       return jsGetAge(births, '-')
134
-
135
-     },
136
-
137
-     getAllDoctorList(){
138
-      getAllDoctorList().then(response=>{
139
-        if(response.data.state == 1){
140
-               var doctor =  response.data.data.doctor
141
-
142
-               this.doctorList = doctor
143
-             }
144
-         })
145
-     },
146
-
147
-      getDoctor(id){
148
-        var name = ""
149
-        for(let i=0;i<this.doctorList.length;i++){
150
-          if(id == this.doctorList[i].admin_user_id){
151
-              name = this.doctorList[i].user_name
152
-          }
192
+    getTime(value, temp) {
193
+      if (value != undefined) {
194
+        return uParseTime(value, temp)
195
+      }
196
+      return ''
197
+    },
198
+    getPrescriptionPrint() {
199
+      var params = {
200
+        // patient_id:this.patient_id,
201
+        // record_date:this.record_date,
202
+        // prescription_id:this.prescription_id,
203
+        patient_id: this.patient_id,
204
+        record_date: this.record_date,
205
+        prescription_id: this.prescription_id,
206
+        ids: this.ids
207
+      }
208
+      console.log('params', params)
209
+      getPrescriptionPrint(params).then(response => {
210
+        if (response.data.state == 1) {
211
+          var advicePrint = response.data.data.advicePrint
212
+          console.log('adviceprint9999', advicePrint)
213
+          this.advicePrint = advicePrint
214
+          this.prescriptions = advicePrint
215
+          console.log('处方222222', this.prescriptions)
216
+          var hisPatient = response.data.data.hisPatient
217
+          console.log('hisPatient', hisPatient)
218
+          this.hisPatient = hisPatient
219
+          var projectlist = response.data.data.projectlist
220
+          console.log('所有项目列表', projectlist)
221
+          this.projectList = projectlist
153 222
         }
154
-        return name
155
-      },
156
-      getTime(value, temp) {
157
-        if (value != undefined) {
158
-            return uParseTime(value, temp)
223
+      })
224
+    },
225
+    getHisPatientDetail() {
226
+      const params = {
227
+        patient_id: this.patient_id
228
+      }
229
+      getHisPatientDetail(params).then(response => {
230
+        if (response.data.state == 1) {
231
+          var hisPatient = response.data.data.hisPatient
232
+          console.log('挂号病人', hisPatient)
233
+          this.hisPatient = hisPatient
159 234
         }
160
-        return ''
161
-     },
162
-       getPrescriptionPrint(){
163
-         var params = {
164
-          // patient_id:this.patient_id,
165
-          // record_date:this.record_date,
166
-          // prescription_id:this.prescription_id,
167
-          patient_id:this.patient_id,
168
-          record_date:this.record_date,
169
-          prescription_id:this.prescription_id,
170
-          ids:this.ids
235
+      })
236
+    },
237
+    getInitData() {
238
+      getInitData().then(response => {
239
+        if (response.data.state == 1) {
240
+          this.department = response.data.data.department
241
+          this.diagnoses = response.data.data.diagnose
242
+          console.log('争端', this.diagnoses)
171 243
         }
172
-        console.log("params",params)
173
-       getPrescriptionPrint(params).then(response=>{
174
-         if(response.data.state == 1){
175
-            var advicePrint =  response.data.data.advicePrint
176
-            console.log("adviceprint9999",advicePrint)
177
-            this.advicePrint = advicePrint
178
-            this.prescriptions = advicePrint
179
-            console.log("处方222222",this.prescriptions)
180
-            var hisPatient = response.data.data.hisPatient
181
-            console.log("hisPatient",hisPatient)
182
-            this.hisPatient = hisPatient
183
-            var projectlist =  response.data.data.projectlist
184
-            console.log("所有项目列表",projectlist)
185
-            this.projectList = projectlist
186
-          }
187
-       })
188
-     },
189
-     getHisPatientDetail(){
190
-          const params = {
191
-              patient_id:this.patient_id
192
-          }
193
-       getHisPatientDetail(params).then(response=>{
194
-          if(response.data.state == 1){
195
-             var hisPatient =  response.data.data.hisPatient
196
-             console.log("挂号病人",hisPatient)
197
-             this.hisPatient = hisPatient
198
-          }
199
-       })
200
-     },
201
-     getInitData(){
202
-       getInitData().then(response=>{
203
-          if(response.data.state == 1){
204
-            this.department = response.data.data.department
205
-            this.diagnoses = response.data.data.diagnose
206
-            console.log("争端",this.diagnoses)
207
-          }
208
-       })
209
-     },
210
-     getDepart(id){
211
-         var name = ""
212
-       for(let i=0;i<this.department.length;i++){
213
-           if(id == this.department[i].id){
214
-               name = this.department[i].name
215
-           }
216
-       }
217
-       return name
218
-     },
244
+      })
245
+    },
246
+    getDepart(id) {
247
+      var name = ''
248
+      for (let i = 0; i < this.department.length; i++) {
249
+        if (id == this.department[i].id) {
250
+          name = this.department[i].name
251
+        }
252
+      }
253
+      return name
254
+    },
219 255
     getTotalOne(id) {
220 256
 
221
-        var total = 0
222
-        var addtotal = 0
223
-        for (let i = 0; i < this.prescriptions.length; i++) {
224
-          if(id == this.prescriptions[i].id){
225
-            if (this.prescriptions[i].project != null) {
226
-              for (let a = 0; a < this.prescriptions[i].project.length; a++) {
227
-                total = total + this.prescriptions[i].project[a].price * this.prescriptions[i].project[a].count
228
-              }
257
+      var total = 0
258
+      var addtotal = 0
259
+      for (let i = 0; i < this.prescriptions.length; i++) {
260
+        if (id == this.prescriptions[i].id) {
261
+          if (this.prescriptions[i].project != null) {
262
+            for (let a = 0; a < this.prescriptions[i].project.length; a++) {
263
+              total = total + this.prescriptions[i].project[a].price * this.prescriptions[i].project[a].count
229 264
             }
265
+          }
230 266
 
231
-            if (this.prescriptions[i].additionalcharge != null) {
232
-              for (let a = 0; a < this.prescriptions[i].additionalcharge.length; a++) {
233
-                addtotal = addtotal + this.prescriptions[i].additionalcharge[a].price * this.prescriptions[i].additionalcharge[a].count
234
-              }
267
+          if (this.prescriptions[i].additionalcharge != null) {
268
+            for (let a = 0; a < this.prescriptions[i].additionalcharge.length; a++) {
269
+              addtotal = addtotal + this.prescriptions[i].additionalcharge[a].price * this.prescriptions[i].additionalcharge[a].count
235 270
             }
236
-              addtotal =  Math.floor(addtotal * 100) / 100
271
+          }
272
+          addtotal = Math.floor(addtotal * 100) / 100
237 273
         }
238 274
 
239
-       }
275
+      }
240 276
 
241 277
       for (let i = 0; i < this.prescriptions.length; i++) {
242
-          if(id == this.prescriptions[i].id){
243
-            if (this.prescriptions[i].advices != null) {
244
-              for (let a = 0; a < this.prescriptions[i].advices.length; a++) {
245
-                total = total + this.prescriptions[i].advices[a].price * this.prescriptions[i].advices[a].prescribing_number
246
-              }
278
+        if (id == this.prescriptions[i].id) {
279
+          if (this.prescriptions[i].advices != null) {
280
+            for (let a = 0; a < this.prescriptions[i].advices.length; a++) {
281
+              total = total + this.prescriptions[i].advices[a].price * this.prescriptions[i].advices[a].prescribing_number
247 282
             }
283
+          }
248 284
 
249
-            if (this.prescriptions[i].additionalcharge != null) {
250
-              for (let a = 0; a < this.prescriptions[i].additionalcharge.length; a++) {
251
-                addtotal = addtotal + this.prescriptions[i].additionalcharge[a].price * this.prescriptions[i].additionalcharge[a].count
252
-              }
285
+          if (this.prescriptions[i].additionalcharge != null) {
286
+            for (let a = 0; a < this.prescriptions[i].additionalcharge.length; a++) {
287
+              addtotal = addtotal + this.prescriptions[i].additionalcharge[a].price * this.prescriptions[i].additionalcharge[a].count
253 288
             }
254
-              addtotal =  Math.floor(addtotal * 100) / 100
289
+          }
290
+          addtotal = Math.floor(addtotal * 100) / 100
255 291
         }
256
-       }
292
+      }
257 293
 
258
-        return total + addtotal
259
-      },
294
+      return total + addtotal
295
+    },
260 296
 
261
-     getProjectName(id){
262
-        var project_name = ""
263
-        for(let i=0;i<this.projectList.length;i++){
264
-           if(id == this.projectList[i].id){
265
-               project_name = this.projectList[i].project_name
266
-           }
297
+    getProjectName(id) {
298
+      var project_name = ''
299
+      for (let i = 0; i < this.projectList.length; i++) {
300
+        if (id == this.projectList[i].id) {
301
+          project_name = this.projectList[i].project_name
267 302
         }
268
-        return project_name
269
-     },
270
-
271
-     getDiagnosis(id){
272
-        let arr = id.split(',')
273
-        var name = ""
274
-        for(let i=0;i<this.diagnoses.length;i++){
275
-          if(arr.indexOf(String(this.diagnoses[i].id)) > -1){
276
-             name += this.diagnoses[i].class_name + ' '
277
-          }
303
+      }
304
+      return project_name
305
+    },
306
+
307
+    getDiagnosis(id) {
308
+      let arr = id.split(',')
309
+      var name = ''
310
+      for (let i = 0; i < this.diagnoses.length; i++) {
311
+        if (arr.indexOf(String(this.diagnoses[i].id)) > -1) {
312
+          name += this.diagnoses[i].class_name + ' '
278 313
         }
279
-        return name
280
-     }
314
+      }
315
+      return name
316
+    }
281 317
 
282
-   },
283
-   created(){
284
-      this.getAllDoctorList()
285
-      this.getInitData()
286
-      this.getPrescriptionPrint()
287
-      this.getHisPatientDetail()
288
-      var xtuser = this.$store.getters.xt_user;
289
-      this.orgname = xtuser.org.org_name;
290
-      this.org_id = xtuser.org.id
291
-   },
292
-   watch:{
293
-     ids:function(val){
318
+  },
319
+  created() {
320
+    this.getAllDoctorList()
321
+    this.getInitData()
322
+    this.getPrescriptionPrint()
323
+    this.getHisPatientDetail()
324
+    var xtuser = this.$store.getters.xt_user
325
+    this.orgname = xtuser.org.org_name
326
+    this.org_id = xtuser.org.id
327
+  },
328
+  watch: {
329
+    ids: function(val) {
294 330
       this.ids = val
295 331
       this.getPrescriptionPrint()
296 332
     }
297
-   }
333
+  }
298 334
 }
299 335
 </script>
300 336
 
301 337
 
302 338
 <style lang="scss" scoped>
303
-.prescription-print{
339
+.prescription-print {
304 340
   -webkit-box-shadow: 0 1px 4px rgba(0, 0, 0, 0.27), 0 0 60px rgba(0, 0, 0, 0.06) inset;
305
-    -moz-box-shadow: 0 1px 4px rgba(0, 0, 0, 0.27), 0 0 40px rgba(0, 0, 0, 0.06) inset;
306
-    box-shadow: 0 1px 4px rgba(0, 0, 0, 0.27), 0 0 40px rgba(0, 0, 0, 0.06) inset;
307
-    margin-bottom: 20px;
308
-    padding:20px 10px;
341
+  -moz-box-shadow: 0 1px 4px rgba(0, 0, 0, 0.27), 0 0 40px rgba(0, 0, 0, 0.06) inset;
342
+  box-shadow: 0 1px 4px rgba(0, 0, 0, 0.27), 0 0 40px rgba(0, 0, 0, 0.06) inset;
343
+  margin-bottom: 20px;
344
+  padding: 20px 10px;
309 345
 }
310
-.printTitle{
311
-    font-size: 22px;
312
-    text-align: center;
313
-    font-weight: bold;
346
+
347
+.printTitle {
348
+  font-size: 22px;
349
+  text-align: center;
350
+  font-weight: bold;
314 351
 }
315
-.infoTitle{
316
-    display: flex;
317
-    border-bottom: 2px solid #000;
318
-    margin-top:10px;
319
-    line-height: 24px;
320
-    padding:0 10px;
352
+
353
+.infoTitle {
354
+  display: flex;
355
+  border-bottom: 2px solid #000;
356
+  margin-top: 10px;
357
+  line-height: 24px;
358
+  padding: 0 10px;
321 359
 }
322
-.infoTitle p{
323
-    width: 200px;
360
+
361
+.infoTitle p {
362
+  width: 200px;
324 363
 }
325
-.infoMain{
326
-    display: flex;
327
-    flex-wrap: wrap;
328
-    border-bottom: 2px solid #000;
329
-    padding:0 10px;
364
+
365
+.infoMain {
366
+  display: flex;
367
+  flex-wrap: wrap;
368
+  border-bottom: 2px solid #000;
369
+  padding: 0 10px;
330 370
 }
331
-.infoMain div{
332
-    width: 50%;
333
-    line-height: 24px;
371
+
372
+.infoMain div {
373
+  width: 50%;
374
+  line-height: 24px;
334 375
 }
335
-.prescriptionBox{
336
-    padding:0 10px;
337
-    min-height:450px;
376
+
377
+.prescriptionBox {
378
+  padding: 0 10px;
379
+  min-height: 450px;
338 380
 }
339
-.Rp{
340
-    font-size: 22px;
341
-    font-weight: bold;
381
+
382
+.Rp {
383
+  font-size: 22px;
384
+  font-weight: bold;
385
+}
386
+
387
+.drugsBox {
388
+  padding-left: 40px;
389
+  margin-bottom: 10px;
390
+}
391
+
392
+.drugsBox div {
393
+  line-height: 20px;
394
+}
395
+
396
+.drugsOne {
397
+  line-height: 24px;
398
+}
399
+
400
+.drugsOne span {
401
+  margin-right: 20px;
342 402
 }
343
-.drugsBox{
344
-    padding-left: 40px;
345
-    margin-bottom: 10px;
403
+
404
+.doctorBox {
405
+  display: flex;
406
+  justify-content: space-between;
407
+  padding: 0 10px;
408
+  line-height: 24px;
409
+  border-bottom: 2px solid #000;
346 410
 }
347
-.drugsBox div{
348
-    line-height: 20px;
411
+
412
+.actionBar {
413
+  display: flex;
414
+  justify-content: space-between;
415
+  line-height: 24px;
416
+  padding: 0 10px;
349 417
 }
350
-.drugsOne{
351
-    line-height: 24px;
418
+
419
+.actionBar p {
420
+  width: 150px;
352 421
 }
353
-.drugsOne span{
354
-    margin-right: 20px;
422
+
423
+.NoCell {
424
+  display: flex;
425
+  justify-content: space-between;
426
+  margin-bottom: 10px;
355 427
 }
356
-.doctorBox{
357
-    display: flex;
358
-    justify-content: space-between;
359
-    padding:0 10px;
360
-    line-height: 24px;
361
-    border-bottom: 2px solid #000;
428
+
429
+.underLine {
430
+  display: inline-block;
431
+  border-bottom: 1px solid #000;
432
+  text-align: center;
433
+  line-height: 24px;
362 434
 }
363
-.actionBar{
364
-    display: flex;
365
-    justify-content: space-between;
366
-    line-height: 24px;
367
-    padding:0 10px;
435
+
436
+.basicCell {
437
+  display: flex;
368 438
 }
369
-.actionBar p{
370
-    width:150px;
439
+
440
+.basicCell span {
441
+  line-height: 24px;
442
+  margin-bottom: 10px;
371 443
 }
372
-.NoCell{display: flex;justify-content: space-between;margin-bottom: 10px;}
373
-.underLine{display: inline-block;border-bottom: 1px solid #000;text-align: center;line-height: 24px;}
374
-.basicCell{display: flex;} .basicCell span{line-height: 24px;margin-bottom: 10px;}
375 444
 </style>

+ 14 - 10
src/xt_pages/outpatientDoctorStation/components/deskPrescription.vue Bestand weergeven

@@ -486,7 +486,7 @@
486 486
   import { uParseTime } from '@/utils/tools'
487 487
   import NextOrLastPrescription from './nextOrLastPrescription'
488 488
   import CallPrescription from './callPrescription'
489
-  import DayPrescriptionTable from '../../outpatientCharges/components/dayPrescriptionTable'    
489
+  import DayPrescriptionTable from '../../outpatientCharges/components/dayPrescriptionTable'
490 490
 
491 491
   const moment = require('moment')
492 492
 
@@ -777,7 +777,7 @@
777 777
             if (project_ids[i].price == project_month_prescriptions.project[a].price) {
778 778
 
779 779
               if (project_month_prescriptions.project[a].type == 2) {
780
-                obj['statistical_classification'] = project_month_prescriptions.project[a].project.statistical_classification
780
+                obj['statistical_classification'] = ''
781 781
                 obj['medical_code'] = project_month_prescriptions.project[a].project.medical_code
782 782
                 obj['project_name'] = project_month_prescriptions.project[a].project.project_name
783 783
                 obj['project'] = project_month_prescriptions.project[a].project
@@ -1109,13 +1109,15 @@
1109 1109
                     }
1110 1110
 
1111 1111
                     if (prescription.project[b].type == 2) {
1112
-                      obj['statistical_classification'] = prescription.project[b].project.statistical_classification
1112
+                      obj['statistical_classification'] = prescription.project[b].team.project_team
1113 1113
                       obj['medical_code'] = prescription.project[b].project.medical_code
1114 1114
                       obj['project_name'] = prescription.project[b].project.project_name
1115 1115
                       obj['project'] = prescription.project[b].project
1116 1116
 
1117 1117
                     } else if (prescription.project[b].type == 3) {
1118
-                      obj['statistical_classification'] = ''
1118
+                      if(prescription.project[b].team_id > 0){
1119
+                        obj['statistical_classification'] = prescription.project[b].team.project_team
1120
+                      }
1119 1121
                       obj['medical_code'] = prescription.project[b].good_info.medical_insurance_number
1120 1122
                       obj['project_name'] = prescription.project[b].good_info.good_name
1121 1123
                       obj['good_info'] =  prescription.project[b].good_info
@@ -1228,14 +1230,16 @@
1228 1230
                     }
1229 1231
 
1230 1232
                     if (prescription.project[b].type == 2) {
1231
-                      obj['statistical_classification'] = prescription.project[b].project.statistical_classification
1233
+                      obj['statistical_classification'] = prescription.project[b].team.project_team
1232 1234
                       obj['medical_code'] = prescription.project[b].project.medical_code
1233 1235
                       obj['project_name'] = prescription.project[b].project.project_name
1234 1236
                       obj['project'] = prescription.project[b].project
1235 1237
 
1236 1238
 
1237 1239
                     } else if (prescription.project[b].type == 3) {
1238
-                      obj['statistical_classification'] = ''
1240
+                      if(prescription.project[b].team_id > 0){
1241
+                        obj['statistical_classification'] = prescription.project[b].team.project_team
1242
+                      }
1239 1243
                       obj['medical_code'] = prescription.project[b].good_info.medical_insurance_number
1240 1244
                       obj['project_name'] = prescription.project[b].good_info.good_name
1241 1245
                       obj['good_info'] = prescription.project[b].good_info
@@ -2878,7 +2882,7 @@
2878 2882
                   id: 0,
2879 2883
                   project_id: temp2[b].id,
2880 2884
                   project_name: temp2[b].project_name,
2881
-                  statistical_classification: temp2[b].statistical_classification,
2885
+                  statistical_classification: '',
2882 2886
                   single_dose: temp2[b].single_dose.toString(),
2883 2887
                   delivery_way: temp2[b].delivery_way,
2884 2888
                   execution_frequency: temp2[b].execution_frequency,
@@ -2979,7 +2983,7 @@
2979 2983
               let obj = {
2980 2984
                 id: project[i].id,
2981 2985
                 project_name: project[i].project_name,
2982
-                statistical_classification: project[i].statistical_classification,
2986
+                statistical_classification: '',
2983 2987
                 single_dose: project[i].single_dose,
2984 2988
                 delivery_way: project[i].delivery_way,
2985 2989
                 execution_frequency: project[i].execution_frequency,
@@ -3012,7 +3016,7 @@
3012 3016
               let obj = {
3013 3017
                 id: good_info[i].id,
3014 3018
                 project_name: good_info[i].good_name,
3015
-                statistical_classification: 0,
3019
+                statistical_classification: '',
3016 3020
                 single_dose: good_info[i].specification_name,
3017 3021
                 delivery_way: '',
3018 3022
                 execution_frequency: '',
@@ -3112,7 +3116,7 @@
3112 3116
                   let obj = {
3113 3117
                     id: project[i].project_id,
3114 3118
                     project_name: project[i].project.project_name,
3115
-                    statistical_classification: project[i].project.statistical_classification,
3119
+                    statistical_classification: '',
3116 3120
                     single_dose: project[i].project.single_dose,
3117 3121
                     delivery_way: project[i].project.delivery_way,
3118 3122
                     execution_frequency: project[i].project.execution_frequency,

+ 1 - 2
src/xt_pages/outpatientDoctorStation/components/prescriptionTable.vue Bestand weergeven

@@ -124,8 +124,7 @@
124 124
                 </template>
125 125
             </el-table-column>
126 126
             <el-table-column align="center" prop="statistical_classification" width="100" label="组">
127
-                <template slot-scope="scope">{{scope.row.type ==
128
-                    2?getGroup(scope.row.statistical_classification):'耗材'}}
127
+                <template slot-scope="scope">{{scope.row.statistical_classification}}
129 128
                 </template>
130 129
             </el-table-column>
131 130
             <el-table-column align="center" prop="single_dose" width="80" label="单次用量">

+ 31 - 30
src/xt_pages/outpatientDoctorStation/doctorDesk.vue Bestand weergeven

@@ -960,7 +960,7 @@
960 960
           for (let a = 0; a < project_month_prescriptions.project.length; a++) {
961 961
             if (project_ids[i].price == project_month_prescriptions.project[a].price) {
962 962
               if (project_month_prescriptions.project[a].type == 2) {
963
-                obj['statistical_classification'] = project_month_prescriptions.project[a].project.statistical_classification
963
+                obj['statistical_classification'] = ''
964 964
                 obj['medical_code'] = project_month_prescriptions.project[a].project.medical_code
965 965
                 obj['project_name'] = project_month_prescriptions.project[a].project.project_name
966 966
                 obj['project'] =  project_month_prescriptions.project[a].project
@@ -1457,7 +1457,7 @@
1457 1457
                     id: prescription.project[b].id,
1458 1458
                     project_id: prescription.project[b].project_id,
1459 1459
                     project_name: prescription.project[b].project.project_name,
1460
-                    statistical_classification: prescription.project[b].project.statistical_classification,
1460
+                    // statistical_classification: prescription.project[b].project.statistical_classification,
1461 1461
                     single_dose: prescription.project[b].single_dose,
1462 1462
                     delivery_way: prescription.project[b].delivery_way,
1463 1463
                     execution_frequency: prescription.project[b].execution_frequency,
@@ -1472,7 +1472,7 @@
1472 1472
                   }
1473 1473
 
1474 1474
                   if (prescription.project[b].type == 2) {
1475
-                    obj['statistical_classification'] = prescription.project[b].project.statistical_classification
1475
+                    obj['statistical_classification'] = prescription.project[b].team.project_team
1476 1476
                     obj['medical_code'] = prescription.project[b].project.medical_code
1477 1477
                     obj['project_name'] = prescription.project[b].project.project_name
1478 1478
                     obj['project'] = prescription.project[b].project
@@ -1611,7 +1611,7 @@
1611 1611
                       id: 0,
1612 1612
                       project_id: prescription.project[b].project_id,
1613 1613
                       project_name: prescription.project[b].project.project_name,
1614
-                      statistical_classification: prescription.project[b].project.statistical_classification,
1614
+                      // statistical_classification: prescription.project[b].team.project_team,
1615 1615
                       single_dose: prescription.project[b].single_dose,
1616 1616
                       delivery_way: prescription.project[b].delivery_way,
1617 1617
                       execution_frequency: prescription.project[b].execution_frequency,
@@ -1627,14 +1627,14 @@
1627 1627
                     }
1628 1628
 
1629 1629
                     if (prescription.project[b].type == 2) {
1630
-                      obj['statistical_classification'] = prescription.project[b].project.statistical_classification
1630
+                      obj['statistical_classification'] = ""
1631 1631
                       obj['medical_code'] = prescription.project[b].project.medical_code
1632 1632
                       obj['project_name'] = prescription.project[b].project.project_name
1633 1633
                       obj['price'] = prescription.project[b].project.price
1634 1634
                       obj['project'] =  prescription.project[b].project
1635 1635
 
1636 1636
                     } else if (prescription.project[b].type == 3) {
1637
-                      obj['statistical_classification'] = ''
1637
+                      obj['statistical_classification'] = ""
1638 1638
                       obj['medical_code'] = prescription.project[b].good_info.medical_insurance_number
1639 1639
                       obj['project_name'] = prescription.project[b].good_info.good_name
1640 1640
                       obj['price'] = prescription.project[b].good_info.packing_price
@@ -1855,7 +1855,7 @@
1855 1855
                           id: prescription.project[b].id,
1856 1856
                           project_id: prescription.project[b].project_id,
1857 1857
                           project_name: prescription.project[b].project.project_name,
1858
-                          statistical_classification: prescription.project[b].project.statistical_classification,
1858
+                          // statistical_classification: prescription.project[b].project.statistical_classification,
1859 1859
                           single_dose: prescription.project[b].single_dose,
1860 1860
                           delivery_way: prescription.project[b].delivery_way,
1861 1861
                           execution_frequency: prescription.project[b].execution_frequency,
@@ -1869,7 +1869,7 @@
1869 1869
                         }
1870 1870
 
1871 1871
                         if (prescription.project[b].type == 2) {
1872
-                          obj['statistical_classification'] = prescription.project[b].project.statistical_classification
1872
+                          obj['statistical_classification'] = prescription.project[b].team.project_team
1873 1873
                           obj['medical_code'] = prescription.project[b].project.medical_code
1874 1874
                           obj['project_name'] = prescription.project[b].project.project_name
1875 1875
                           obj['project'] =  prescription.project[b].project
@@ -2011,7 +2011,6 @@
2011 2011
                             id: 0,
2012 2012
                             project_id: prescription.project[b].project_id,
2013 2013
                             project_name: prescription.project[b].project.project_name,
2014
-                            statistical_classification: prescription.project[b].project.statistical_classification,
2015 2014
                             single_dose: prescription.project[b].single_dose,
2016 2015
                             delivery_way: prescription.project[b].delivery_way,
2017 2016
                             execution_frequency: prescription.project[b].execution_frequency,
@@ -2025,7 +2024,7 @@
2025 2024
                           }
2026 2025
 
2027 2026
                           if (prescription.project[b].type == 2) {
2028
-                            obj['statistical_classification'] = prescription.project[b].project.statistical_classification
2027
+                            obj['statistical_classification'] = ""
2029 2028
                             obj['medical_code'] = prescription.project[b].project.medical_code
2030 2029
                             obj['project_name'] = prescription.project[b].project.project_name
2031 2030
                             obj['price'] = prescription.project[b].project.price
@@ -2353,7 +2352,6 @@
2353 2352
                           id: prescription.project[b].id,
2354 2353
                           project_id: prescription.project[b].project_id,
2355 2354
                           project_name: prescription.project[b].project.project_name,
2356
-                          statistical_classification: prescription.project[b].project.statistical_classification,
2357 2355
                           single_dose: prescription.project[b].single_dose,
2358 2356
                           delivery_way: prescription.project[b].delivery_way,
2359 2357
                           execution_frequency: prescription.project[b].execution_frequency,
@@ -2367,14 +2365,16 @@
2367 2365
                         }
2368 2366
 
2369 2367
                         if (prescription.project[b].type == 2) {
2370
-                          obj['statistical_classification'] = prescription.project[b].project.statistical_classification
2368
+                          obj['statistical_classification'] = prescription.project[b].team.project_team
2371 2369
                           obj['medical_code'] = prescription.project[b].project.medical_code
2372 2370
                           obj['project_name'] = prescription.project[b].project.project_name
2373 2371
                           obj['project'] =  prescription.project[b].project
2374 2372
 
2375 2373
 
2376 2374
                         } else if (prescription.project[b].type == 3) {
2377
-                          obj['statistical_classification'] = ''
2375
+                          if(prescription.project[b].team_id > 0){
2376
+                            obj['statistical_classification'] = prescription.project[b].team.project_team
2377
+                          }
2378 2378
                           obj['medical_code'] = prescription.project[b].good_info.medical_insurance_number
2379 2379
                           obj['project_name'] = prescription.project[b].good_info.good_name
2380 2380
                           obj['good_info'] =  prescription.project[b].good_info
@@ -2500,7 +2500,6 @@
2500 2500
                             id: 0,
2501 2501
                             project_id: prescription.project[b].project_id,
2502 2502
                             project_name: prescription.project[b].project.project_name,
2503
-                            statistical_classification: prescription.project[b].project.statistical_classification,
2504 2503
                             single_dose: prescription.project[b].single_dose,
2505 2504
                             delivery_way: prescription.project[b].delivery_way,
2506 2505
                             execution_frequency: prescription.project[b].execution_frequency,
@@ -2513,7 +2512,7 @@
2513 2512
                           }
2514 2513
 
2515 2514
                           if (prescription.project[b].type == 2) {
2516
-                            obj['statistical_classification'] = prescription.project[b].project.statistical_classification
2515
+                            obj['statistical_classification'] = ""
2517 2516
                             obj['medical_code'] = prescription.project[b].project.medical_code
2518 2517
                             obj['project_name'] = prescription.project[b].project.project_name
2519 2518
                             obj['price'] = prescription.project[b].project.price
@@ -2831,7 +2830,6 @@
2831 2830
                         id: prescription.project[b].id,
2832 2831
                         project_id: prescription.project[b].project_id,
2833 2832
                         project_name: prescription.project[b].project.project_name,
2834
-                        statistical_classification: prescription.project[b].project.statistical_classification,
2835 2833
                         single_dose: prescription.project[b].single_dose,
2836 2834
                         delivery_way: prescription.project[b].delivery_way,
2837 2835
                         execution_frequency: prescription.project[b].execution_frequency,
@@ -2845,14 +2843,16 @@
2845 2843
                       }
2846 2844
 
2847 2845
                       if (prescription.project[b].type == 2) {
2848
-                        obj['statistical_classification'] = prescription.project[b].project.statistical_classification
2846
+                        obj['statistical_classification'] = prescription.project[b].team.project_team
2849 2847
                         obj['medical_code'] = prescription.project[b].project.medical_code
2850 2848
                         obj['project_name'] = prescription.project[b].project.project_name
2851 2849
                         obj['project'] =  prescription.project[b].project
2852 2850
 
2853 2851
 
2854 2852
                       } else if (prescription.project[b].type == 3) {
2855
-                        obj['statistical_classification'] = ''
2853
+                        if(prescription.project[b].team_id > 0){
2854
+                          obj['statistical_classification'] = prescription.project[b].team.project_team
2855
+                        }
2856 2856
                         obj['medical_code'] = prescription.project[b].good_info.medical_insurance_number
2857 2857
                         obj['project_name'] = prescription.project[b].good_info.good_name
2858 2858
                         obj['good_info'] =  prescription.project[b].good_info
@@ -2978,7 +2978,6 @@
2978 2978
                           id: 0,
2979 2979
                           project_id: prescription.project[b].project_id,
2980 2980
                           project_name: prescription.project[b].project.project_name,
2981
-                          statistical_classification: prescription.project[b].project.statistical_classification,
2982 2981
                           single_dose: prescription.project[b].single_dose,
2983 2982
                           delivery_way: prescription.project[b].delivery_way,
2984 2983
                           execution_frequency: prescription.project[b].execution_frequency,
@@ -2991,7 +2990,7 @@
2991 2990
                         }
2992 2991
 
2993 2992
                         if (prescription.project[b].type == 2) {
2994
-                          obj['statistical_classification'] = prescription.project[b].project.statistical_classification
2993
+                          obj['statistical_classification'] = ""
2995 2994
                           obj['medical_code'] = prescription.project[b].project.medical_code
2996 2995
                           obj['project_name'] = prescription.project[b].project.project_name
2997 2996
                           obj['price'] = prescription.project[b].project.price
@@ -3369,7 +3368,6 @@
3369 3368
                           id: prescription.project[b].id,
3370 3369
                           project_id: prescription.project[b].project_id,
3371 3370
                           project_name: prescription.project[b].project.project_name,
3372
-                          statistical_classification: prescription.project[b].project.statistical_classification,
3373 3371
                           single_dose: prescription.project[b].single_dose,
3374 3372
                           delivery_way: prescription.project[b].delivery_way,
3375 3373
                           execution_frequency: prescription.project[b].execution_frequency,
@@ -3383,14 +3381,16 @@
3383 3381
                         }
3384 3382
 
3385 3383
                         if (prescription.project[b].type == 2) {
3386
-                          obj['statistical_classification'] = prescription.project[b].project.statistical_classification
3384
+                          obj['statistical_classification'] = prescription.project[b].team.project_team
3387 3385
                           obj['medical_code'] = prescription.project[b].project.medical_code
3388 3386
                           obj['project_name'] = prescription.project[b].project.project_name
3389 3387
                           obj['project'] =  prescription.project[b].project
3390 3388
 
3391 3389
 
3392 3390
                         } else if (prescription.project[b].type == 3) {
3393
-                          obj['statistical_classification'] = ''
3391
+                          if(prescription.project[b].team_id > 0){
3392
+                            obj['statistical_classification'] = prescription.project[b].team.project_team
3393
+                          }
3394 3394
                           obj['medical_code'] = prescription.project[b].good_info.medical_insurance_number
3395 3395
                           obj['project_name'] = prescription.project[b].good_info.good_name
3396 3396
                           obj['good_info'] =  prescription.project[b].good_info
@@ -3523,7 +3523,6 @@
3523 3523
                             id: 0,
3524 3524
                             project_id: prescription.project[b].project_id,
3525 3525
                             project_name: prescription.project[b].project.project_name,
3526
-                            statistical_classification: prescription.project[b].project.statistical_classification,
3527 3526
                             single_dose: prescription.project[b].single_dose,
3528 3527
                             delivery_way: prescription.project[b].delivery_way,
3529 3528
                             execution_frequency: prescription.project[b].execution_frequency,
@@ -3536,7 +3535,7 @@
3536 3535
                           }
3537 3536
 
3538 3537
                           if (prescription.project[b].type == 2) {
3539
-                            obj['statistical_classification'] = prescription.project[b].project.statistical_classification
3538
+                            obj['statistical_classification'] = ""
3540 3539
                             obj['medical_code'] = prescription.project[b].project.medical_code
3541 3540
                             obj['project_name'] = prescription.project[b].project.project_name
3542 3541
                             obj['price'] = prescription.project[b].project.price
@@ -3937,7 +3936,7 @@
3937 3936
                           id: prescription.project[b].id,
3938 3937
                           project_id: prescription.project[b].project_id,
3939 3938
                           project_name: prescription.project[b].project.project_name,
3940
-                          statistical_classification: prescription.project[b].project.statistical_classification,
3939
+                          // statistical_classification: prescription.project[b].project.statistical_classification,
3941 3940
                           single_dose: prescription.project[b].single_dose,
3942 3941
                           delivery_way: prescription.project[b].delivery_way,
3943 3942
                           execution_frequency: prescription.project[b].execution_frequency,
@@ -3951,14 +3950,16 @@
3951 3950
                         }
3952 3951
 
3953 3952
                         if (prescription.project[b].type == 2) {
3954
-                          obj['statistical_classification'] = prescription.project[b].project.statistical_classification
3953
+                          obj['statistical_classification'] = prescription.project[b].team.project_team
3955 3954
                           obj['medical_code'] = prescription.project[b].project.medical_code
3956 3955
                           obj['project_name'] = prescription.project[b].project.project_name
3957 3956
                           obj['project'] =  prescription.project[b].project
3958 3957
 
3959 3958
 
3960 3959
                         } else if (prescription.project[b].type == 3) {
3961
-                          obj['statistical_classification'] = ''
3960
+                          if(prescription.project[b].team_id > 0){
3961
+                            obj['statistical_classification'] = prescription.project[b].team.project_team
3962
+                          }
3962 3963
                           obj['medical_code'] = prescription.project[b].good_info.medical_insurance_number
3963 3964
                           obj['project_name'] = prescription.project[b].good_info.good_name
3964 3965
                           obj['good_info'] =  prescription.project[b].good_info
@@ -4091,7 +4092,7 @@
4091 4092
                             id: 0,
4092 4093
                             project_id: prescription.project[b].project_id,
4093 4094
                             project_name: prescription.project[b].project.project_name,
4094
-                            statistical_classification: prescription.project[b].project.statistical_classification,
4095
+                            // statistical_classification: prescription.project[b].project.statistical_classification,
4095 4096
                             single_dose: prescription.project[b].single_dose,
4096 4097
                             delivery_way: prescription.project[b].delivery_way,
4097 4098
                             execution_frequency: prescription.project[b].execution_frequency,
@@ -4104,7 +4105,7 @@
4104 4105
                           }
4105 4106
 
4106 4107
                           if (prescription.project[b].type == 2) {
4107
-                            obj['statistical_classification'] = prescription.project[b].project.statistical_classification
4108
+                            obj['statistical_classification'] = ""
4108 4109
                             obj['medical_code'] = prescription.project[b].project.medical_code
4109 4110
                             obj['project_name'] = prescription.project[b].project.project_name
4110 4111
                             obj['price'] = prescription.project[b].project.price

Diff onderdrukt omdat het te groot bestand
+ 1056 - 1060
src/xt_pages/qcd/officesControlAnalysis/project.vue


Diff onderdrukt omdat het te groot bestand
+ 493 - 481
src/xt_pages/qcd/officesControlAnalysis/time.vue


Diff onderdrukt omdat het te groot bestand
+ 535 - 493
src/xt_pages/qcd/patientControlAnalysis.vue


+ 67 - 15
src/xt_pages/qcd/treatmentControlAnalysis/components/TimePersonal.vue Bestand weergeven

@@ -3,7 +3,7 @@
3 3
     <div class="cell clearfix">
4 4
       <el-form :inline="true" :model="listQuery">
5 5
         <el-form-item label>
6
-         
6
+
7 7
            <el-autocomplete
8 8
              class="checkSearch"
9 9
              popper-class="my-autocomplete"
@@ -70,7 +70,7 @@
70 70
       <div style="padding-left:10px;flex:1">
71 71
         <div class="tableTitle">统计表</div>
72 72
         <div><el-button type="primary" @click="exportList">导出</el-button></div>
73
-        <el-table :data="DialysisData" style="width: 100%" border :row-style="{ color: '#303133' }" 
73
+        <el-table :data="DialysisData" style="width: 100%" border :row-style="{ color: '#303133' }"
74 74
         :header-cell-style="{backgroundColor: 'rgb(245, 247, 250)',color: '#606266'}"
75 75
         >
76 76
           <el-table-column prop="name" label="姓名" width="140">
@@ -141,7 +141,7 @@ export default {
141 141
           let threeMonths = new Date(new Date().setFullYear(new Date().getFullYear()-1)).getTime() - 24 * 3600 * 1000;
142 142
           return time.getTime() > Date.now() || time.getTime() < threeMonths;;
143 143
         }
144
-      }, 
144
+      },
145 145
       patient_id:0,
146 146
       modeIdCount:[],
147 147
     };
@@ -155,7 +155,7 @@ export default {
155 155
       } else {
156 156
         this.getDialysisList()
157 157
       }
158
-      
158
+
159 159
     },
160 160
     changeEndTime(val) {
161 161
       var time =
@@ -195,13 +195,13 @@ export default {
195 195
          if(response.data.state === 1){
196 196
           var list = response.data.data.list
197 197
           var totallist  =  response.data.data.totallist
198
-          this.total = totallist  
198
+          this.total = totallist
199 199
           var prescriptionList = response.data.data.prescriptionList
200
-         
200
+
201 201
           this.getModeId(prescriptionList)
202 202
           var count = response.data.data.count
203 203
           this.DialysisCount = count
204
-          
204
+
205 205
           var modeIdCount = response.data.data.modeIdCount
206 206
           console.log("modeidcount=====",modeIdCount)
207 207
           for(let i=0;i<modeIdCount.length;i++){
@@ -261,6 +261,31 @@ export default {
261 261
             }
262 262
               if(modeIdCount[i].mode_id == 19){
263 263
                modeIdCount[i].mode_id = "IUF+HD"
264
+            }
265
+            if(modeIdCount[i].mode_id == 20){
266
+              modeIdCount[i].mode_id = "UF"
267
+            }
268
+            if(modeIdCount[i].mode_id == 21){
269
+              modeIdCount[i].mode_id = "HD+"
270
+            }
271
+            if(modeIdCount[i].mode_id == 22){
272
+              modeIdCount[i].mode_id = "血浆胆红素吸附+HDF"
273
+            }
274
+            if(modeIdCount[i].mode_id == 23){
275
+              modeIdCount[i].mode_id = "血浆胆红素吸附"
276
+            }
277
+            if(modeIdCount[i].mode_id == 24){
278
+              modeIdCount[i].mode_id = "I-HDF"
279
+            }
280
+            if(modeIdCount[i].mode_id == 25){
281
+              modeIdCount[i].mode_id = "HD高通"
282
+            }
283
+
284
+            if(modeIdCount[i].mode_id == 26){
285
+              modeIdCount[i].mode_id = "CVVH"
286
+            }
287
+            if(modeIdCount[i].mode_id == 27){
288
+              modeIdCount[i].mode_id = "CVVHD"
264 289
             }
265 290
              if(modeIdCount[i].mode_id == 28){
266 291
                modeIdCount[i].mode_id = "CVVHDF"
@@ -283,7 +308,7 @@ export default {
283 308
             }
284 309
           })
285 310
           let list = Object.values(dataInfo)
286
-             
311
+
287 312
           list.map(item => {
288 313
             for (let i = 0; i < prescriptionList.length; i++) {
289 314
               if (item.patient_id === prescriptionList[i].patient_id) {
@@ -350,7 +375,7 @@ export default {
350 375
          }
351 376
        })
352 377
       }
353
-    
378
+
354 379
     },
355 380
     unique(arr) {
356 381
         const res = new Map();
@@ -384,7 +409,7 @@ export default {
384 409
             // console.log("total",total)
385 410
           }
386 411
        })
387
-     
412
+
388 413
     },
389 414
     getModeId(patients){
390 415
       for(let i=0;i<patients.length;i++){
@@ -426,6 +451,22 @@ export default {
426 451
             patients[i].mode_id = "HDF后置换"
427 452
         }else if(patients[i].mode_id == 19){
428 453
           patients[i].mode_id = "IUF+HD"
454
+        }else if(patients[i].mode_id == 20){
455
+          patients[i].mode_id = "UF"
456
+        }else if(patients[i].mode_id == 21){
457
+          patients[i].mode_id = "HD+"
458
+        }else if(patients[i].mode_id == 22){
459
+          patients[i].mode_id = "血浆胆红素吸附+HDF"
460
+        }else if(patients[i].mode_id == 23){
461
+          patients[i].mode_id = "血浆胆红素吸附"
462
+        }else if(patients[i].mode_id == 24){
463
+          patients[i].mode_id = "I-HDF"
464
+        }else if(patients[i].mode_id == 25){
465
+          patients[i].mode_id = "HD高通"
466
+        }else if(patients[i].mode_id == 26){
467
+          patients[i].mode_id = "CVVH"
468
+        }else if(patients[i].mode_id == 27){
469
+          patients[i].mode_id = "CVVHD"
429 470
         }else if(patients[i].mode_id == 28){
430 471
           patients[i].mode_id = "CVVHDF"
431 472
         }
@@ -462,10 +503,10 @@ export default {
462 503
         }
463 504
         let str = ''
464 505
         arr.map(item => {
465
-          str += item.mode_id + '(' + item.Count + '次) 、' 
506
+          str += item.mode_id + '(' + item.Count + '次) 、'
466 507
         })
467 508
         var strs = str.substring(0, str.length - 1)
468
-       
509
+
469 510
         return strs
470 511
       },
471 512
       exportList(){
@@ -483,6 +524,17 @@ export default {
483 524
          this.DialysisData[i].HDFHP = this.getHdModeIdCount(this.DialysisData[i].patient_id,"HDF+HP")
484 525
          this.DialysisData[i].CRRT = this.getHdModeIdCount(this.DialysisData[i].patient_id,"CRRT")
485 526
          this.DialysisData[i].OTR = this.getHdModeIdCount(this.DialysisData[i].patient_id,"腹水回输")
527
+
528
+         this.DialysisData[i].IUFHD = this.getHdModeIdCount(this.DialysisData[i].patient_id,"IUF+HD")
529
+         this.DialysisData[i].UF = this.getHdModeIdCount(this.DialysisData[i].patient_id,"UF")
530
+         this.DialysisData[i].HDPlus = this.getHdModeIdCount(this.DialysisData[i].patient_id,"HD+")
531
+         this.DialysisData[i].IHDF = this.getHdModeIdCount(this.DialysisData[i].patient_id,"I-HDF")
532
+         this.DialysisData[i].HDGT = this.getHdModeIdCount(this.DialysisData[i].patient_id,"HD高通")
533
+         this.DialysisData[i].CVVH = this.getHdModeIdCount(this.DialysisData[i].patient_id,"CVVH")
534
+         this.DialysisData[i].CVVHD = this.getHdModeIdCount(this.DialysisData[i].patient_id,"CVVHD")
535
+         this.DialysisData[i].CVVHDF = this.getHdModeIdCount(this.DialysisData[i].patient_id,"CVVHDF")
536
+
537
+
486 538
          this.DialysisData[i].age = this.getAge(this.DialysisData[i].id_card_no)
487 539
          this.DialysisData[i].total_count = this.getDialysisCount(this.DialysisData[i].patient_id)
488 540
        }
@@ -492,7 +544,7 @@ export default {
492 544
         const filterVal = ['index','name', 'age', 'dialysis_no','HD','HDF','HDHP','HP','HF','SCUF','IUF','HFHD','HFHDHP','HFR','HDFHP','CRRT','OTR','total_count']
493 545
 
494 546
         const data = this.formatJson(filterVal, this.DialysisData)
495
-       
547
+
496 548
         excel.export_json_to_excel({
497 549
            header: tHeader,
498 550
            data,
@@ -525,7 +577,7 @@ export default {
525 577
             count += arr[i].Count
526 578
           }
527 579
         }
528
-       
580
+
529 581
         return count
530 582
      }
531 583
 
@@ -551,7 +603,7 @@ export default {
551 603
       (nowMonth < 10 ? "0" + nowMonth : nowMonth) +
552 604
       "-" +
553 605
       (nowDay < 10 ? "0" + nowDay : nowDay);
554
-    
606
+
555 607
      //获取该机构下的所有患者
556 608
      this.getCurrentOrgPatients()
557 609
      //统计列表