提交代码

src/xt_pages/outpatientCharges/summary.vue

@@ -243,6 +243,14 @@
         <el-table-column align="center" width="90" prop="name" label="患者名字">
           <template slot-scope="scope">{{ scope.row.patient.name }}</template>
         </el-table-column>
+
+        <el-table-column align="center" width="90" prop="name" label="患者性别">
+          <template slot-scope="scope">{{ scope.row.patient.gender == 1 ? '男':'女' }}</template>
+        </el-table-column>
+
+        <el-table-column align="center" width="90" prop="name" label="患者年龄">
+          <template slot-scope="scope">{{getAge(scope.row.patient.id_card_no)}}</template>
+        </el-table-column>
         <!--<el-table-column align="center" prop="name" label="患者类型">-->
         <!--<template slot-scope="scope"></template>-->
         <!--</el-table-column>-->
@@ -782,6 +790,19 @@ export default {
   },
 
   methods: {
+    getAge(UUserCard) {
+      if (UUserCard != null && UUserCard != '') {
+        //获取年龄
+        var myDate = new Date();
+        var month = myDate.getMonth() + 1;
+        var day = myDate.getDate();
+        var age = myDate.getFullYear() - UUserCard.substring(6, 10) - 1;
+        if (UUserCard.substring(10, 12) < month || UUserCard.substring(10, 12) == month && UUserCard.substring(12, 14) <= day) {
+          age++;
+        }
+        return age;
+      }
+    },
     accounts_click(){
       let params = {
         start_time: this.start_time,
@@ -3323,9 +3344,20 @@ export default {
             let balance_accounts = ''
             let order_status = ''
             let charge_name = ''
+            let  gender = ""
+            let  age = 0
+
 
             let insutypeName = ''
 
+            if(order.patient.gender == 1){
+              gender = "男"
+            }else{
+              gender = "女"
+            }
+
+            age = this.getAge(order.patient.id_card_no)
+
             let time = ''
             if (
               order.his_patient != null &&
@@ -3459,6 +3491,8 @@ export default {
             let obj = {
               就诊号: order.mdtrt_id,
               患者姓名: name,
+              患者性别: gender,
+              患者年龄: age,
               开处时间: time,
               险种类型: insutypeName,
               参保所属医保区划: order.his_patient.insuplc_admdvs,
@@ -3495,6 +3529,8 @@ export default {
             const tHeader = [
               '就诊号',
               '患者姓名',
+              "患者性别",
+              "患者年龄",
               '开处时间',
               '险种类型',
               '参保所属医保区划',
@@ -3527,6 +3563,8 @@ export default {
             const filterVal = [
               '就诊号',
               '患者姓名',
+              "患者性别",
+              "患者年龄",
               '开处时间',
               '险种类型',
               '参保所属医保区划',

src/xt_pages/outpatientDoctorStation/doctorDesk.vue

@@ -378,7 +378,7 @@
                   </div>
 
                 </div>
-                
+
                 <div class="printCell" style="display:flex;">
                   <span style="display: block;width: 45%;">
                     床号：{{ main_collection.number.number }}
@@ -2036,10 +2036,17 @@ export default {
                   if(nowTime.split(" ")[0] != this.record_date){
                     // preTime = this.record_date
                     if(this.schedule.schedule_type == 1){
-                      preTime = this.record_date + ' ' + '7:00'
+                      if(this.org_id == 10206  || this.org_id == 0) {
+                        preTime = this.record_date+ ' ' + '6:00'
+                      }else {
+                        preTime = this.record_date + ' ' + '7:00'
+                      }
                     }else if(this.schedule.schedule_type == 2){
-                      preTime = this.record_date + ' ' + '11:00'
-
+                      if(this.org_id == 10206  || this.org_id == 0){
+                        preTime = this.record_date + ' ' + '10:30'
+                      }else {
+                        preTime = this.record_date + ' ' + '11:00'
+                      }
                     }else{
                       preTime = this.record_date + ' ' + '17:00'
                     }
@@ -2202,7 +2209,7 @@ export default {
                     // preTime = nowYear + '-' + (nowMonth < 10 ? '0' + nowMonth : nowMonth) + '-' + (nowDay < 10 ? '0' + nowDay : nowDay) + ' ' + '7:00'
                   } else if (this.schedule.schedule_type == 2) {
                     if(this.org_id == 10206  || this.org_id == 0){
-                      preTime = this.record_date + ' ' + '6:00'
+                      preTime = this.record_date + ' ' + '10:30'
                     }else {
                       preTime = this.record_date + ' ' + '11:00'
                     }
@@ -2210,16 +2217,20 @@ export default {
                     preTime = this.record_date + ' ' + '17:00'
                   }
                 }
-                console.log("++=========")
-                console.log(nowTime.split(" ")[0])
-                console.log(this.record_date)
-                console.log("++=========")
+
                 if(nowTime.split(" ")[0] != this.record_date){
                   if(this.schedule.schedule_type == 1){
-                    preTime = this.record_date + ' ' + '7:00'
+                    if(this.org_id == 10206  || this.org_id == 0) {
+                      preTime = this.record_date+ ' ' + '6:00'
+                    }else {
+                      preTime = this.record_date + ' ' + '7:00'
+                    }
                   }else if(this.schedule.schedule_type == 2){
-                    preTime = this.record_date + ' ' + '11:00'
-
+                    if(this.org_id == 10206  || this.org_id == 0){
+                      preTime = this.record_date + ' ' + '10:30'
+                    }else {
+                      preTime = this.record_date + ' ' + '11:00'
+                    }
                   }else{
                     preTime = this.record_date + ' ' + '17:00'
                   }
@@ -2265,10 +2276,17 @@ export default {
               if(nowTime.split(" ")[0] != this.record_date){
                 // preTime = this.record_date
                 if(this.schedule.schedule_type == 1){
-                  preTime = this.record_date + ' ' + '7:00'
+                  if(this.org_id == 10206  || this.org_id == 0) {
+                    preTime = this.record_date+ ' ' + '6:00'
+                  }else {
+                    preTime = this.record_date + ' ' + '7:00'
+                  }
                 }else if(this.schedule.schedule_type == 2){
-                  preTime = this.record_date + ' ' + '11:00'
-
+                  if(this.org_id == 10206  || this.org_id == 0){
+                    preTime = this.record_date + ' ' + '10:30'
+                  }else {
+                    preTime = this.record_date + ' ' + '11:00'
+                  }
                 }else{
                   preTime = this.record_date + ' ' + '17:00'
                 }
@@ -2585,10 +2603,17 @@ export default {
                       if (prescription.pre_time == 0) {
                         if(nowTime.split(" ")[0] != this.record_date){
                           if(this.schedule.schedule_type == 1){
-                            preTime = this.record_date + ' ' + '7:00'
+                            if(this.org_id == 10206  || this.org_id == 0) {
+                              preTime = this.record_date+ ' ' + '6:00'
+                            }else {
+                              preTime = this.record_date + ' ' + '7:00'
+                            }
                           }else if(this.schedule.schedule_type == 2){
-                            preTime = this.record_date + ' ' + '11:00'
-
+                            if(this.org_id == 10206  || this.org_id == 0){
+                              preTime = this.record_date + ' ' + '10:30'
+                            }else {
+                              preTime = this.record_date + ' ' + '11:00'
+                            }
                           }else{
                             preTime = this.record_date + ' ' + '17:00'
                           }
@@ -2764,10 +2789,17 @@ export default {
                       }
                       if(nowTime.split(" ")[0] != this.record_date){
                         if(this.schedule.schedule_type == 1){
-                          preTime = this.record_date + ' ' + '7:00'
+                          if(this.org_id == 10206  || this.org_id == 0) {
+                            preTime = this.record_date+ ' ' + '6:00'
+                          }else {
+                            preTime = this.record_date + ' ' + '7:00'
+                          }
                         }else if(this.schedule.schedule_type == 2){
-                          preTime = this.record_date + ' ' + '11:00'
-
+                          if(this.org_id == 10206  || this.org_id == 0){
+                            preTime = this.record_date + ' ' + '10:30'
+                          }else {
+                            preTime = this.record_date + ' ' + '11:00'
+                          }
                         }else{
                           preTime = this.record_date + ' ' + '17:00'
                         }
@@ -2806,10 +2838,17 @@ export default {
                   } else {
                     if(nowTime.split(" ")[0] != this.record_date){
                       if(this.schedule.schedule_type == 1){
-                        preTime = this.record_date + ' ' + '7:00'
+                        if(this.org_id == 10206  || this.org_id == 0) {
+                          preTime = this.record_date+ ' ' + '6:00'
+                        }else {
+                          preTime = this.record_date + ' ' + '7:00'
+                        }
                       }else if(this.schedule.schedule_type == 2){
-                        preTime = this.record_date + ' ' + '11:00'
-
+                        if(this.org_id == 10206  || this.org_id == 0){
+                          preTime = this.record_date + ' ' + '10:30'
+                        }else {
+                          preTime = this.record_date + ' ' + '11:00'
+                        }
                       }else{
                         preTime = this.record_date + ' ' + '17:00'
                       }
@@ -3186,10 +3225,17 @@ export default {
                       // preTime = nowTime
                       if(nowTime.split(" ")[0] != this.record_date){
                         if(this.schedule.schedule_type == 1){
-                          preTime = this.record_date + ' ' + '7:00'
+                          if(this.org_id == 10206  || this.org_id == 0) {
+                            preTime = this.record_date+ ' ' + '6:00'
+                          }else {
+                            preTime = this.record_date + ' ' + '7:00'
+                          }
                         }else if(this.schedule.schedule_type == 2){
-                          preTime = this.record_date + ' ' + '11:00'
-
+                          if(this.org_id == 10206  || this.org_id == 0){
+                            preTime = this.record_date + ' ' + '10:30'
+                          }else {
+                            preTime = this.record_date + ' ' + '11:00'
+                          }
                         }else{
                           preTime = this.record_date + ' ' + '17:00'
                         }
@@ -3336,10 +3382,17 @@ export default {
                       var preTime = nowTime
                       if(nowTime.split(" ")[0] != this.record_date){
                         if(this.schedule.schedule_type == 1){
-                          preTime = this.record_date + ' ' + '7:00'
+                          if(this.org_id == 10206  || this.org_id == 0) {
+                            preTime = this.record_date+ ' ' + '6:00'
+                          }else {
+                            preTime = this.record_date + ' ' + '7:00'
+                          }
                         }else if(this.schedule.schedule_type == 2){
-                          preTime = this.record_date + ' ' + '11:00'
-
+                          if(this.org_id == 10206  || this.org_id == 0){
+                            preTime = this.record_date + ' ' + '10:30'
+                          }else {
+                            preTime = this.record_date + ' ' + '11:00'
+                          }
                         }else{
                           preTime = this.record_date + ' ' + '17:00'
                         }
@@ -3376,10 +3429,17 @@ export default {
                   } else {
                     if(nowTime.split(" ")[0] != this.record_date){
                       if(this.schedule.schedule_type == 1){
-                        preTime = this.record_date + ' ' + '7:00'
+                        if(this.org_id == 10206  || this.org_id == 0) {
+                          preTime = this.record_date+ ' ' + '6:00'
+                        }else {
+                          preTime = this.record_date + ' ' + '7:00'
+                        }
                       }else if(this.schedule.schedule_type == 2){
-                        preTime = this.record_date + ' ' + '11:00'
-
+                        if(this.org_id == 10206  || this.org_id == 0){
+                          preTime = this.record_date + ' ' + '10:30'
+                        }else {
+                          preTime = this.record_date + ' ' + '11:00'
+                        }
                       }else{
                         preTime = this.record_date + ' ' + '17:00'
                       }
@@ -3742,10 +3802,17 @@ export default {
                     // preTime = nowTime
                     if(nowTime.split(" ")[0] != this.record_date){
                       if(this.schedule.schedule_type == 1){
-                        preTime = this.record_date + ' ' + '7:00'
+                        if(this.org_id == 10206  || this.org_id == 0) {
+                          preTime = this.record_date+ ' ' + '6:00'
+                        }else {
+                          preTime = this.record_date + ' ' + '7:00'
+                        }
                       }else if(this.schedule.schedule_type == 2){
-                        preTime = this.record_date + ' ' + '11:00'
-
+                        if(this.org_id == 10206  || this.org_id == 0){
+                          preTime = this.record_date + ' ' + '10:30'
+                        }else {
+                          preTime = this.record_date + ' ' + '11:00'
+                        }
                       }else{
                         preTime = this.record_date + ' ' + '17:00'
                       }
@@ -3891,10 +3958,17 @@ export default {
                     var preTime = nowTime
                     if(nowTime.split(" ")[0] != this.record_date){
                       if(this.schedule.schedule_type == 1){
-                        preTime = this.record_date + ' ' + '7:00'
+                        if(this.org_id == 10206  || this.org_id == 0) {
+                          preTime = this.record_date+ ' ' + '6:00'
+                        }else {
+                          preTime = this.record_date + ' ' + '7:00'
+                        }
                       }else if(this.schedule.schedule_type == 2){
-                        preTime = this.record_date + ' ' + '11:00'
-
+                        if(this.org_id == 10206  || this.org_id == 0){
+                          preTime = this.record_date + ' ' + '10:30'
+                        }else {
+                          preTime = this.record_date + ' ' + '11:00'
+                        }
                       }else{
                         preTime = this.record_date + ' ' + '17:00'
                       }
@@ -3932,10 +4006,17 @@ export default {
                 } else {
                   if(nowTime.split(" ")[0] != this.record_date){
                     if(this.schedule.schedule_type == 1){
-                      preTime = this.record_date + ' ' + '7:00'
+                      if(this.org_id == 10206  || this.org_id == 0) {
+                        preTime = this.record_date+ ' ' + '6:00'
+                      }else {
+                        preTime = this.record_date + ' ' + '7:00'
+                      }
                     }else if(this.schedule.schedule_type == 2){
-                      preTime = this.record_date + ' ' + '11:00'
-
+                      if(this.org_id == 10206  || this.org_id == 0){
+                        preTime = this.record_date + ' ' + '10:30'
+                      }else {
+                        preTime = this.record_date + ' ' + '11:00'
+                      }
                     }else{
                       preTime = this.record_date + ' ' + '17:00'
                     }
@@ -4413,10 +4494,17 @@ export default {
                         // preTime = nowTime
                         if(nowTime.split(" ")[0] != this.record_date){
                           if(this.schedule.schedule_type == 1){
-                            preTime = this.record_date + ' ' + '7:00'
+                            if(this.org_id == 10206  || this.org_id == 0) {
+                              preTime = this.record_date+ ' ' + '6:00'
+                            }else {
+                              preTime = this.record_date + ' ' + '7:00'
+                            }
                           }else if(this.schedule.schedule_type == 2){
-                            preTime = this.record_date + ' ' + '11:00'
-
+                            if(this.org_id == 10206  || this.org_id == 0){
+                              preTime = this.record_date + ' ' + '10:30'
+                            }else {
+                              preTime = this.record_date + ' ' + '11:00'
+                            }
                           }else{
                             preTime = this.record_date + ' ' + '17:00'
                           }
@@ -4587,10 +4675,17 @@ export default {
                       }
                       if(nowTime.split(" ")[0] != this.record_date){
                         if(this.schedule.schedule_type == 1){
-                          preTime = this.record_date + ' ' + '7:00'
+                          if(this.org_id == 10206  || this.org_id == 0) {
+                            preTime = this.record_date+ ' ' + '6:00'
+                          }else {
+                            preTime = this.record_date + ' ' + '7:00'
+                          }
                         }else if(this.schedule.schedule_type == 2){
-                          preTime = this.record_date + ' ' + '11:00'
-
+                          if(this.org_id == 10206  || this.org_id == 0){
+                            preTime = this.record_date + ' ' + '10:30'
+                          }else {
+                            preTime = this.record_date + ' ' + '11:00'
+                          }
                         }else{
                           preTime = this.record_date + ' ' + '17:00'
                         }
@@ -4635,10 +4730,17 @@ export default {
 
                     if(nowTime.split(" ")[0] != this.record_date){
                       if(this.schedule.schedule_type == 1){
-                        preTime = this.record_date + ' ' + '7:00'
+                        if(this.org_id == 10206  || this.org_id == 0) {
+                          preTime = this.record_date+ ' ' + '6:00'
+                        }else {
+                          preTime = this.record_date + ' ' + '7:00'
+                        }
                       }else if(this.schedule.schedule_type == 2){
-                        preTime = this.record_date + ' ' + '11:00'
-
+                        if(this.org_id == 10206  || this.org_id == 0){
+                          preTime = this.record_date + ' ' + '10:30'
+                        }else {
+                          preTime = this.record_date + ' ' + '11:00'
+                        }
                       }else{
                         preTime = this.record_date + ' ' + '17:00'
                       }
@@ -5015,10 +5117,17 @@ export default {
                         preTime = nowTime
                         if(nowTime.split(" ")[0] != this.record_date){
                           if(this.schedule.schedule_type == 1){
-                            preTime = this.record_date + ' ' + '7:00'
+                            if(this.org_id == 10206  || this.org_id == 0) {
+                              preTime = this.record_date+ ' ' + '6:00'
+                            }else {
+                              preTime = this.record_date + ' ' + '7:00'
+                            }
                           }else if(this.schedule.schedule_type == 2){
-                            preTime = this.record_date + ' ' + '11:00'
-
+                            if(this.org_id == 10206  || this.org_id == 0){
+                              preTime = this.record_date + ' ' + '10:30'
+                            }else {
+                              preTime = this.record_date + ' ' + '11:00'
+                            }
                           }else{
                             preTime = this.record_date + ' ' + '17:00'
                           }
@@ -5191,10 +5300,17 @@ export default {
                       }
                       if(nowTime.split(" ")[0] != this.record_date){
                         if(this.schedule.schedule_type == 1){
-                          preTime = this.record_date + ' ' + '7:00'
+                          if(this.org_id == 10206  || this.org_id == 0) {
+                            preTime = this.record_date+ ' ' + '6:00'
+                          }else {
+                            preTime = this.record_date + ' ' + '7:00'
+                          }
                         }else if(this.schedule.schedule_type == 2){
-                          preTime = this.record_date + ' ' + '11:00'
-
+                          if(this.org_id == 10206  || this.org_id == 0){
+                            preTime = this.record_date + ' ' + '10:30'
+                          }else {
+                            preTime = this.record_date + ' ' + '11:00'
+                          }
                         }else{
                           preTime = this.record_date + ' ' + '17:00'
                         }
@@ -5238,10 +5354,17 @@ export default {
                   } else {
                     if(nowTime.split(" ")[0] != this.record_date){
                       if(this.schedule.schedule_type == 1){
-                        preTime = this.record_date + ' ' + '7:00'
+                        if(this.org_id == 10206  || this.org_id == 0) {
+                          preTime = this.record_date+ ' ' + '6:00'
+                        }else {
+                          preTime = this.record_date + ' ' + '7:00'
+                        }
                       }else if(this.schedule.schedule_type == 2){
-                        preTime = this.record_date + ' ' + '11:00'
-
+                        if(this.org_id == 10206  || this.org_id == 0){
+                          preTime = this.record_date + ' ' + '10:30'
+                        }else {
+                          preTime = this.record_date + ' ' + '11:00'
+                        }
                       }else{
                         preTime = this.record_date + ' ' + '17:00'
                       }

src/xt_pages/outpatientDoctorStation/print.vue

@@ -1,9 +1,9 @@
 <template>
   <div>
     <div class="dialysisPage" style="padding-top: 40px">
-      <div v-if="org_id != 10138 && org_id != 10278 && org_id != 10243 && org_id != 10537 && org_id != 10610 && org_id != 0 ">
+      <div v-if="org_id != 10138 && org_id != 10278 && org_id != 10243 && org_id != 10537 && org_id != 10610  ">
 
-        <printOne v-if="org_id != 10088 && org_id != 10215 && org_id != 10375 && org_id != 10188 && org_id != 10217 && org_id != 10598 && org_id != 10644 && org_id != 0" v-bind:childResponse="childResponse"
+        <printOne v-if="org_id != 10088 && org_id != 10215 && org_id != 10375 && org_id != 10188 && org_id != 10217 && org_id != 10598 && org_id != 10644" 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>
@@ -40,7 +40,7 @@
         </prineight>
 
         <printFour
-          v-if="org_id == 10088 || org_id == 10510 || org_id == 10598 || org_id ==0 "
+          v-if="org_id == 10088 || org_id == 10510 || org_id == 10598"
           v-bind:childResponse="childResponse"
           :advicePrint="advicePrint"
           :ids="ids"

src/xt_pages/outpatientDoctorStation/template/printOne.vue

@@ -33,7 +33,7 @@
           </div>
           <div class="infoMain">
             <div style="margin-bottom: 10px">
-              门诊号：{{ hisPatient.number ? hisPatient.number : "" }}
+              门诊号：{{ item.hisPatient.number ? item.hisPatient.number : "" }}
             </div>
             <div style="margin-bottom: 10px">
               科室：{{ item.info ? getDepart(item.info.departments) : "" }}