Browse Source

new branch

csx 3 years ago
parent
commit
c61ae2d136

+ 3 - 2
config/dev.env.js View File

@@ -7,11 +7,12 @@ module.exports = {
7 7
   NODE_ENV: '"development"',
8 8
   ENV_CONFIG: '"dev"',
9 9
   //BASE_API: '"http://new_mobile.xt.api.sgjyun.com"', // //http://api.xt.test.sgjyun.com http://112.74.16.180:9527,////'"http://localhost:9529"',
10
-  BASE_API: '"http://api.xt.test.sgjyun.com"',
11
-  // BASE_API: '"http://localhost:9529"',
10
+  // BASE_API: '"http://api.xt.test.sgjyun.com"',
11
+  BASE_API: '"http://localhost:9531"',
12 12
   SSO_HOST: '"http://testsso.sgjyun.com"',
13 13
   SRCM_HOST: '"http://test1.sgjyun.com"',
14 14
   XT_HOST: '"http://xt.test.sgjyun.com"',
15 15
   MIRCO_MALL_HOST: '"http://mall.test.sgjyun.com"',
16 16
   CDM_HOST: '"http://cdm.test.sgjyun.com"'
17 17
 }
18
+

+ 2 - 2
config/index.js View File

@@ -29,8 +29,8 @@ module.exports = {
29 29
 
30 30
     // host: 'xt.test.sgjyun.com',
31 31
     //  host: 'xt.kuyicloud.com',
32
-    host: 'xt.test.sgjyun.com',
33
-    // host: 'localhost',
32
+    // host: 'xt.test.sgjyun.com',
33
+    host: 'localhost',
34 34
     port: 9528, // can be overwritten by process.env.PORT, if port is in use, a free one will be determined
35 35
     autoOpenBrowser: true,
36 36
     errorOverlay: true,

+ 20 - 21
src/xt_pages/hospitalStation/components/registerDialog.vue View File

@@ -122,6 +122,26 @@
122 122
                 </el-select>
123 123
             </el-form-item>
124 124
 
125
+            <el-form-item label="医生:" prop="doctor">
126
+                <el-select v-model="form.doctor" placeholder="请选择">
127
+                    <el-option
128
+                            v-for="(item,index) in doctors"
129
+                            :key="index"
130
+                            :label="item.user_name"
131
+                            :value="item.admin_user_id">
132
+                    </el-option>
133
+                </el-select>
134
+            </el-form-item>
135
+            <el-form-item label="科室:" prop="department">
136
+                <el-select v-model="form.department" placeholder="请选择">
137
+                    <el-option
138
+                            v-for="(item,index) in departments"
139
+                            :key="index"
140
+                            :label="item.name"
141
+                            :value="item.id">
142
+                    </el-option>
143
+                </el-select>
144
+            </el-form-item>
125 145
 
126 146
             <el-form-item label="社保类型:">
127 147
                 <el-select v-model="form.social_type" placeholder="请选择" style="width:100%;">
@@ -172,27 +192,6 @@
172 192
                 <el-input v-model="form.medical_expenses"></el-input>
173 193
             </el-form-item>
174 194
 
175
-            <el-form-item label="医生:" prop="doctor">
176
-                <el-select v-model="form.doctor" placeholder="请选择">
177
-                    <el-option
178
-                            v-for="(item,index) in doctors"
179
-                            :key="index"
180
-                            :label="item.user_name"
181
-                            :value="item.admin_user_id">
182
-                    </el-option>
183
-                </el-select>
184
-            </el-form-item>
185
-
186
-            <el-form-item label="科室:" prop="department">
187
-                <el-select v-model="form.department" placeholder="请选择">
188
-                    <el-option
189
-                            v-for="(item,index) in departments"
190
-                            :key="index"
191
-                            :label="item.name"
192
-                            :value="item.id">
193
-                    </el-option>
194
-                </el-select>
195
-            </el-form-item>
196 195
         </el-form>
197 196
 
198 197
 

+ 25 - 7
src/xt_pages/outpatientDoctorStation/recordTemplate/printOne.vue View File

@@ -8,7 +8,7 @@
8 8
                 <span v-if="patient.gender == 1">男</span>
9 9
                 <span v-if="patient.gender == 2">女</span>
10 10
             </div>
11
-            <div>年龄:{{patient.age?patient.age:''}}岁</div>
11
+            <div>年龄:{{getAge(patient)?getAge(patient):""}}岁</div>
12 12
         </div>
13 13
         <div class="infoTitle">
14 14
             <div>婚姻状况:
@@ -105,6 +105,7 @@
105 105
 </div>
106 106
 </template>
107 107
 <script>
108
+  import { jsGetAge, uParseTime } from '@/utils/tools'
108 109
 
109 110
 import { getDataConfig } from "@/utils/data";
110 111
 import { getAllDoctorList,getPatientCaseHistory } from "@/api/project/project"
@@ -122,11 +123,28 @@ export default {
122 123
             orgname:'',
123 124
             history:{},
124 125
             printDate:''
125
-        }                   
126
+        }
126 127
     },
127 128
     methods:{
129
+      getAge(patient){
130
+        var thisLen = patient.id_card_no.length
131
+        var birth = ''
132
+        if (thisLen == 15) {
133
+          birth = '19' + patient.id_card_no.substr(6, 6)
134
+        } else {
135
+          birth = patient.id_card_no.substr(6, 8)
136
+        }
137
+        var births =
138
+          birth.substr(0, 4) +
139
+          '-' +
140
+          birth.substr(4, 2) +
141
+          '-' +
142
+          birth.substr(6, 2)
143
+        return jsGetAge(births, '-')
144
+
145
+      },
128 146
       show(val){
129
-       
147
+
130 148
         this.patientid = val
131 149
         this.getAllDoctorList()
132 150
         this.getPatientCaseHistory()
@@ -150,7 +168,7 @@ export default {
150 168
                console.log("department",department)
151 169
                this.departmentList = department
152 170
              }
153
-           })   
171
+           })
154 172
        },
155 173
       getDoctor(id){
156 174
         var name = ""
@@ -182,7 +200,7 @@ export default {
182 200
       })
183 201
     },
184 202
     getDeparment(id){
185
-  
203
+
186 204
      var name = ''
187 205
      for(let i=0;i<this.departmentList.length;i++){
188 206
          if(id == this.departmentList[i].id){
@@ -191,7 +209,7 @@ export default {
191 209
       }
192 210
       return name
193 211
     },
194
-  
212
+
195 213
 
196 214
     },
197 215
     created(){
@@ -218,7 +236,7 @@ export default {
218 236
 <style lang="scss" scoped>
219 237
 .prescription-print{
220 238
     -webkit-box-shadow: 0 1px 4px rgba(0, 0, 0, 0.27), 0 0 60px rgba(0, 0, 0, 0.06) inset;
221
-    -moz-box-shadow: 0 1px 4px rgba(0, 0, 0, 0.27), 0 0 40px rgba(0, 0, 0, 0.06) inset; 
239
+    -moz-box-shadow: 0 1px 4px rgba(0, 0, 0, 0.27), 0 0 40px rgba(0, 0, 0, 0.06) inset;
222 240
     box-shadow: 0 1px 4px rgba(0, 0, 0, 0.27), 0 0 40px rgba(0, 0, 0, 0.06) inset;
223 241
     margin-bottom: 20px;
224 242
     padding:20px 10px;

+ 31 - 14
src/xt_pages/outpatientDoctorStation/template/printFour.vue View File

@@ -9,7 +9,7 @@
9 9
                 <span v-if="item.patient.gender == 1">男</span>
10 10
                 <span v-if="item.patient.gender == 2">女</span>
11 11
               </p>
12
-              <p>年龄:{{item.patient.age?item.patient.age:""}}岁</p>
12
+              <p>年龄:{{getAge(item.patient)?getAge(item.patient):""}}岁</p>
13 13
           </div>
14 14
           <div class="infoMain">
15 15
               <div style="margin-bottom: 10px;">门诊号:{{hisPatient.number?hisPatient.number:""}}</div>
@@ -29,7 +29,7 @@
29 29
               <div class="drugsBox" v-for="(it,i) in item.additionalcharge" :key="i">
30 30
                 <div class="drugsOne">{{it.item_name?it.item_name:""}}:&nbsp;{{it.price}}元/{{it.count}}次</div>
31 31
                </div>
32
-               
32
+
33 33
               <div class="drugsBox" v-for="(it,index) in item.project" :key="index">
34 34
                   <div class="drugsOne"><span style="font-weight:bold;">{{ index+1 + '.' }}</span>{{getProjectName(it.project_id)?getProjectName(it.project_id):""}}&nbsp;&nbsp;<span>用法:{{it.single_dose}}{{it.single_dose_unit}}</span>&nbsp;&nbsp;<span>{{it.delivery_way}}</span>&nbsp;&nbsp;<span>{{it.advice_desc}}</span></div>
35 35
                   <div style="margin-left:100px;"><span>{{it.single_dose}}{{it.single_dose_unit}}&nbsp;×&nbsp; {{it.count}}{{unit}}</span></div>
@@ -60,10 +60,10 @@
60 60
           <div style="page-break-after:always"></div>
61 61
       </div>
62 62
     </div>
63
-    
63
+
64 64
   </div>
65 65
 
66
-    
66
+
67 67
 </template>
68 68
 <script>
69 69
 import { jsGetAge, uParseTime } from '@/utils/tools'
@@ -75,7 +75,7 @@ export default {
75 75
       record_date:String,
76 76
       prescription_id:Number,
77 77
       ids:String
78
-    }, 
78
+    },
79 79
     data(){
80 80
       return {
81 81
         doctorList:[],
@@ -92,15 +92,32 @@ export default {
92 92
       }
93 93
     },
94 94
    methods:{
95
-     
95
+     getAge(patient){
96
+       var thisLen = patient.id_card_no.length
97
+       var birth = ''
98
+       if (thisLen == 15) {
99
+         birth = '19' + patient.id_card_no.substr(6, 6)
100
+       } else {
101
+         birth = patient.id_card_no.substr(6, 8)
102
+       }
103
+       var births =
104
+         birth.substr(0, 4) +
105
+         '-' +
106
+         birth.substr(4, 2) +
107
+         '-' +
108
+         birth.substr(6, 2)
109
+        return jsGetAge(births, '-')
110
+
111
+     },
112
+
96 113
      getAllDoctorList(){
97 114
       getAllDoctorList().then(response=>{
98 115
         if(response.data.state == 1){
99 116
                var doctor =  response.data.data.doctor
100
-               
117
+
101 118
                this.doctorList = doctor
102 119
              }
103
-         })   
120
+         })
104 121
      },
105 122
 
106 123
       getDoctor(id){
@@ -194,7 +211,7 @@ export default {
194 211
             }
195 212
               addtotal =  Math.floor(addtotal * 100) / 100
196 213
         }
197
-       
214
+
198 215
        }
199 216
 
200 217
       for (let i = 0; i < this.prescriptions.length; i++) {
@@ -204,7 +221,7 @@ export default {
204 221
                 total = total + this.prescriptions[i].advices[a].price * this.prescriptions[i].advices[a].prescribing_number
205 222
               }
206 223
             }
207
-          
224
+
208 225
             if (this.prescriptions[i].additionalcharge != null) {
209 226
               for (let a = 0; a < this.prescriptions[i].additionalcharge.length; a++) {
210 227
                 addtotal = addtotal + this.prescriptions[i].additionalcharge[a].price * this.prescriptions[i].additionalcharge[a].count
@@ -216,7 +233,7 @@ export default {
216 233
 
217 234
         return total + addtotal
218 235
       },
219
-      
236
+
220 237
      getProjectName(id){
221 238
         var project_name = ""
222 239
         for(let i=0;i<this.projectList.length;i++){
@@ -245,7 +262,7 @@ export default {
245 262
       this.getHisPatientDetail()
246 263
       var xtuser = this.$store.getters.xt_user;
247 264
       this.orgname = xtuser.org.org_name;
248
-     
265
+
249 266
    },
250 267
    watch:{
251 268
      ids:function(val){
@@ -260,7 +277,7 @@ export default {
260 277
 <style lang="scss" scoped>
261 278
 .prescription-print{
262 279
   -webkit-box-shadow: 0 1px 4px rgba(0, 0, 0, 0.27), 0 0 60px rgba(0, 0, 0, 0.06) inset;
263
-    -moz-box-shadow: 0 1px 4px rgba(0, 0, 0, 0.27), 0 0 40px rgba(0, 0, 0, 0.06) inset; 
280
+    -moz-box-shadow: 0 1px 4px rgba(0, 0, 0, 0.27), 0 0 40px rgba(0, 0, 0, 0.06) inset;
264 281
     box-shadow: 0 1px 4px rgba(0, 0, 0, 0.27), 0 0 40px rgba(0, 0, 0, 0.06) inset;
265 282
     margin-bottom: 20px;
266 283
     padding:20px 10px;
@@ -320,7 +337,7 @@ export default {
320 337
 }
321 338
 .actionBar{
322 339
     display: flex;
323
-    justify-content: space-between; 
340
+    justify-content: space-between;
324 341
     line-height: 24px;
325 342
     padding:0 10px;
326 343
 }

+ 18 - 1
src/xt_pages/outpatientDoctorStation/template/printOne.vue View File

@@ -9,7 +9,7 @@
9 9
                 <span v-if="item.patient.gender == 1">男</span>
10 10
                 <span v-if="item.patient.gender == 2">女</span>
11 11
               </p>
12
-              <p>年龄:{{item.patient.age?item.patient.age:""}}岁</p>
12
+              <p>年龄:{{getAge(item.patient)?getAge(item.patient):""}}岁</p>
13 13
           </div>
14 14
           <div class="infoMain">
15 15
               <div style="margin-bottom: 10px;">门诊号:{{hisPatient.number?hisPatient.number:""}}</div>
@@ -92,6 +92,23 @@ export default {
92 92
       }
93 93
     },
94 94
    methods:{
95
+     getAge(patient){
96
+       var thisLen = patient.id_card_no.length
97
+       var birth = ''
98
+       if (thisLen == 15) {
99
+         birth = '19' + patient.id_card_no.substr(6, 6)
100
+       } else {
101
+         birth = patient.id_card_no.substr(6, 8)
102
+       }
103
+       var births =
104
+         birth.substr(0, 4) +
105
+         '-' +
106
+         birth.substr(4, 2) +
107
+         '-' +
108
+         birth.substr(6, 2)
109
+       return jsGetAge(births, '-')
110
+
111
+     },
95 112
 
96 113
      getAllDoctorList(){
97 114
       getAllDoctorList().then(response=>{

+ 37 - 20
src/xt_pages/outpatientDoctorStation/template/printThree.vue View File

@@ -22,7 +22,7 @@
22 22
                 <span v-if="item.patient.gender == 1">男</span>
23 23
                 <span v-if="item.patient.gender == 2">女</span>
24 24
               </div>
25
-              <div>年龄:{{item.patient.age?item.patient.age:""}}岁</div>
25
+              <div>年龄:{{getAge(item.patient)?getAge(item.patient):""}}岁</div>
26 26
           </div>
27 27
           <div class="infoMain">
28 28
               <div style="margin-bottom: 10px;display:flex;">门诊号码:<span class="under_line" v-if="hisPatient.number">{{hisPatient.number?hisPatient.number:""}}</span></div>
@@ -45,7 +45,7 @@
45 45
               <div class="drugsBox" v-for="(it,i) in item.additionalcharge" :key="i">
46 46
                 <div class="drugsOne">{{it.item_name?it.item_name:""}}:&nbsp;{{it.price}}元/{{it.count}}次</div>
47 47
               </div>
48
-              
48
+
49 49
               <!-- <div class="drugsBox" v-for="(it,index) in item.project" :key="index">
50 50
                   <div class="drugsOne"><span style="font-weight:bold;">{{ index+1 + '.' }}</span>{{ it.type == 2 ? it.project.project_name : it.good_info.good_name }}&nbsp;&nbsp;{{it.single_dose}}{{it.single_dose_unit}}&nbsp;×&nbsp; {{it.count}}{{unit}}</div>
51 51
                   <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>
@@ -86,10 +86,10 @@
86 86
           <div style="page-break-after:always"></div>
87 87
       </div>
88 88
     </div>
89
-    
89
+
90 90
   </div>
91 91
 </div>
92
-    
92
+
93 93
 </template>
94 94
 <script>
95 95
 import { jsGetAge, uParseTime } from '@/utils/tools'
@@ -101,7 +101,7 @@ export default {
101 101
       record_date:String,
102 102
       prescription_id:Number,
103 103
       ids:String
104
-    }, 
104
+    },
105 105
     data(){
106 106
       return {
107 107
         doctorList:[],
@@ -120,15 +120,32 @@ export default {
120 120
       }
121 121
     },
122 122
    methods:{
123
-     
123
+     getAge(patient){
124
+       var thisLen = patient.id_card_no.length
125
+       var birth = ''
126
+       if (thisLen == 15) {
127
+         birth = '19' + patient.id_card_no.substr(6, 6)
128
+       } else {
129
+         birth = patient.id_card_no.substr(6, 8)
130
+       }
131
+       var births =
132
+         birth.substr(0, 4) +
133
+         '-' +
134
+         birth.substr(4, 2) +
135
+         '-' +
136
+         birth.substr(6, 2)
137
+       return jsGetAge(births, '-')
138
+
139
+     },
140
+
124 141
      getAllDoctorList(){
125 142
       getAllDoctorList().then(response=>{
126 143
         if(response.data.state == 1){
127 144
                var doctor =  response.data.data.doctor
128
-               
145
+
129 146
                this.doctorList = doctor
130 147
              }
131
-         })   
148
+         })
132 149
      },
133 150
 
134 151
       getDoctor(id){
@@ -171,11 +188,11 @@ export default {
171 188
             var projectlist =  response.data.data.projectlist
172 189
             console.log("所有项目列表",projectlist)
173 190
             this.projectList = projectlist
174
-            
191
+
175 192
             let outputlist1Name = response.data.data.his.patient_info ? JSON.parse(response.data.data.his.patient_info) : {};
176 193
             this.faber = outputlist1Name
177 194
 
178
-            
195
+
179 196
           }
180 197
        })
181 198
      },
@@ -228,7 +245,7 @@ export default {
228 245
             }
229 246
               addtotal =  Math.floor(addtotal * 100) / 100
230 247
         }
231
-       
248
+
232 249
        }
233 250
 
234 251
       for (let i = 0; i < this.prescriptions.length; i++) {
@@ -238,7 +255,7 @@ export default {
238 255
                 total = total + this.prescriptions[i].advices[a].price * this.prescriptions[i].advices[a].prescribing_number
239 256
               }
240 257
             }
241
-          
258
+
242 259
             if (this.prescriptions[i].additionalcharge != null) {
243 260
               for (let a = 0; a < this.prescriptions[i].additionalcharge.length; a++) {
244 261
                 addtotal = addtotal + this.prescriptions[i].additionalcharge[a].price * this.prescriptions[i].additionalcharge[a].count
@@ -250,7 +267,7 @@ export default {
250 267
 
251 268
         return total + addtotal
252 269
       },
253
-      
270
+
254 271
      getProjectName(id){
255 272
         var project_name = ""
256 273
         for(let i=0;i<this.projectList.length;i++){
@@ -271,7 +288,7 @@ export default {
271 288
           // if(id == this.diagnoses[i].id){
272 289
           //    name = this.diagnoses[i].class_name
273 290
           // }
274
-          
291
+
275 292
           if(newIds.indexOf(this.diagnoses[i].id.toString()) > -1){
276 293
             // name += diagnoses[i].class_name + ' '
277 294
             nameArr.push(this.diagnoses[i].class_name)
@@ -281,7 +298,7 @@ export default {
281 298
         nameArr.map((item,index) => {
282 299
           if(item == '尿毒症'){
283 300
             newNameArr.push(item)
284
-            nameArr.splice(index,1,'') 
301
+            nameArr.splice(index,1,'')
285 302
           }
286 303
         })
287 304
         newNameArr.push(...nameArr)
@@ -305,7 +322,7 @@ export default {
305 322
             this.page = 1
306 323
             arr.push(item.advices.length)
307 324
             item.pageArr.push(arr)
308
-            
325
+
309 326
           }else if(item.advices.length > 5){
310 327
             this.page = parseInt(item.advices.length / 5)
311 328
             let num = item.advices.length % 5
@@ -398,11 +415,11 @@ export default {
398 415
       this.getPrescriptionPrint()
399 416
       this.getAllDoctorList()
400 417
       this.getInitData()
401
-      
418
+
402 419
       this.getHisPatientDetail()
403 420
       var xtuser = this.$store.getters.xt_user;
404 421
       this.orgname = xtuser.org.org_name;
405
-     
422
+
406 423
    },
407 424
    watch:{
408 425
      ids:function(val){
@@ -418,7 +435,7 @@ export default {
418 435
 <style lang="scss" scoped>
419 436
 .prescription-print{
420 437
   -webkit-box-shadow: 0 1px 4px rgba(0, 0, 0, 0.27), 0 0 60px rgba(0, 0, 0, 0.06) inset;
421
-    -moz-box-shadow: 0 1px 4px rgba(0, 0, 0, 0.27), 0 0 40px rgba(0, 0, 0, 0.06) inset; 
438
+    -moz-box-shadow: 0 1px 4px rgba(0, 0, 0, 0.27), 0 0 40px rgba(0, 0, 0, 0.06) inset;
422 439
     box-shadow: 0 1px 4px rgba(0, 0, 0, 0.27), 0 0 40px rgba(0, 0, 0, 0.06) inset;
423 440
     margin-bottom: 20px;
424 441
     padding:20px 10px;
@@ -476,7 +493,7 @@ export default {
476 493
 }
477 494
 .actionBar{
478 495
     display: flex;
479
-    justify-content: space-between; 
496
+    justify-content: space-between;
480 497
     line-height: 24px;
481 498
     padding:0 10px;
482 499
 }

+ 26 - 9
src/xt_pages/outpatientDoctorStation/template/printTwo.vue View File

@@ -7,7 +7,7 @@
7 7
                <span v-if="patient.gender == 1">男</span>
8 8
                <span v-if="patient.gender == 2">女</span>
9 9
             </p>
10
-            <p>年龄:{{patient.age}}岁</p>
10
+            <p>年龄:{{getAge(item.patient)?getAge(item.patient):""}}岁</p>
11 11
         </div>
12 12
         <div class="infoMain">
13 13
             <div style="margin-bottom: 10px;">门诊号:{{this.hisPatient.number?this.hisPatient.number:""}}</div>
@@ -24,7 +24,7 @@
24 24
                 <div style="margin-left:100px;"><span>用法:{{item.single_dose}}{{item.single_dose_unit}}</span>&nbsp;&nbsp;<span>{{item.execution_frequency}}</span>&nbsp;&nbsp;<span>{{item.advice_desc}}</span></div>
25 25
             </div>
26 26
 
27
-            
27
+
28 28
         </div>
29 29
         <div class="doctorBox">
30 30
             <p>医师:{{getDoctor(advicePrint[0].advice_doctor)?getDoctor(advicePrint[0].advice_doctor):""}}</p>
@@ -48,7 +48,7 @@ export default {
48 48
       patient_id:Number,
49 49
       record_date:String,
50 50
       prescription_id:Number
51
-    }, 
51
+    },
52 52
     data(){
53 53
       return {
54 54
         doctorList:[],
@@ -62,15 +62,32 @@ export default {
62 62
       }
63 63
     },
64 64
    methods:{
65
-     
65
+     getAge(patient){
66
+       var thisLen = patient.id_card_no.length
67
+       var birth = ''
68
+       if (thisLen == 15) {
69
+         birth = '19' + patient.id_card_no.substr(6, 6)
70
+       } else {
71
+         birth = patient.id_card_no.substr(6, 8)
72
+       }
73
+       var births =
74
+         birth.substr(0, 4) +
75
+         '-' +
76
+         birth.substr(4, 2) +
77
+         '-' +
78
+         birth.substr(6, 2)
79
+       return jsGetAge(births, '-')
80
+
81
+     },
82
+
66 83
      getAllDoctorList(){
67 84
       getAllDoctorList().then(response=>{
68 85
         if(response.data.state == 1){
69 86
                var doctor =  response.data.data.doctor
70
-               
87
+
71 88
                this.doctorList = doctor
72 89
              }
73
-         })   
90
+         })
74 91
      },
75 92
 
76 93
       getDoctor(id){
@@ -104,7 +121,7 @@ export default {
104 121
             console.log("patient",patient)
105 122
             this.patient = patient
106 123
             var doctorPorject = response.data.data.doctorPorject
107
-          
124
+
108 125
             var arr = doctorPorject.project
109 126
               console.log("我的中谷歌",arr)
110 127
             for(let i=0;i<arr.length;i++){
@@ -134,7 +151,7 @@ export default {
134 151
        getInitData().then(response=>{
135 152
           if(response.data.state == 1){
136 153
             this.department = response.data.data.department
137
-           
154
+
138 155
           }
139 156
        })
140 157
      },
@@ -221,7 +238,7 @@ export default {
221 238
 }
222 239
 .actionBar{
223 240
     display: flex;
224
-    justify-content: space-between; 
241
+    justify-content: space-between;
225 242
     line-height: 24px;
226 243
     padding:0 10px;
227 244
 }

+ 18 - 1
src/xt_pages/outpatientDoctorStation/treatTemplate/printOne.vue View File

@@ -28,7 +28,7 @@
28 28
                     <span v-if="item.patient.gender == 2">女</span>
29 29
                 </div>
30 30
                 <div style="margin-bottom: 10px;width:25%">年龄:
31
-                    <span>{{item.patient.age}}</span>
31
+                    <span>{{getAge(item.patient)?getAge(item.patient):""}}</span>
32 32
                 </div>
33 33
                 <div style="margin-bottom: 10px;width:25%">参保类型:{{hisPatient.social_type?hisPatient.social_type:''}}
34 34
                 </div>
@@ -257,6 +257,23 @@
257 257
       }
258 258
     },
259 259
     methods: {
260
+      getAge(patient){
261
+        var thisLen = patient.id_card_no.length
262
+        var birth = ''
263
+        if (thisLen == 15) {
264
+          birth = '19' + patient.id_card_no.substr(6, 6)
265
+        } else {
266
+          birth = patient.id_card_no.substr(6, 8)
267
+        }
268
+        var births =
269
+          birth.substr(0, 4) +
270
+          '-' +
271
+          birth.substr(4, 2) +
272
+          '-' +
273
+          birth.substr(6, 2)
274
+        return jsGetAge(births, '-')
275
+
276
+      },
260 277
       printThisPage() {
261 278
         var ptime = Math.round(new Date().getTime() / 1000)
262 279
         this.print_time = uParseTime(ptime, '{y}-{m}-{d} {h}:{i}')

+ 23 - 6
src/xt_pages/outpatientDoctorStation/treatTemplate/printTwo.vue View File

@@ -20,7 +20,7 @@
20 20
             <span v-if="item.patient.gender == 1">男</span>
21 21
             <span v-if="item.patient.gender == 2">女</span>
22 22
             </div>
23
-            <div>年龄:{{item.patient.age?item.patient.age:""}}岁</div>
23
+            <div>年龄:{{getAge(item.patient)?getAge(item.patient):""}}岁</div>
24 24
         </div>
25 25
         <div class="infoMain">
26 26
             <div style="margin-bottom: 10px;display:flex;">门诊号码:<span class="under_line">{{hisPatient.number?hisPatient.number:""}}</span></div>
@@ -238,6 +238,23 @@ export default {
238 238
       }
239 239
     },
240 240
    methods:{
241
+     getAge(patient){
242
+       var thisLen = patient.id_card_no.length
243
+       var birth = ''
244
+       if (thisLen == 15) {
245
+         birth = '19' + patient.id_card_no.substr(6, 6)
246
+       } else {
247
+         birth = patient.id_card_no.substr(6, 8)
248
+       }
249
+       var births =
250
+         birth.substr(0, 4) +
251
+         '-' +
252
+         birth.substr(4, 2) +
253
+         '-' +
254
+         birth.substr(6, 2)
255
+       return jsGetAge(births, '-')
256
+
257
+     },
241 258
      printThisPage() {
242 259
       var ptime = Math.round(new Date().getTime() / 1000);
243 260
       this.print_time = uParseTime(ptime, "{y}-{m}-{d} {h}:{i}");
@@ -398,14 +415,14 @@ export default {
398 415
         let newIds = ids.split(',').sort(function(a,b){
399 416
           return a-b;
400 417
         })
401
-        
418
+
402 419
         var name = ""
403 420
         let nameArr = []
404 421
         for(let i=0;i<this.diagnoses.length;i++){
405 422
           // if(id == this.diagnoses[i].id){
406 423
           //    name = this.diagnoses[i].class_name
407 424
           // }
408
-          
425
+
409 426
           if(newIds.indexOf(this.diagnoses[i].id.toString()) > -1){
410 427
             // name += diagnoses[i].class_name + ' '
411 428
             nameArr.push(this.diagnoses[i].class_name)
@@ -415,7 +432,7 @@ export default {
415 432
         nameArr.map((item,index) => {
416 433
           if(item == '尿毒症'){
417 434
             newNameArr.push(item)
418
-            nameArr.splice(index,1,'') 
435
+            nameArr.splice(index,1,'')
419 436
           }
420 437
         })
421 438
         newNameArr.push(...nameArr)
@@ -528,7 +545,7 @@ export default {
528 545
 <style lang="scss" scoped>
529 546
 .prescription-print{
530 547
   -webkit-box-shadow: 0 1px 4px rgba(0, 0, 0, 0.27), 0 0 60px rgba(0, 0, 0, 0.06) inset;
531
-    -moz-box-shadow: 0 1px 4px rgba(0, 0, 0, 0.27), 0 0 40px rgba(0, 0, 0, 0.06) inset; 
548
+    -moz-box-shadow: 0 1px 4px rgba(0, 0, 0, 0.27), 0 0 40px rgba(0, 0, 0, 0.06) inset;
532 549
     box-shadow: 0 1px 4px rgba(0, 0, 0, 0.27), 0 0 40px rgba(0, 0, 0, 0.06) inset;
533 550
     margin-bottom: 20px;
534 551
     padding:20px 10px;
@@ -586,7 +603,7 @@ export default {
586 603
 }
587 604
 .actionBar{
588 605
     display: flex;
589
-    justify-content: space-between; 
606
+    justify-content: space-between;
590 607
     line-height: 24px;
591 608
     padding:0 10px;
592 609
 }