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

src/xt_pages/dialysis/batch_print/batch_print_order_six.vue

@@ -1412,6 +1412,9 @@
                         <span v-if="record.prescription.anticoagulant == 16"
                           >mg</span
                         >
+                        <span v-if="record.prescription.anticoagulant == 15"
+                          >mg</span
+                        >
                         <span v-if="record.prescription.anticoagulant == 17"
                           >U</span
                         >

src/xt_pages/dialysis/batch_print/batch_print_order_sixtyeight.vue

@@ -1181,6 +1181,9 @@
                         <span v-if="record.prescription.anticoagulant == 1"
                           >mg</span
                         >
+                        <span v-if="record.prescription.anticoagulant == 15"
+                          >mg</span
+                        >
                       </div>
                       <div class="inline_block" style="margin-left: 20px" v-if=" record.prescription.anticoagulant !=1">
                         维持：
@@ -1229,6 +1232,9 @@
                         <span v-if="record.prescription.anticoagulant == 1"
                           >mg/h</span
                         >
+                        <span v-if="record.prescription.anticoagulant == 15"
+                          >mg/h</span
+                        >
                       </div>
                       <div class="inline_block" style="margin-left: 20px" v-if=" record.prescription.anticoagulant !=1">
                         总量：
@@ -1255,6 +1261,9 @@
                         <span v-if="record.prescription.anticoagulant == 1"
                           >mg</span
                         >
+                        <span v-if="record.prescription.anticoagulant == 15"
+                          >mg</span
+                        >
                       </div>
 
                       <div class="inline_block" style="margin-left: 20px">

src/xt_pages/dialysis/details/DialysisPrescription.vue

@@ -173,13 +173,13 @@
         </li> -->
 
 
-        <li v-if="isShow('处方脱水量') && this.$store.getters.xt_user.template_info.org_id != 10597 && this.$store.getters.xt_user.template_info.org_id != 10571  && this.$store.getters.xt_user.template_info.org_id != 10612 && this.$store.getters.xt_user.template_info.org_id != 10598 && this.$store.getters.xt_user.template_info.org_id != 10677 && this.$store.getters.xt_user.template_info.org_id != 10679 && this.$store.getters.xt_user.template_info.org_id != 10702 && this.$store.getters.xt_user.template_info.org_id != 10635">
+        <li v-if="isShow('处方脱水量') && this.$store.getters.xt_user.template_info.org_id != 10597 && this.$store.getters.xt_user.template_info.org_id != 10571  && this.$store.getters.xt_user.template_info.org_id != 10612 && this.$store.getters.xt_user.template_info.org_id != 10598 && this.$store.getters.xt_user.template_info.org_id != 10677 && this.$store.getters.xt_user.template_info.org_id != 10679 && this.$store.getters.xt_user.template_info.org_id != 10702 && this.$store.getters.xt_user.template_info.org_id != 10635 && this.$store.getters.xt_user.template_info.org_id != 10721">
           <label>处方脱水量 : </label>
           <span class="content">{{ prescription_water != "0" ? prescription_water : "" }}</span>
           <span class="unit">{{ prescription_water != "0" ? "ml" : "" }}</span>
         </li>
 
-        <li v-if="isShow('处方脱水量') && this.$store.getters.xt_user.template_info.org_id == 10597 ||  this.$store.getters.xt_user.template_info.org_id == 10571 || this.$store.getters.xt_user.template_info.org_id == 10612  || this.$store.getters.xt_user.template_info.org_id == 10598 || this.$store.getters.xt_user.template_info.org_id == 10677 || this.$store.getters.xt_user.template_info.org_id == 10679 || this.$store.getters.xt_user.template_info.org_id == 10702 || this.$store.getters.xt_user.template_info.org_id == 10635">
+        <li v-if="isShow('处方脱水量') && this.$store.getters.xt_user.template_info.org_id == 10597 ||  this.$store.getters.xt_user.template_info.org_id == 10571 || this.$store.getters.xt_user.template_info.org_id == 10612  || this.$store.getters.xt_user.template_info.org_id == 10598 || this.$store.getters.xt_user.template_info.org_id == 10677 || this.$store.getters.xt_user.template_info.org_id == 10679 || this.$store.getters.xt_user.template_info.org_id == 10702 || this.$store.getters.xt_user.template_info.org_id == 10635 || this.$store.getters.xt_user.template_info.org_id == 10721">
           <label>处方脱水量 : </label>
           <span class="content">{{ prescription_water != "0" ? prescription_water : "" }}</span>
           <span class="unit">{{ prescription_water != "0" ? "L" : "" }}</span>

src/xt_pages/dialysis/details/dialog/dialysisPrescriptionDialog.vue

@@ -164,7 +164,7 @@
                     </el-col>
 
                     <el-col :span="8"
-                            v-if="isShows('处方脱水量') && this.$store.getters.xt_user.template_info.org_id != 10597&& this.$store.getters.xt_user.template_info.org_id != 10571 && this.$store.getters.xt_user.template_info.org_id != 10612 && this.$store.getters.xt_user.template_info.org_id != 10598 && this.$store.getters.xt_user.template_info.org_id != 10677 && this.$store.getters.xt_user.template_info.org_id != 10679 && this.$store.getters.xt_user.template_info.org_id != 10702 && this.$store.getters.xt_user.template_info.org_id != 10635">
+                            v-if="isShows('处方脱水量') && this.$store.getters.xt_user.template_info.org_id != 10597&& this.$store.getters.xt_user.template_info.org_id != 10571 && this.$store.getters.xt_user.template_info.org_id != 10612 && this.$store.getters.xt_user.template_info.org_id != 10598 && this.$store.getters.xt_user.template_info.org_id != 10677 && this.$store.getters.xt_user.template_info.org_id != 10679 && this.$store.getters.xt_user.template_info.org_id != 10702 && this.$store.getters.xt_user.template_info.org_id != 10635 && this.$store.getters.xt_user.template_info.org_id != 10721">
                         <el-form-item label="处方脱水量(ml)：" prop="prescription_water" :rules="isCheckmust('处方脱水量')">
                             <el-input
                                     type="number"
@@ -174,7 +174,7 @@
                     </el-col>
 
                     <el-col :span="8"
-                            v-if="isShows('处方脱水量') && this.$store.getters.xt_user.template_info.org_id == 10597 || this.$store.getters.xt_user.template_info.org_id ==10571 || this.$store.getters.xt_user.template_info.org_id ==10612 || this.$store.getters.xt_user.template_info.org_id ==10598 || this.$store.getters.xt_user.template_info.org_id ==10612 || this.$store.getters.xt_user.template_info.org_id ==10677 || this.$store.getters.xt_user.template_info.org_id==10679 || this.$store.getters.xt_user.template_info.org_id==10702 || this.$store.getters.xt_user.template_info.org_id==10635">
+                            v-if="isShows('处方脱水量') && this.$store.getters.xt_user.template_info.org_id == 10597 || this.$store.getters.xt_user.template_info.org_id ==10571 || this.$store.getters.xt_user.template_info.org_id ==10612 || this.$store.getters.xt_user.template_info.org_id ==10598 || this.$store.getters.xt_user.template_info.org_id ==10612 || this.$store.getters.xt_user.template_info.org_id ==10677 || this.$store.getters.xt_user.template_info.org_id==10679 || this.$store.getters.xt_user.template_info.org_id==10702 || this.$store.getters.xt_user.template_info.org_id==10635 || this.$store.getters.xt_user.template_info.org_id==10721">
                         <el-form-item label="处方脱水量(L)：" prop="prescription_water" :rules="isCheckmust('处方脱水量')">
                             <el-input
                                     type="number"
@@ -2635,7 +2635,7 @@ mu
       },
       show(pre, schedual, last, his_is_open,is_advice_open,admins) {
 
-        if(this.$store.getters.xt_user.template_info.org_id==10702 || this.$store.getters.xt_user.template_info.org_id==10635  || this.$store.getters.xt_user.template_info.org_id==0){
+        if(this.$store.getters.xt_user.template_info.org_id==10702 || this.$store.getters.xt_user.template_info.org_id==10635  || this.$store.getters.xt_user.template_info.org_id==0   || this.$store.getters.xt_user.template_info.org_id==10721){
           if(this.predialysis!=undefined){
             if(this.dialysisPrescription.target_ultrafiltration==0 || this.dialysisPrescription.target_ultrafiltration==""){
               this.dialysisPrescription.target_ultrafiltration = (this.predialysis.weight_before - this.predialysis.dry_weight - this.predialysis.additional_weight).toFixed(2)
@@ -3234,7 +3234,7 @@ mu
           }
         }
 
-        if(this.$store.getters.xt_user.template_info.org_id ==10635 || this.$store.getters.xt_user.template_info.org_id ==0 || this.$store.getters.xt_user.template_info.org_id ==10702 ||  this.$store.getters.xt_user.template_info.org_id == 10727){
+        if(this.$store.getters.xt_user.template_info.org_id ==10635 || this.$store.getters.xt_user.template_info.org_id ==0 || this.$store.getters.xt_user.template_info.org_id ==10702 ||  this.$store.getters.xt_user.template_info.org_id == 10727 ||  this.$store.getters.xt_user.template_info.org_id == 10721){
          
           if(this.dialysisPrescription.target_ultrafiltration == 0 || this.dialysisPrescription.target_ultrafiltration=="" || this.dialysisPrescription.target_ultrafiltration == "undefined" || this.dialysisPrescription.target_ultrafiltration == undefined){
           

src/xt_pages/dialysis/details/dialog/monitor_dialog.vue

@@ -387,7 +387,7 @@
                 org_id == 10599 || 
                 org_id == 10612 ||
                 org_id == 10617 ||
-                org_id ==10580 || org_id ==10629 || org_id==10677 || org_id ==10667 || org_id ==10697 || org_id ==10635 || org_id ==10702 || org_id ==10090 || org_id ==10723) &&
+                org_id ==10580 || org_id ==10629 || org_id==10677 || org_id ==10667 || org_id ==10697 || org_id ==10635 || org_id ==10702 || org_id ==10090 || org_id ==10723 || org_id == 10721) &&
                 org_id!=10387
             "
           >
@@ -458,7 +458,7 @@
               && org_id!=10432 && org_id!=10445
               && org_id!=10410 && org_id!=10495 &&
                org_id!=10485 && org_id!=10395 && org_id!=10375
-               && org_id!=10480  && org_id!=10551 && org_id!=10597 && org_id!=10599 && org_id!=10612 && org_id!=10617 && org_id!=10580 && org_id!=10629 && org_id!=10677 && org_id!=10667 && org_id!=10697 && org_id!=10635  && org_id!=10702  && org_id!=10090 && org_id!=10723)
+               && org_id!=10480  && org_id!=10551 && org_id!=10597 && org_id!=10599 && org_id!=10612 && org_id!=10617 && org_id!=10580 && org_id!=10629 && org_id!=10677 && org_id!=10667 && org_id!=10697 && org_id!=10635  && org_id!=10702  && org_id!=10090 && org_id!=10723 && org_id!=10721)
               || org_id == 10387
             "
           >
@@ -529,7 +529,7 @@
                 org_id == 10410 ||
                 org_id == 10495  ||
                 org_id == 10395
-                || org_id == 10485 || org_id == 10375 || org_id ==10480 || org_id ==10551 || org_id ==10597 || org_id ==10599 || org_id ==10612 || org_id==10617 || org_id ==10580 || org_id ==10629 || org_id ==10677 || org_id == 10667 || org_id == 10693 || org_id == 10697 || org_id ==10635 || org_id ==10702 || org_id == 10090 || org_id == 10723)
+                || org_id == 10485 || org_id == 10375 || org_id ==10480 || org_id ==10551 || org_id ==10597 || org_id ==10599 || org_id ==10612 || org_id==10617 || org_id ==10580 || org_id ==10629 || org_id ==10677 || org_id == 10667 || org_id == 10693 || org_id == 10697 || org_id ==10635 || org_id ==10702 || org_id == 10090 || org_id == 10723 || org_id == 10721)
                 && org_id!=10387
             "
           >
@@ -537,7 +537,7 @@
               {{
                 scope.row.ultrafiltration_rate
                   ? scope.row.ultrafiltration_rate
-                  : ""
+                  : "0"
               }}
             </template>
           </el-table-column>
@@ -584,7 +584,7 @@
               org_id!=10432 &&
               org_id!=10445 &&
               org_id!=10410 && org_id!=10495
-              && org_id!=10485 && org_id!=10395 && org_id!=10375 && org_id!=10480 && org_id!=10551 && org_id!=10597 && org_id!=10599&& org_id!=10612 && org_id!=10617 && org_id!=10580 && org_id!=10629 && org_id!=10677 && org_id!=10667 && org_id!=10693  && org_id!=10697  && org_id!=10635  && org_id!=10702 && org_id!=10090 && org_id!=10723) ||
+              && org_id!=10485 && org_id!=10395 && org_id!=10375 && org_id!=10480 && org_id!=10551 && org_id!=10597 && org_id!=10599&& org_id!=10612 && org_id!=10617 && org_id!=10580 && org_id!=10629 && org_id!=10677 && org_id!=10667 && org_id!=10693  && org_id!=10697  && org_id!=10635  && org_id!=10702 && org_id!=10090 && org_id!=10723 && org_id!=10721) ||
               org_id == 10387
             "
           >
@@ -592,7 +592,7 @@
               {{
                 scope.row.ultrafiltration_rate
                   ? scope.row.ultrafiltration_rate
-                  : ""
+                  : "0"
               }}
             </template>
           </el-table-column>
@@ -1802,7 +1802,7 @@
                 org_id == 10599 ||
                 org_id ==10612 || 
                 org_id ==10617 || 
-                org_id==10580 || org_id ==10629 || org_id == 10677 || org_id == 10667 || org_id == 10693 || org_id == 10697 || org_id == 10635 || org_id == 10702 || org_id == 10090 || org_id ==10723)
+                org_id==10580 || org_id ==10629 || org_id == 10677 || org_id == 10667 || org_id == 10693 || org_id == 10697 || org_id == 10635 || org_id == 10702 || org_id == 10090 || org_id ==10723 || org_id == 10721)
                 && org_id!=10387 && org_id!=10694
             "
           >
@@ -1877,7 +1877,8 @@
               org_id!=10635 &&
               org_id!=10702 &&
               org_id!=10090 && 
-              org_id!=10723
+              org_id!=10723 &&
+              org_id!=10721
               )
               || org_id == 10387 || org_id == 10694
             "

src/xt_pages/dialysis/details/dialysisMonitoring.vue

@@ -23,15 +23,15 @@
           <th v-if=" isShow('超滤量') &&(template_id == 6 || template_id == 9 || template_id == 10 || template_id == 11 || template_id == 13 || template_id == 17 || template_id == 18 || template_id == 19 || template_id == 20 || template_id == 21 || template_id == 22 || template_id == 23 || template_id == 24 || template_id == 26 || template_id == 27 || template_id == 28 || template_id == 29 || template_id == 30 || template_id == 31 || template_id == 32 || template_id == 34 || template_id == 35 || template_id == 36 || template_id == 38 || template_id == 39 || template_id == 40  || template_id == 41 || template_id == 43 || template_id == 44 || template_id == 46 || template_id == 47 || template_id == 48 || this.$store.getters.xt_user.template_info.org_id == 9555 || template_id == 53 || template_id == 54 || template_id == 56 || template_id == 60 || template_id == 65 || this.$store.getters.xt_user.template_info.org_id == 10340  || this.$store.getters.xt_user.template_info.org_id == 10432 || this.$store.getters.xt_user.template_info.org_id == 10445 || this.$store.getters.xt_user.template_info.org_id == 10410 || this.$store.getters.xt_user.template_info.org_id == 10485 || this.$store.getters.xt_user.template_info.org_id == 10375 || this.$store.getters.xt_user.template_info.org_id == 10480 || this.$store.getters.xt_user.template_info.org_id == 10599 || this.$store.getters.xt_user.template_info.org_id == 10597  || this.$store.getters.xt_user.template_info.org_id == 10612  || this.$store.getters.xt_user.template_info.org_id == 10617  || this.$store.getters.xt_user.template_info.org_id == 10580  || this.$store.getters.xt_user.template_info.org_id == 10629 || this.$store.getters.xt_user.template_info.org_id == 10677  || this.$store.getters.xt_user.template_info.org_id == 10667 || this.$store.getters.xt_user.template_info.org_id == 10702 || this.$store.getters.xt_user.template_info.org_id == 10697 || this.$store.getters.xt_user.template_info.org_id == 10635  || this.$store.getters.xt_user.template_info.org_id == 10702) &&this.$store.getters.xt_user.template_info.org_id!=10387 &&this.$store.getters.xt_user.template_info.org_id!=10471 " width="76px" > 超滤量(ml)</th>
           <th v-if=" isShow('超滤量') && (template_id != 6 && template_id != 9 && template_id != 10 && template_id != 11 && template_id != 13 && template_id != 17 && template_id != 18 && template_id != 19 && template_id != 20 && template_id != 21 && template_id != 22 && template_id != 23 && template_id != 24 && template_id != 26 && template_id !=27 && template_id!=28 && template_id!=29 && template_id!=30 && template_id!=31 && template_id!=32 && template_id!=34 && template_id!=35 && template_id!=36 && template_id!=38 && template_id != 39 && template_id != 40  && template_id != 41 && template_id != 43 && template_id != 44 && template_id != 46  && template_id != 47 && template_id != 48 && template_id != 53  && template_id != 54  && template_id != 56  && template_id != 60 && template_id != 65 && this.$store.getters.xt_user.template_info.org_id != 9555 &&  this.$store.getters.xt_user.template_info.org_id != 10340 && this.$store.getters.xt_user.template_info.org_id!=10432  && this.$store.getters.xt_user.template_info.org_id!=10445 && this.$store.getters.xt_user.template_info.org_id!=10410 && this.$store.getters.xt_user.template_info.org_id!=10485  && this.$store.getters.xt_user.template_info.org_id!=10375 && this.$store.getters.xt_user.template_info.org_id!=10480 && this.$store.getters.xt_user.template_info.org_id!=10599  && this.$store.getters.xt_user.template_info.org_id!=10597 && this.$store.getters.xt_user.template_info.org_id!=10612 && this.$store.getters.xt_user.template_info.org_id!=10617 && this.$store.getters.xt_user.template_info.org_id!=10580 && this.$store.getters.xt_user.template_info.org_id!=10629 && this.$store.getters.xt_user.template_info.org_id!=10679 && this.$store.getters.xt_user.template_info.org_id!=10667 && this.$store.getters.xt_user.template_info.org_id!=10702 && this.$store.getters.xt_user.template_info.org_id!=10697 && this.$store.getters.xt_user.template_info.org_id!=10635 && this.$store.getters.xt_user.template_info.org_id!=10702) || this.$store.getters.xt_user.template_info.org_id == 10387 ||  this.$store.getters.xt_user.template_info.org_id == 10471"  width="76px"> 超滤量(L) </th>
           <th v-if=" isShow('超滤量1')"  width="76px"> 超滤量(ml) </th>
-          <th v-if="isShow('超滤率') && (template_id ==6 || template_id == 65 || template_id == 10 || template_id == 11 || template_id == 12 || template_id == 13 || template_id == 17 || template_id == 18 || template_id == 19 || template_id == 20 || template_id == 21 || template_id == 22 || template_id == 23 || template_id == 24 || template_id == 26 || template_id == 29 || template_id == 30 || template_id == 31 || template_id == 34 || template_id == 35 || template_id == 38 || template_id == 41 || template_id == 43 || template_id == 44 || template_id == 46 || template_id == 47  || template_id == 48  || template_id == 53 || template_id == 54 || template_id == 56  || template_id == 60 || this.$store.getters.xt_user.template_info.org_id == 10432 || this.$store.getters.xt_user.template_info.org_id == 10445 || this.$store.getters.xt_user.template_info.org_id == 10410 || this.$store.getters.xt_user.template_info.org_id == 10485 || this.$store.getters.xt_user.template_info.org_id == 10375 || this.$store.getters.xt_user.template_info.org_id == 10480 || this.$store.getters.xt_user.template_info.org_id == 10597 || this.$store.getters.xt_user.template_info.org_id == 10599  || this.$store.getters.xt_user.template_info.org_id == 10612 || this.$store.getters.xt_user.template_info.org_id == 10617 || this.$store.getters.xt_user.template_info.org_id == 10580 || this.$store.getters.xt_user.template_info.org_id == 10629 || this.$store.getters.xt_user.template_info.org_id == 10677 || this.$store.getters.xt_user.template_info.org_id == 10667 || this.$store.getters.xt_user.template_info.org_id == 10693 || this.$store.getters.xt_user.template_info.org_id == 10702 || this.$store.getters.xt_user.template_info.org_id == 10697 || this.$store.getters.xt_user.template_info.org_id == 10635 || this.$store.getters.xt_user.template_info.org_id == 10702) && this.$store.getters.xt_user.template_info.org_id!=10387" width="50px"> 超滤率 <br />(ml/h) </th>
-          <th v-if="isShow('超滤率') && (template_id !=6 && template_id !=65 && template_id !=10 && template_id !=11 && template_id !=12 && template_id !=13 && template_id !=17 && template_id !=18 && template_id !=19 && template_id !=20 && template_id !=21 && template_id !=22 && template_id !=23 && template_id !=24 && template_id !=26 && template_id !=29 && template_id !=30 && template_id !=31 && template_id !=34 && template_id !=35 && template_id !=38  && template_id !=41 && template_id !=43 && template_id !=44 && template_id !=46 && template_id !=47 &&  template_id !=48 &&  template_id !=53 &&  template_id !=54 &&  template_id !=56 &&  template_id !=60 && this.$store.getters.xt_user.template_info.org_id!=10432  && this.$store.getters.xt_user.template_info.org_id!=10445 && this.$store.getters.xt_user.template_info.org_id!=10410 &&this.$store.getters.xt_user.template_info.org_id!=10485 &&this.$store.getters.xt_user.template_info.org_id!=10375 && this.$store.getters.xt_user.template_info.org_id!=10480 && this.$store.getters.xt_user.template_info.org_id!=10597 && this.$store.getters.xt_user.template_info.org_id!=10599 && this.$store.getters.xt_user.template_info.org_id!=10612 && this.$store.getters.xt_user.template_info.org_id!=10617 && this.$store.getters.xt_user.template_info.org_id!=10580 && this.$store.getters.xt_user.template_info.org_id!=10629 && this.$store.getters.xt_user.template_info.org_id!=10679 && this.$store.getters.xt_user.template_info.org_id!=10667 && this.$store.getters.xt_user.template_info.org_id!=10693 && this.$store.getters.xt_user.template_info.org_id!=10702 && this.$store.getters.xt_user.template_info.org_id!=10697 && this.$store.getters.xt_user.template_info.org_id!=10635 && this.$store.getters.xt_user.template_info.org_id!=10702 ) || this.$store.getters.xt_user.template_info.org_id==10387" width="50px"> 超滤率 <br />(L/h) </th>
+          <th v-if="isShow('超滤率') && (template_id ==6 || template_id == 65 || template_id == 10 || template_id == 11 || template_id == 12 || template_id == 13 || template_id == 17 || template_id == 18 || template_id == 19 || template_id == 20 || template_id == 21 || template_id == 22 || template_id == 23 || template_id == 24 || template_id == 26 || template_id == 29 || template_id == 30 || template_id == 31 || template_id == 34 || template_id == 35 || template_id == 38 || template_id == 41 || template_id == 43 || template_id == 44 || template_id == 46 || template_id == 47  || template_id == 48  || template_id == 53 || template_id == 54 || template_id == 56  || template_id == 60 || this.$store.getters.xt_user.template_info.org_id == 10432 || this.$store.getters.xt_user.template_info.org_id == 10445 || this.$store.getters.xt_user.template_info.org_id == 10410 || this.$store.getters.xt_user.template_info.org_id == 10485 || this.$store.getters.xt_user.template_info.org_id == 10375 || this.$store.getters.xt_user.template_info.org_id == 10480 || this.$store.getters.xt_user.template_info.org_id == 10597 || this.$store.getters.xt_user.template_info.org_id == 10599  || this.$store.getters.xt_user.template_info.org_id == 10612 || this.$store.getters.xt_user.template_info.org_id == 10617 || this.$store.getters.xt_user.template_info.org_id == 10580 || this.$store.getters.xt_user.template_info.org_id == 10629 || this.$store.getters.xt_user.template_info.org_id == 10677 || this.$store.getters.xt_user.template_info.org_id == 10667 || this.$store.getters.xt_user.template_info.org_id == 10693 || this.$store.getters.xt_user.template_info.org_id == 10702 || this.$store.getters.xt_user.template_info.org_id == 10697 || this.$store.getters.xt_user.template_info.org_id == 10635 || this.$store.getters.xt_user.template_info.org_id == 10702 || this.$store.getters.xt_user.template_info.org_id == 10721) && this.$store.getters.xt_user.template_info.org_id!=10387" width="50px"> 超滤率 <br />(ml/h) </th>
+          <th v-if="isShow('超滤率') && (template_id !=6 && template_id !=65 && template_id !=10 && template_id !=11 && template_id !=12 && template_id !=13 && template_id !=17 && template_id !=18 && template_id !=19 && template_id !=20 && template_id !=21 && template_id !=22 && template_id !=23 && template_id !=24 && template_id !=26 && template_id !=29 && template_id !=30 && template_id !=31 && template_id !=34 && template_id !=35 && template_id !=38  && template_id !=41 && template_id !=43 && template_id !=44 && template_id !=46 && template_id !=47 &&  template_id !=48 &&  template_id !=53 &&  template_id !=54 &&  template_id !=56 &&  template_id !=60 && this.$store.getters.xt_user.template_info.org_id!=10432  && this.$store.getters.xt_user.template_info.org_id!=10445 && this.$store.getters.xt_user.template_info.org_id!=10410 &&this.$store.getters.xt_user.template_info.org_id!=10485 &&this.$store.getters.xt_user.template_info.org_id!=10375 && this.$store.getters.xt_user.template_info.org_id!=10480 && this.$store.getters.xt_user.template_info.org_id!=10597 && this.$store.getters.xt_user.template_info.org_id!=10599 && this.$store.getters.xt_user.template_info.org_id!=10612 && this.$store.getters.xt_user.template_info.org_id!=10617 && this.$store.getters.xt_user.template_info.org_id!=10580 && this.$store.getters.xt_user.template_info.org_id!=10629 && this.$store.getters.xt_user.template_info.org_id!=10679 && this.$store.getters.xt_user.template_info.org_id!=10667 && this.$store.getters.xt_user.template_info.org_id!=10693 && this.$store.getters.xt_user.template_info.org_id!=10702 && this.$store.getters.xt_user.template_info.org_id!=10697 && this.$store.getters.xt_user.template_info.org_id!=10635 && this.$store.getters.xt_user.template_info.org_id!=10702 && this.$store.getters.xt_user.template_info.org_id!=10721 ) || this.$store.getters.xt_user.template_info.org_id==10387" width="50px"> 超滤率 <br />(L/h) </th>
           <th v-if="isShow('超滤率2')" width="92px">超滤率(ml/h)</th>
           <th v-if="isShow('钠浓度')" width="92px">钠浓度(mmol/L)</th>
           <th v-if="isShow('钠浓度1')" width="92px">钠浓度(mmol/L)</th>
           <th v-if="isShow('透析液温度')" width="92px">透析液温度(℃)</th>
           <th v-if="isShow('透析液温度1')" width="92px">透析液温度(℃)</th>
-          <th v-if=" isShow('置换率') && (template_id == 6 || template_id == 10 || template_id == 11 || template_id == 20 || template_id == 26 || template_id == 29 || template_id == 46  || template_id == 48 || template_id == 53  || template_id == 54 || template_id == 56 || org_id == 10432 || org_id == 10445 || org_id == 10410 || org_id ==10617 || org_id==10677 || org_id==10702) && org_id!=10558 && org_id!=10598 && org_id!=10414 " width="92px" > 置换率(ml/min) </th>
-          <th v-if=" isShow('置换率') && (template_id != 6 && template_id != 10 && template_id != 11 && template_id != 20 && template_id != 26 && template_id != 29 && template_id != 46 && template_id != 48 && template_id != 53 && template_id != 54 && template_id != 56 && org_id!=10432 && org_id!=10445 && org_id!=10410 && org_id!=10617  && org_id!=10677 && org_id !=10702) || org_id == 10558 || org_id ==10598 || org_id ==10414 " width="92px" > 置换率(L/h)  </th>
+          <th v-if=" isShow('置换率') && (template_id == 6 || template_id == 10 || template_id == 11 || template_id == 20 || template_id == 26 || template_id == 29 || template_id == 46  || template_id == 48 || template_id == 53  || template_id == 54 || template_id == 56 || org_id == 10432 || org_id == 10445 || org_id == 10410 || org_id ==10617 || org_id==10677 || org_id==10702 || org_id==10721) && org_id!=10558 && org_id!=10598 && org_id!=10414 " width="92px" > 置换率(ml/min) </th>
+          <th v-if=" isShow('置换率') && (template_id != 6 && template_id != 10 && template_id != 11 && template_id != 20 && template_id != 26 && template_id != 29 && template_id != 46 && template_id != 48 && template_id != 53 && template_id != 54 && template_id != 56 && org_id!=10432 && org_id!=10445 && org_id!=10410 && org_id!=10617  && org_id!=10677 && org_id !=10702 && org_id !=10721) || org_id == 10558 || org_id ==10598 || org_id ==10414 " width="92px" > 置换率(L/h)  </th>
           <th v-if=" isShow('置换率1')" width="92px" > 置换率(ml/min) </th>
           <th v-if=" isShow('置换量') && (template_id == 43)" width="92px"> 置换量(ml/h)  </th>
           <th v-if=" isShow('置换量') && ((template_id == 6 && org_id != 9919 && org_id !=10191 && org_id!=10478 && org_id!=10346 && org_id!=10517) || org_id == 9779 || template_id == 11 || template_id == 20 || template_id == 26 || template_id == 29 || template_id == 46 || template_id == 48 || template_id == 53 || template_id == 54 || template_id == 56 || this.$store.getters.xt_user.template_info.org_id == 10340 || this.$store.getters.xt_user.template_info.org_id == 10432  || this.$store.getters.xt_user.template_info.org_id == 10445 ) && org_id!=10558 && org_id!=10598  && org_id!=10414 && org_id!=10694 && org_id!=10697 && org_id!=10567 && org_id!=10644" width="92px"  > 置换量(ml)  </th>

src/xt_pages/dialysis/details/index.vue

@@ -2756,7 +2756,7 @@ export default {
           newArr.sort(this.compare('created_time'))
         }
 
-        if(this.org_id == 0 || this.org_id == 10579 || this.org_id ==10587 || this.org_id == 10679){
+        if(this.org_id == 0 || this.org_id == 10579 || this.org_id ==10587 || this.org_id == 10679 || this.org_id == 10702){
           if(newArr!=null && newArr.length>0){
             for(let i=0;i<newArr.length;i++){
               newArr[i].sort =0

src/xt_pages/dialysis/template/DialysisPrintOrderSix.vue

@@ -1439,6 +1439,7 @@
                      <span v-if="prescription.anticoagulant == 10">iu</span>
                      <span v-if="prescription.anticoagulant == 11">iu</span>
                      <span v-if="prescription.anticoagulant == 13">iu</span>
+                     <span v-if="prescription.anticoagulant == 15">mg</span>
                       <span v-if="prescription.anticoagulant == 4">mg</span>
                       <span v-if="prescription.anticoagulant == 3">iu</span>
                       <span v-if="org_id!=9538&& prescription.anticoagulant == 2">mg</span>
@@ -1463,6 +1464,7 @@
                      <span v-if="prescription.anticoagulant == 10">iu</span>
                      <span v-if="prescription.anticoagulant == 11">iu</span>
                      <span v-if="prescription.anticoagulant == 13">iu</span>
+                     <span v-if="prescription.anticoagulant == 15">mg</span>
                      <span v-if="prescription.anticoagulant == 14 || prescription.anticoagulant == 19">
                       <span v-if="org_id!=10644">mg</span>
                       <span v-if="org_id==10644">iu</span>
@@ -1514,6 +1516,7 @@
                             <span v-if="org_id==10644">iu/h</span>
                           </span>
                           <span v-if="prescription.anticoagulant == 17">U/h</span>
+                          <span v-if="prescription.anticoagulant == 15">mg/h</span>
                       </span>
                       <span v-if="org_id==9675 || org_id==10447 || org_id== 9829 || org_id == 10440 || org_id == 10469 || org_id == 10471 || org_id == 10460">
                         <span v-if="prescription.anticoagulant == 2">mg/h</span>
@@ -1532,6 +1535,7 @@
                             <span v-if="org_id==10644">iu/h</span>
                           </span>
                           <span v-if="prescription.anticoagulant == 17">U/h</span>
+                          <span v-if="prescription.anticoagulant == 15">mg/h</span>
                       </span>
                     </div>
                     <div
@@ -1596,6 +1600,7 @@
                       <span v-if="prescription.anticoagulant == 13">iu</span>
                       <span v-if="prescription.anticoagulant == 4">mg</span>
                       <span v-if="prescription.anticoagulant == 3">iu</span>
+                      <span v-if="prescription.anticoagulant == 15">mg</span>
 
                       <span v-if="org_id!=9538&& prescription.anticoagulant == 2">mg</span>
                       <span v-if="org_id==9538&& prescription.anticoagulant == 2">u</span>
@@ -1623,6 +1628,7 @@
                         <span v-if="org_id==10644">iu</span>
                       </span>
                       <span v-if="prescription.anticoagulant == 17">U</span>
+                      <span v-if="prescription.anticoagulant == 15">mg</span>
                     </span>
                     </div>
                     <div class="inline_block" style="margin-left: 20px" v-if="org_id!=9675 && org_id!=10447">

src/xt_pages/dialysis/template/DialysisPrintOrderSixtyFive.vue

@@ -3715,9 +3715,9 @@ export default {
         //    this.advice_groups.push(group)
         //   }
         // }
-        if (this.doctor_advices.length <= 6) {
-          var nl = 6;
-          this.print_length = 6;
+        if (this.doctor_advices.length <= 4) {
+          var nl = 4;
+          this.print_length = 4;
 
           for (let index = 0; index < nl; index++) {
             if (

src/xt_pages/dialysis/template/DialysisPrintOrderSixtyeight.vue

@@ -1067,8 +1067,9 @@
                      <span v-if="prescription.anticoagulant == 9">iu</span>
                      <span v-if="prescription.anticoagulant == 10">iu</span>
                      <span v-if="prescription.anticoagulant == 11">iu</span>
-                     <span v-if="prescription.anticoagulant == 13">iu</span>
-
+                     <span v-if="prescription.anticoagulant == 13||prescription.anticoagulant == 14">iu</span>
+                     <span v-if="prescription.anticoagulant == 15">mg</span>
+                     
                     </span>
                     </div>
                     <div class="inline_block" style="margin-left: 20px" v-if="prescription.anticoagulant != 1">
@@ -1096,7 +1097,8 @@
                           <span v-if="prescription.anticoagulant == 9">iu/h</span>
                           <span v-if="prescription.anticoagulant == 10">iu/h</span>
                           <span v-if="prescription.anticoagulant == 11">iu/h</span>
-                          <span v-if="prescription.anticoagulant == 13">iu/h</span>
+                          <span v-if="prescription.anticoagulant == 13 || prescription.anticoagulant == 14">iu/h</span>
+                          <span v-if="prescription.anticoagulant == 15">mg/h</span>
                       </span>
                     </div>
                     <div
@@ -1162,7 +1164,8 @@
                        <span v-if="prescription.anticoagulant == 9">iu</span>
                        <span v-if="prescription.anticoagulant == 10">iu</span>
                       <span v-if="prescription.anticoagulant == 11">iu</span>
-                      <span v-if="prescription.anticoagulant == 13">iu</span>
+                      <span v-if="prescription.anticoagulant == 13 || prescription.anticoagulant == 14">iu</span>
+                      <span v-if="prescription.anticoagulant == 15">mg</span>
                     </span>
                     </div>
                     <div class="inline_block" style="margin-left: 20px">

src/xt_pages/dialysis/template/DialysisPrintOrdereightyone.vue

@@ -411,7 +411,7 @@
                             : "/"
                         }}
                       </div>
-                      ml
+                      L
                     </div>
                   </div>
 

src/xt_pages/outpatientCharges/outpatientChargesManagement.vue

@@ -57,10 +57,14 @@
                     :header-cell-style="{backgroundColor: 'rgb(245, 247, 250)',color: '#606266'}"
                     highlight-current-row ref="tab"
                     @current-change="handleCurrentChange">
-            <el-table-column align="center" prop="name" label="姓名" wdith='89'>
-              <template slot-scope="scope">{{ scope.$index + 1 }}.{{ scope.row.name }}</template>
+            <el-table-column prop="name" label="姓名" wdith='110'>
+              <template slot-scope="scope">
+                <span>{{ scope.$index + 1 }}.{{ scope.row.name }}</span>
+                <span class="futou" v-if="scope.row.patient_type==4">腹</span>
+                <!-- v-if="scope.row.patient_type==4" -->
+              </template>
             </el-table-column>
-            <el-table-column align="center" prop="name" label="就诊号" width="110">
+            <el-table-column align="center" prop="name" label="就诊号" width="89">
               <template slot-scope="scope">{{ scope.row.number ? scope.row.number : '' }}
               </template>
             </el-table-column>
@@ -4793,7 +4797,8 @@ export default {
                     order_number: '',
                     his_patient_id: 0,
                     prescription: response.data.data.list[i].prescription,
-                    first_letter:response.data.data.list[i].first_letter
+                    first_letter:response.data.data.list[i].first_letter,
+                    patient_type:response.data.data.list[i].patient_type
                   }
 
                   this.all_table_data.push(obj)
@@ -4812,7 +4817,8 @@ export default {
                         order_number: response.data.data.list[i].his_patient[0].orders[b].order_number,
                         order_id: response.data.data.list[i].his_patient[0].orders[b].id,
                         prescription: response.data.data.list[i].prescription,
-                        first_letter:response.data.data.list[i].first_letter
+                        first_letter:response.data.data.list[i].first_letter,
+                        patient_type:response.data.data.list[i].patient_type
 
                       }
                       this.all_table_data.push(obj)
@@ -4828,7 +4834,8 @@ export default {
                       order_number: '',
                       order_id: 0,
                       prescription: response.data.data.list[i].prescription,
-                      first_letter:response.data.data.list[i].first_letter
+                      first_letter:response.data.data.list[i].first_letter,
+                      patient_type:response.data.data.list[i].patient_type
                     }
                     this.all_table_data.push(obj)
 
@@ -4847,7 +4854,8 @@ export default {
                         order_number: '',
                         order_id: 0,
                         prescription: response.data.data.list[i].prescription,
-                        first_letter:response.data.data.list[i].first_letter
+                        first_letter:response.data.data.list[i].first_letter,
+                        patient_type:response.data.data.list[i].patient_type
                       }
                       this.all_table_data.push(obj)
                     } else {
@@ -4862,7 +4870,8 @@ export default {
                           order_number: response.data.data.list[i].his_patient[b].orders[c].number,
                           order_id: response.data.data.list[i].his_patient[b].orders[c].id,
                           prescription: response.data.data.list[i].prescription,
-                          first_letter:response.data.data.list[i].first_letter
+                          first_letter:response.data.data.list[i].first_letter,
+                          patient_type:response.data.data.list[i].patient_type
                         }
                         this.all_table_data.push(obj)
                       }
@@ -5043,7 +5052,7 @@ export default {
           let one_count = 0
           let two_count = 0
           let three_count = 0
-          console.log('vvvvvvvvvvvvv',response.data.data);
+          console.log('vvvvvvvvvvvvv1211',response.data.data);
           for (let i = 0; i < response.data.data.list.length; i++) {
             if (response.data.data.list[i].his_patient.length == 0) { //没挂号
               if (response.data.data.list[i].prescription.length > 0) {
@@ -5056,8 +5065,8 @@ export default {
                   his_patient_id: 0,
                   prescription: response.data.data.list[i].prescription,
                   schedle: response.data.data.list[i].schedule,
-                  first_letter:response.data.data.list[i].first_letter
-
+                  first_letter:response.data.data.list[i].first_letter,
+                  patient_type:response.data.data.list[i].patient_type
                 }
 
                 this.all_table_data.push(obj)
@@ -5077,8 +5086,8 @@ export default {
                       order_id: response.data.data.list[i].his_patient[0].orders[b].id,
                       prescription: response.data.data.list[i].prescription,
                       schedle: response.data.data.list[i].schedule,
-                      first_letter:response.data.data.list[i].first_letter
-
+                      first_letter:response.data.data.list[i].first_letter,
+                      patient_type:response.data.data.list[i].patient_type
                     }
                     this.all_table_data.push(obj)
 
@@ -5094,8 +5103,8 @@ export default {
                     order_id: 0,
                     prescription: response.data.data.list[i].prescription,
                     schedle: response.data.data.list[i].schedule,
-                    first_letter:response.data.data.list[i].first_letter
-
+                    first_letter:response.data.data.list[i].first_letter,
+                    patient_type:response.data.data.list[i].patient_type
                   }
                   this.all_table_data.push(obj)
 
@@ -5115,7 +5124,8 @@ export default {
                       order_id: 0,
                       prescription: response.data.data.list[i].prescription,
                       schedle: response.data.data.list[i].schedule,
-                      first_letter:response.data.data.list[i].first_letter
+                      first_letter:response.data.data.list[i].first_letter,
+                      patient_type:response.data.data.list[i].patient_type
                     }
                     this.all_table_data.push(obj)
                   } else {
@@ -5131,7 +5141,8 @@ export default {
                         order_id: response.data.data.list[i].his_patient[b].orders[c].id,
                         prescription: response.data.data.list[i].prescription,
                         schedle: response.data.data.list[i].schedule,
-                        first_letter:response.data.data.list[i].first_letter
+                        first_letter:response.data.data.list[i].first_letter,
+                        patient_type:response.data.data.list[i].patient_type
 
                       }
                       this.all_table_data.push(obj)
@@ -6739,6 +6750,17 @@ li {
 
 }
 }
+.futou{
+  display: inline-block;
+  width: 20px;
+  height: 20px;
+  border-radius: 50px;
+  background: #38d7d7;
+  color: white;
+  text-align: center;
+  position: absolute;
+  right: 5px;
+}
 </style>
 
 <style lang="scss">

src/xt_pages/outpatientCharges/summary.vue

@@ -192,9 +192,11 @@
         <el-table-column align="center" width="60" 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>-->
+        <el-table-column align="center" prop="name" label="患者类型">
+          <template slot-scope="scope">
+            {{ getpatient(scope.row.patient.patient_type) }}
+          </template>
+        </el-table-column>
 
         <el-table-column align="center" width="80" prop="name" label="应收金额">
           <template slot-scope="scope">{{
@@ -716,6 +718,9 @@ export default {
       settlementObj: {},
       accounts_click_vi:false,
       org_id:'',
+      patienttypeArr:[{value:1,label:'血透患者'},{value:2,label:'慢病患者'},{value:3,label:'会员患者'},
+                        {value:4,label:'腹透患者'},{value:5,label:'CKD患者'},{value:6,label:'其他患者'}
+      ]
     }
   },
 
@@ -762,6 +767,19 @@ export default {
   },
 
   methods: {
+    // 患者类型
+    getpatient(id){
+      const options = this.patienttypeArr
+      if(id !=0&&id!=''){
+        for(let i in options){
+          if(id == options[i].value){
+            return options[i].label
+          }
+        }
+      }else{
+        return ''
+      }
+    },
     query(){
       this.getHisOrderList()
     },

src/xt_pages/outpatientDoctorStation/doctorDesk.vue

@@ -58,7 +58,11 @@
                     ref="tab"
           >
             <el-table-column prop="name" label="姓名" width='89'>
-              <template slot-scope="scope">{{ scope.row.name }}</template>
+              <template slot-scope="scope">
+                <span>{{ scope.row.name }}</span>
+                <span class="futou" v-if="scope.row.patient_type==4">腹</span>
+                <!--  v-if="scope.row.patient_type==1" -->
+              </template>
             </el-table-column>
             <el-table-column prop="name" label="就诊号" width="110">
               <template slot-scope="scope">{{ scope.row.number ? scope.row.number : '' }}
@@ -74,7 +78,10 @@
                     ref="tab"
           >
             <el-table-column prop="name" label="姓名" width='89'>
-              <template slot-scope="scope">{{ scope.row.name }}</template>
+              <template slot-scope="scope">
+                <span>{{ scope.row.name }}</span>
+                <span class="futou" v-if="scope.row.patient_type==4">腹</span>
+              </template>
             </el-table-column>
             <el-table-column prop="name" label="就诊号" width="110">
               <template slot-scope="scope">{{ scope.row.number ? scope.row.number : '' }}
@@ -90,7 +97,10 @@
                     ref="tab"
           >
             <el-table-column prop="name" label="姓名" width='89'>
-              <template slot-scope="scope">{{ scope.row.name }}</template>
+              <template slot-scope="scope">
+                <span>{{ scope.row.name }}</span>
+                <span class="futou" v-if="scope.row.patient_type==4">腹</span>
+              </template>
             </el-table-column>
             <el-table-column prop="name" label="就诊号" width="110">
               <template slot-scope="scope">{{ scope.row.number ? scope.row.number : '' }}
@@ -934,6 +944,8 @@ export default {
           return false
         } else {
           //挂号
+          console.log('response.data.data',response.data.data);
+          
           for (let i = 0; i < response.data.data.list.length; i++) {
             for (let b = 0; b < response.data.data.list[i].his_patient.length; b++) {
               //未就诊
@@ -942,7 +954,8 @@ export default {
                   name: response.data.data.list[i].his_patient[b].name,
                   number: response.data.data.list[i].his_patient[b].number,
                   id: response.data.data.list[i].id,
-                  his_patient_id: response.data.data.list[i].his_patient[b].id
+                  his_patient_id: response.data.data.list[i].his_patient[b].id,
+                  // patient_type:
                 }
                 this.un_cure_data.push(obj)
               }
@@ -1157,7 +1170,8 @@ export default {
                   number: response.data.data.list[i].his_patient[b].number,
                   id: response.data.data.list[i].id,
                   his_patient_id: response.data.data.list[i].his_patient[b].id,
-                  first_letter: response.data.data.list[i].first_letter
+                  first_letter: response.data.data.list[i].first_letter,
+                  patient_type: response.data.data.list[i].patient_type
                 }
                 this.un_cure_data.push(obj)
                 console.log('vvvvv', this.un_cure_data)
@@ -1169,7 +1183,8 @@ export default {
                   number: response.data.data.list[i].his_patient[b].number,
                   id: response.data.data.list[i].id,
                   his_patient_id: response.data.data.list[i].his_patient[b].id,
-                  first_letter: response.data.data.list[i].first_letter
+                  first_letter: response.data.data.list[i].first_letter,
+                  patient_type: response.data.data.list[i].patient_type
                 }
                 this.cure_data.push(obj)
               }
@@ -1187,7 +1202,8 @@ export default {
                 number: response.data.data.list_two[i].his_patient.number,
                 id: response.data.data.list_two[i].id,
                 his_patient_id: response.data.data.list_two[i].his_patient.id,
-                first_letter: response.data.data.list_two[i].first_letter
+                first_letter: response.data.data.list_two[i].first_letter,
+                patient_type: response.data.data.list_two[i].patient_type
               }
               this.un_cure_data.push(obj)
               // console.log('aaaaa',this.un_cure_data);
@@ -1200,7 +1216,8 @@ export default {
                 number: response.data.data.list_two[i].his_patient.number,
                 id: response.data.data.list_two[i].id,
                 his_patient_id: response.data.data.list_two[i].his_patient.id,
-                first_letter: response.data.data.list_two[i].first_letter
+                first_letter: response.data.data.list_two[i].first_letter,
+                patient_type: response.data.data.list_two[i].patient_type
               }
               this.cure_data.push(obj)
             }
@@ -1787,7 +1804,7 @@ export default {
           this.$message.error(response.data.msg)
           return false
         } else {
-          console.log('getSchedulePatientList', response.data.data.list_two)
+          console.log('getSchedulePatientList', response.data.data)
           //排班
           for (let i = 0; i < response.data.data.list_two.length; i++) {
             //未就诊
@@ -1797,7 +1814,8 @@ export default {
                 number: response.data.data.list_two[i].his_patient.number,
                 id: response.data.data.list_two[i].id,
                 his_patient_id: response.data.data.list_two[i].his_patient.id,
-                first_letter: response.data.data.list_two[i].first_letter
+                first_letter: response.data.data.list_two[i].first_letter,
+                patient_type: response.data.data.list_two[i].patient_type
               }
               // console.log('6666',obj);
               this.un_cure_data.push(obj)
@@ -1810,7 +1828,8 @@ export default {
                 number: response.data.data.list_two[i].his_patient.number,
                 id: response.data.data.list_two[i].id,
                 his_patient_id: response.data.data.list_two[i].his_patient.id,
-                first_letter: response.data.data.list_two[i].first_letter
+                first_letter: response.data.data.list_two[i].first_letter,
+                patient_type: response.data.data.list_two[i].patient_type
               }
               this.cure_data.push(obj)
             }
@@ -1826,7 +1845,8 @@ export default {
                   number: response.data.data.list[i].his_patient[b].number,
                   id: response.data.data.list[i].id,
                   his_patient_id: response.data.data.list[i].his_patient[b].id,
-                  first_letter: response.data.data.list[i].first_letter
+                  first_letter: response.data.data.list[i].first_letter,
+                  patient_type: response.data.data.list[i].patient_type
                 }
                 // console.log('8888',obj);
                 this.un_cure_data.push(obj)
@@ -1838,7 +1858,8 @@ export default {
                   number: response.data.data.list[i].his_patient[b].number,
                   id: response.data.data.list[i].id,
                   his_patient_id: response.data.data.list[i].his_patient[b].id,
-                  first_letter: response.data.data.list[i].first_letter
+                  first_letter: response.data.data.list[i].first_letter,
+                  patient_type: response.data.data.list[i].patient_type
                 }
                 this.cure_data.push(obj)
               }
@@ -1861,7 +1882,8 @@ export default {
 
           this.all_data = this.all_data.concat(this.cure_data)
           this.all_data = this.all_data.concat(this.un_cure_data)
-
+          
+          
           this.cure_data_two = this.cure_data
           this.un_cure_data_two = this.un_cure_data
           this.all_data_two = this.all_data
@@ -1874,6 +1896,7 @@ export default {
             this.oldCurrentRow = this.un_cure_data[0]
             this.getPatientInfo(this.un_cure_data[0])
           }
+          console.log('1111111this.all_data',this.cure_data);
         }
       })
     },
@@ -6541,6 +6564,17 @@ p {
   display: flex;
   justify-content: space-between;
 }
+.futou{
+  display: inline-block;
+  width: 20px;
+  height: 20px;
+  border-radius: 50px;
+  background: #38d7d7;
+  color: white;
+  text-align: center;
+  position: absolute;
+  right: 5px;
+}
 </style>
 
 <style lang="scss">

src/xt_pages/outpatientTool/components/newSettlePrint.vue

@@ -30,7 +30,7 @@ import axios from 'axios'
 import { getAllDoctorList, getAllHisPatientList } from '@/api/project/project'
 import { getPrivateExpenses, getPrivateExpensesOrder, getPrivateExpensesTwo } from '@/api/his/his'
 import Print9919 from './print9919.vue'
-import printJS from "print-js";
+import print from "print-js";
 export default {
   name: 'dialysisPrintOrder',
   components: {

src/xt_pages/stock/detail/stockOutDetail.vue

@@ -15,7 +15,7 @@
       type="primary"
       v-if="orgId !=10480"
       >明细导出
-     
+
     </el-button>
     <el-button
       style="float: right;margin-right:10px"
@@ -24,7 +24,7 @@
       type="primary"
       v-if="orgId ==10480"
       >明细导出
-     
+
     </el-button>
      <el-button
       style="float: right;margin-right:10px"
@@ -142,7 +142,7 @@
             {{ getManufactuerName(scope.row.manufacturer) }}
           </template>
         </el-table-column>
-<!-- 
+<!--
         <el-table-column label="进销商" align="center">
             <template slot-scope="scope">
               {{ getDealerName(scope.row.dealer) }}
@@ -189,13 +189,13 @@
             <span v-if="scope.row.is_total == 0">
               <span v-if="orgId!=9583">{{ scope.row.count }}</span>
               <span v-if="orgId ==9583">{{getStockCount(scope.row.good_id) }}</span>
-            </span> 
+            </span>
             <span v-if="scope.row.is_total == 1">
               {{scope.row.count}}
             </span>
           </template>
         </el-table-column>
-      
+
         <el-table-column label="总价" align="center">
           <template slot-scope="scope">
             <span v-if="scope.row.is_total == 0 && scope.row.price > 0">{{getTotal(scope.row.price, scope.row.count)}}</span>
@@ -265,7 +265,7 @@ export default {
     this.fetchAllAdminUsers();
     this.goodUnit = this.$store.getters.good_unit
     var org_id = this.$store.getters.xt_user.org.id
-   
+
     this.orgId = org_id
 
 
@@ -388,7 +388,7 @@ export default {
           this.wareOutList =  response.data.data.list
           this.patientsList = []
           this.patientsList = response.data.data.patientsList
-         
+
           var total = 0
           var objOne = {
             warehouse_out_order_number: "合计",
@@ -408,7 +408,7 @@ export default {
             this.cancelStockDate.push(obj);
             objOne.count += response.data.data.list[i].count
           }
-       
+
           this.cancelStockDate.push(objOne);
 
         }
@@ -479,7 +479,7 @@ export default {
             }
             objOne.count +=response.data.data.list[i].count
             obj["is_total"] = 0;
-            
+
             this.cancelStockDate.push(obj);
           }
 
@@ -602,14 +602,14 @@ export default {
      },
      getDealerNameOne(id){
        var dealer_name = ""
-     
+
        for(let i=0;i<this.dealerList.length;i++){
           if(id == this.dealerList[i].id){
               dealer_name = this.dealerList[i].dealer_name
           }
        }
        return dealer_name
-     }, 
+     },
     getManufactuerName: function(manufacturer_id) {
       for (let i = 0; i < this.manufacturer.length; i++) {
         if (this.manufacturer[i].id == manufacturer_id) {
@@ -755,7 +755,7 @@ export default {
     PrintAction: function() {
       window.sessionStorage.setItem('start',this.start_time)
       window.sessionStorage.setItem('end',this.end_time)
-     
+
       if(this.orgId != 9671){
         this.$router.push({
           path: "/stock/print",
@@ -782,7 +782,7 @@ export default {
           }
         });
       }
-    
+
     },
     // getPrintStockGood(){
     //   const params = {
@@ -887,7 +887,7 @@ export default {
       },
 
     exportList(){
-    
+
        for(let i=0;i<this.tableOut.length;i++){
         this.tableOut[i].index = i+1
         this.tableOut[i].good_name = this.tableOut[i].good_name
@@ -933,32 +933,32 @@ export default {
           this.tableOut[i].total_price = (this.getWarehouseOut(this.tableOut[i].good_id) * this.tableOut[i].retail_price).toFixed(2)
         }else if(this.orgId==10445){
           this.tableOut[i].total_price = (this.getStockCount(this.tableOut[i].good_id) * this.tableOut[i].retail_price).toFixed(2)
+        }else if(this.orgId==10635){
+           this.tableOut[i].total_price = (this.getWarehouseOut(this.tableOut[i].good_id) * this.tableOut[i].retail_price).toFixed(2)
         }else{
           this.tableOut[i].total_price = (this.getStockCount(this.tableOut[i].good_id) * this.tableOut[i].retail_price).toFixed(2)
         }
 
         if(this.orgId  == 10265 || this.orgId ==10215 || this.orgId == 9919 || this.orgId == 9671 || this.orgId == 10402 || this.orgId==10138 || this.orgId==10278||this.orgId==10537||this.orgId==10610||this.orgId==0){
-
-         this.tableOut[i].out_count = this.getMySelfCount(this.tableOut[i].good_id)
+            this.tableOut[i].out_count = this.getMySelfCount(this.tableOut[i].good_id)
         }
-        if(this.orgId == 10210 || this.orgId == 9675  || this.orgId == 9956 || this.orgId == 10217 || this.orgId == 10188 || this.orgId == 10191 || this.orgId == 0 || this.orgId ==10489 || this.orgId == 10375 || this.orgId == 10485 || this.org_id ==10635 || this.org_id ==10726 || this.org_id == 10724 || this.org_id ==10635 || this.org_id ==10724 || this.org_id ==10726 || this.org_id ==10721){
+        if(this.orgId == 10210 || this.orgId == 9675  || this.orgId == 9956 || this.orgId == 10217 || this.orgId == 10188 || this.orgId == 10191 || this.orgId == 0 || this.orgId ==10489 || this.orgId == 10375 || this.orgId == 10485 || this.orgId ==10635 || this.orgId ==10726 || this.orgId == 10724 || this.orgId ==10635 || this.orgId ==10724 || this.orgId ==10726 || this.orgId ==10721){
           this.tableOut[i].out_count = this.getWarehouseOut(this.tableOut[i].good_id)
-         
         }
         if(this.orgId ==10445){
           this.tableOut[i].out_count = this.getStockCount(this.tableOut[i].good_id)
         }
-        if(this.orgId!=10265 && this.orgId !=10215  && this.orgId != 9671 &&this.orgId!=10210&&this.orgId!=9675 && this.orgId!=9956&& this.orgId!=10217 && this.orgId!=10188 && this.orgId!=10191 && this.orgId!=9919 && this.orgId!=0&& this.orgId!=10402 && this.orgId != 10489 && this.orgId!=10375 && this.orgId!=10485&&this.orgId!=0&&this.orgId!=10138&&this.orgId!=10278&&this.orgId!=10537&&this.orgId!=10610 &&this.orgId!=10445 &&  this.org_id !=10635  &&  this.org_id !=10724 &&  this.org_id !=10726  &&  this.org_id !=10721){
+        if(this.orgId!=10265 && this.orgId !=10215  && this.orgId != 9671 &&this.orgId!=10210&&this.orgId!=9675 && this.orgId!=9956&& this.orgId!=10217 && this.orgId!=10188 && this.orgId!=10191 && this.orgId!=9919 && this.orgId!=0&& this.orgId!=10402 && this.orgId != 10489 && this.orgId!=10375 && this.orgId!=10485&&this.orgId!=0&&this.orgId!=10138&&this.orgId!=10278&&this.orgId!=10537&&this.orgId!=10610 &&this.orgId!=10445 &&  this.orgId !=10635  &&  this.orgId !=10724 &&  this.orgId !=10726  &&  this.orgId !=10721){
           this.tableOut[i].out_count = this.getStockCount(this.tableOut[i].good_id)
         }
         this.tableOut[i].manufacturer_name = this.getManufacturerNameOne(this.tableOut[i].manufacturer)
-       
+
         this.tableOut[i].dealer_name = this.getDealerNameOne(this.tableOut[i].dealer)
 
         this.tableOut[i].order_time = this.start_time + " ~ " + this.end_time
        }
        console.log("retusoossoso",this.tableOut)
-       
+
        import('@/vendor/Export2Excel').then(excel => {
        const tHeader = ['序号','耗材名称', '规格型号','生产厂商','进销商', '单位','数量','出货价','总价','出库时间','备注']
 
@@ -977,7 +977,7 @@ export default {
      },
      exportListDetail(){
         console.log("hahhdhafhhahdf",this.tableDataList)
-      
+
         var obj = {index:"合计",total_price:0}
         var total = 0
         for(let i=0;i<this.tableDataList.length;i++){
@@ -1007,7 +1007,7 @@ export default {
         }
         obj.total_price = total.toFixed(2)
         console.log("WOHHAHHAHAH",this.tableDataList)
-      
+
         this.tableDataList.push(obj)
        import('@/vendor/Export2Excel').then(excel => {
        const tHeader = ['序号','单据编号', '耗材类型', '耗材名称','规格型号','生产厂商','进销商','批号','生产日期','有效日期','操作时间','制单人','进货价','出货价','使用患者','数量','总价']
@@ -1049,7 +1049,7 @@ export default {
               this.tableDataList[i].ctimeTwo = this.getTimeOne(this.tableDataList[i].ctime)
               this.tableDataList[i].expiry_date = this.getTime(this.tableDataList[i].expiry_date)
               this.tableDataList[i].project_name ="居民报销"
-            
+
               out_total += this.tableDataList[i].count * this.tableDataList[i].price
               in_total += this.tableDataList[i].count *this.tableDataList[i].WarehousingInfoNight.price
 
@@ -1166,7 +1166,7 @@ export default {
       return total
     },
     getPatientName(id){
-     
+
       var name =""
       for(let i=0;i<this.patientsList.length;i++){
         if(id == this.patientsList[i].id){
@@ -1199,7 +1199,7 @@ export default {
 //   display: flex;
 //   flex-direction: column;
 //   .el-table__header-wrapper {
-//     height: 70px !important; 
+//     height: 70px !important;
 //   }
 // }
 </style>

src/xt_pages/user/components/PatientDetail.vue

@@ -393,6 +393,25 @@
               </el-form-item>
             </el-col>
 
+            <el-col :span="24" :style="isEdit ? 'width:600px' : ''">
+                <el-form-item
+                  label="患者类型 : "
+                  class="is-required"
+                  prop="source"
+                >
+                  <el-radio-group v-model="form.patient_type">
+                    <el-radio
+                      v-for="item in patientType"
+                      :key="item.value"
+                      :label="item.value"
+                      :value="item.value"
+                      >{{ item.label }}</el-radio
+                    >
+                  </el-radio-group>
+                </el-form-item>
+              </el-col>
+
+
             <el-col :span="8" :style="isEdit ? 'width:360px' : ''">
                 <el-form-item
                   label="患者去向 : "
@@ -1647,6 +1666,7 @@ const defaultForm = {
   allergic_history:"",
   print_date:"",
   famality_record:"",
+  patient_type:"",
 };
 
 export default {
@@ -1753,6 +1773,7 @@ export default {
       operators:[],
       liuAddresslist:[],
       patientVascularAccessOne:{},
+      patientType: [{ value: 1, label: "血透患者" }, { value: 2, label: "慢病患者" }, { value: 3, label: "会员患者" },{ value: 4, label: "腹透患者" },{ value: 5, label: "CKD患者" },{ value: 6, label: "其他患者" }],
     };
   },
   computed: {
@@ -2036,6 +2057,9 @@ export default {
             this.form.allergic_history = patietInfo.allergic_history
             this.form.infectious_remark = patietInfo.infectious_remark
             this.form.famality_record  = patietInfo.famality_record
+            if(patietInfo.patient_type >0){
+               this.form.patient_type = patietInfo.patient_type
+            }
             // this.form.initial = patietInfo.initial_dialysis + "";
             // this.form.dialysisTotal = patietInfo.total_dialysis + "";
             // this.form.assessment = patietInfo.evaluate;
@@ -2371,6 +2395,7 @@ export default {
             } else {
               this.patientPrint.hospital_first_dialysis_date = "";
             }
+          
             // this.checkIdCardNo();
           } else {
             console.log("patient get err state");

src/xt_pages/user/components/PatientForm.vue

@@ -437,6 +437,26 @@
                   </el-radio-group>
                 </el-form-item>
               </el-col>
+
+              <el-col :span="24" :style="isEdit ? 'width:600px' : ''">
+                <el-form-item
+                  label="患者类型 : "
+                  class="is-required"
+                  prop="source"
+                >
+                  <el-radio-group v-model="form.patient_type">
+                    <el-radio
+                      v-for="item in patientType"
+                      :key="item.value"
+                      :label="item.value"
+                      :value="item.value"
+                      >{{ item.label }}</el-radio
+                    >
+                  </el-radio-group>
+                </el-form-item>
+              </el-col>
+
+              
       
               <!-- <el-col :span="8" :style="isEdit ? 'width:360px' : ''">
                 <el-form-item
@@ -1166,7 +1186,7 @@ const defaultForm = {
   response_result: "",
   remind_cycle: 0,
   record_date: "",
-
+  patient_type:"1",
   tell_phone: "",
   first_treatment_date: "",
   dialysis_age: "",
@@ -1430,6 +1450,7 @@ export default {
       // typeOptions: null,
       // styleOptions: null,
       sourceOptions: [{ value: 1, label: "门诊" }, { value: 2, label: "住院" }, { value: 3, label: "门特" }],
+      patientType: [{ value: 1, label: "血透患者" }, { value: 2, label: "慢病患者" }, { value: 3, label: "会员患者" },{ value: 4, label: "腹透患者" },{ value: 5, label: "CKD患者" },{ value: 6, label: "其他患者" }],
       patientSourceList:[
         {value:1,label:"门诊"},
         {value:2,label:"住院"},
@@ -1711,6 +1732,10 @@ export default {
             }
             console.log("form---",this.form)
 
+            if(this.form.patient_type >0){
+               this.form.patient_type = parseInt(this.form.patient_type)
+            }
+
             editPatient(this.patientID, this.form)
 
               .then(response => {
@@ -1755,6 +1780,10 @@ export default {
             }
             console.log("form233322332w",this.form)
 
+            if(this.form.patient_type >0){
+               this.form.patient_type = parseInt(this.form.patient_type)
+            }
+
             createPatient(this.form)
               .then(response => {
                 if (response.data.state == 0) {
@@ -2113,7 +2142,9 @@ export default {
             this.form.patient_address = patietInfo.patient_address
             this.form.allergic_history = patietInfo.allergic_history
             this.form.infectious_remark = patietInfo.infectious_remark
-          
+            if(patietInfo.patient_type >0){
+              this.form.patient_type = patietInfo.patient_type
+            }
 
             // this.checkIdCardNo();
           } else {

src/xt_pages/user/patients.vue

@@ -452,6 +452,11 @@
             <span>{{ LapsetoInfo(scope.row) }}</span>
           </template>
         </el-table-column>
+        <el-table-column label="患者类型" align="center">
+          <template slot-scope="scope">
+            <span>{{ getpatient(scope.row.patient_type) }}</span>
+          </template>
+        </el-table-column>
         <el-table-column label="转出(死亡)时间" min-width="134" align="center">
           <template slot-scope="scope">
 <!--            <span>{{getTime(scope.row.death_time)}}</span>-->
@@ -929,7 +934,10 @@
         },
         adminUserOptions:[],
         scheduleList:[],
-        patientsList:[]
+        patientsList:[],
+        patienttypeArr:[{value:1,label:'血透患者'},{value:2,label:'慢病患者'},{value:3,label:'会员患者'},
+                        {value:4,label:'腹透患者'},{value:5,label:'CKD患者'},{value:6,label:'其他患者'}
+        ]
       }
     },
     created() {
@@ -953,6 +961,19 @@
     },
 
     methods: {
+      // 患者类型
+      getpatient(id){
+        const options = this.patienttypeArr
+        if(id !=0&&id!=''){
+          for(let i in options){
+            if(id == options[i].value){
+              return options[i].label
+            }
+          }
+        }else{
+          return ''
+        }
+      },
       getExportList(){
         getExportList(this.listQuery).then(response=>{
            if(response.data.state ==1){
@@ -1769,132 +1790,132 @@
         }
 
       },
-     toExport(){
-      import('@/vendor/Export2Excel').then(excel => {
+      toExport(){
+        import('@/vendor/Export2Excel').then(excel => {
 
-        console.log("hhhh323223",this.tableData)
-        for(let i=0;i<this.tableData.length;i++){
-          if(this.tableData[i].gender == 1){
-            this.tableData[i].genders = "男"
-          }
-          if(this.tableData[i].gender == 2){
-            this.tableData[i].genders = "女"
-          }
-          this.tableData[i].age_year = this.tranAge(this.tableData[i])
-          this.tableData[i].first_dialysis_date = this.getTime(this.tableData[i].first_dialysis_date)
-          if(this.tableData[i].lapseto == 0){
-            this.tableData[i].lapesetos = ""
-          }
-          if(this.tableData[i].lapseto == 1){
-            this.tableData[i].lapesetos = "留治"
-          }
-          if(this.tableData[i].lapseto == 2){
-            this.tableData[i].lapesetos = "转归"
-          }
-           if(this.tableData[i].source == 0){
-             this.tableData[i].sources = ""
-          }
-          if(this.tableData[i].source == 1){
-             this.tableData[i].sources = "门诊"
-          }
-           if(this.tableData[i].source == 2){
-             this.tableData[i].sources = "住院"
-          }
-         if(this.tableData[i].is_infectious == 0){
-             this.tableData[i].is_infectiouss = ""
-          }
-          if(this.tableData[i].is_infectious == 1){
-             this.tableData[i].is_infectiouss = "阴性"
-          }
-          if(this.tableData[i].is_infectious == 2){
-             this.tableData[i].is_infectiouss = "阳性"
+          console.log("hhhh323223",this.tableData)
+          for(let i=0;i<this.tableData.length;i++){
+            if(this.tableData[i].gender == 1){
+              this.tableData[i].genders = "男"
+            }
+            if(this.tableData[i].gender == 2){
+              this.tableData[i].genders = "女"
+            }
+            this.tableData[i].age_year = this.tranAge(this.tableData[i])
+            this.tableData[i].first_dialysis_date = this.getTime(this.tableData[i].first_dialysis_date)
+            if(this.tableData[i].lapseto == 0){
+              this.tableData[i].lapesetos = ""
+            }
+            if(this.tableData[i].lapseto == 1){
+              this.tableData[i].lapesetos = "留治"
+            }
+            if(this.tableData[i].lapseto == 2){
+              this.tableData[i].lapesetos = "转归"
+            }
+            if(this.tableData[i].source == 0){
+              this.tableData[i].sources = ""
+            }
+            if(this.tableData[i].source == 1){
+              this.tableData[i].sources = "门诊"
+            }
+            if(this.tableData[i].source == 2){
+              this.tableData[i].sources = "住院"
+            }
+          if(this.tableData[i].is_infectious == 0){
+              this.tableData[i].is_infectiouss = ""
+            }
+            if(this.tableData[i].is_infectious == 1){
+              this.tableData[i].is_infectiouss = "阴性"
+            }
+            if(this.tableData[i].is_infectious == 2){
+              this.tableData[i].is_infectiouss = "阳性"
+            }
+
+            this.tableData[i].ctime = this.getTime(this.tableData[i].created_time)
           }
 
-          this.tableData[i].ctime = this.getTime(this.tableData[i].created_time)
-        }
+          const tHeader = ['姓名', '性别', '身份证号码','年龄','透析号','首次治疗时间','本人电话','患者来源','治疗状态','传染病','家庭住址','工作单位',"登记时间","家属电话","上家透析医院"]
+          const filterVal = ['name', 'genders', 'id_card_no','age_year','dialysis_no','first_dialysis_date','phone','sources','lapesetos','is_infectiouss','home_address','work_unit','ctime','home_telephone','first_dialysis_hospital']
+          console.log("table",this.tableData)
 
-        const tHeader = ['姓名', '性别', '身份证号码','年龄','透析号','首次治疗时间','本人电话','患者来源','治疗状态','传染病','家庭住址','工作单位',"登记时间","家属电话","上家透析医院"]
-        const filterVal = ['name', 'genders', 'id_card_no','age_year','dialysis_no','first_dialysis_date','phone','sources','lapesetos','is_infectiouss','home_address','work_unit','ctime','home_telephone','first_dialysis_hospital']
-        console.log("table",this.tableData)
+          const data = this.formatJson(filterVal, this.tableData)
+          excel.export_json_to_excel({
+            header: tHeader,
+            data,
+            filename: '患者名单'
+          })
+          this.downloadLoading = false
+      })
+      },
+      formatJson(filterVal, jsonData) {
+        return jsonData.map(v => filterVal.map(j => v[j]));
+      },
 
-        const data = this.formatJson(filterVal, this.tableData)
-        excel.export_json_to_excel({
-          header: tHeader,
-          data,
-          filename: '患者名单'
-        })
-        this.downloadLoading = false
-     })
-    },
-    formatJson(filterVal, jsonData) {
-      return jsonData.map(v => filterVal.map(j => v[j]));
-    },
+      toExportOne(){
+        import('@/vendor/Export2Excel').then(excel => {
+
+          console.log("hhhh323223",this.scheduleList)
+          for(let i=0;i<this.scheduleList.length;i++){
+            this.scheduleList[i].name = ""
+            this.scheduleList[i].wort_unit = ""
+              this.scheduleList[i].name = this.GetPatientName(this.scheduleList[i].patient_id)
+              this.scheduleList[i].wort_unit = this.GetPatientWorkUnit(this.scheduleList[i].patient_id)
+          }
 
-    toExportOne(){
-      import('@/vendor/Export2Excel').then(excel => {
+          const tHeader = ['姓名', '工作单位']
+          const filterVal = ['name', 'wort_unit']
+          console.log("table",this.scheduleList)
 
-        console.log("hhhh323223",this.scheduleList)
-        for(let i=0;i<this.scheduleList.length;i++){
-          this.scheduleList[i].name = ""
-          this.scheduleList[i].wort_unit = ""
-            this.scheduleList[i].name = this.GetPatientName(this.scheduleList[i].patient_id)
-            this.scheduleList[i].wort_unit = this.GetPatientWorkUnit(this.scheduleList[i].patient_id)
+          const data = this.formatJson(filterVal, this.scheduleList)
+          excel.export_json_to_excel({
+            header: tHeader,
+            data,
+            filename: '今日透析记录'
+          })
+          this.downloadLoading = false
+      })
+      },
+      tranAge(val) {
+        if(val.birthday){
+          var birth = uParseTime(val.birthday, '{y}-{m}-{d}');
+          return jsGetAge(birth, '-');
         }
+      },
+      toOpen(id){
+        this.$router.push({path:"/patients/patient/"+id})
+        this.$router.push({path:'/patient/patient/'+id+'/lapsoSummary'})
+        // getPatientAllagic(id).then(response=>{
+        //   if(response.data.state == 1){
+        //     var list =  response.data.data.list
+        //     this.patieintDialogVisible=  true
+        //     this.patientAllgicList = list
+        //   }
+        // })
+      },
+      GetPatientName(id){
+        var name = ""
+        for(let i=0;i<this.patientsList.length;i++){
+            if(id == this.patientsList[i].id){
+              name = this.patientsList[i].name
+            }
+        }
+        return name
+      },
+      GetPatientWorkUnit(id){
+        console.log("HHAHAHAH",this.patientsList)
+        var work_unit =""
+        for(let i=0;i<this.patientsList.length;i++){
+            if(id == this.patientsList[i].id){
+              work_unit = this.patientsList[i].work_unit
+            }
+        }
+        return work_unit
+      },
+      toJiaoBen(){
+        getPatientLapeso().then(response=>{
 
-        const tHeader = ['姓名', '工作单位']
-        const filterVal = ['name', 'wort_unit']
-        console.log("table",this.scheduleList)
-
-        const data = this.formatJson(filterVal, this.scheduleList)
-        excel.export_json_to_excel({
-          header: tHeader,
-          data,
-          filename: '今日透析记录'
         })
-        this.downloadLoading = false
-     })
-    },
-    tranAge(val) {
-      if(val.birthday){
-        var birth = uParseTime(val.birthday, '{y}-{m}-{d}');
-        return jsGetAge(birth, '-');
       }
-    },
-    toOpen(id){
-      this.$router.push({path:"/patients/patient/"+id})
-      this.$router.push({path:'/patient/patient/'+id+'/lapsoSummary'})
-      // getPatientAllagic(id).then(response=>{
-      //   if(response.data.state == 1){
-      //     var list =  response.data.data.list
-      //     this.patieintDialogVisible=  true
-      //     this.patientAllgicList = list
-      //   }
-      // })
-    },
-    GetPatientName(id){
-       var name = ""
-       for(let i=0;i<this.patientsList.length;i++){
-          if(id == this.patientsList[i].id){
-             name = this.patientsList[i].name
-          }
-       }
-       return name
-    },
-    GetPatientWorkUnit(id){
-      console.log("HHAHAHAH",this.patientsList)
-      var work_unit =""
-      for(let i=0;i<this.patientsList.length;i++){
-          if(id == this.patientsList[i].id){
-            work_unit = this.patientsList[i].work_unit
-          }
-       }
-       return work_unit
-    },
-    toJiaoBen(){
-      getPatientLapeso().then(response=>{
-
-      })
-    }
    
 
     }

src/xt_permission.js

@@ -12,19 +12,19 @@ const permissionWhiteList = loginWhiteList.concat(['/']) // 权限验证白名
 
 router.beforeEach((to, from, next) => {
   // 线上注释
-  if (!store.getters.configlist || store.getters.configlist === undefined || store.getters.configlist.length <= 0) {
-    store.dispatch('VerifyConfigList', []).then(() => {
-      next()
-    })
-  }
-  if (store.getters.permission_routers === undefined) {
-    store.dispatch('xt_GenerateRoutes', []).then(() => {
-      next()
-    })
-  } else {
-    next()
-  }
-  return
+  // if (!store.getters.configlist || store.getters.configlist === undefined || store.getters.configlist.length <= 0) {
+  //   store.dispatch('VerifyConfigList', []).then(() => {
+  //     next()
+  //   })
+  // }
+  // if (store.getters.permission_routers === undefined) {
+  //   store.dispatch('xt_GenerateRoutes', []).then(() => {
+  //     next()
+  //   })
+  // } else {
+  //   next()
+  // }
+  // return
   // 线上注释
   NProgress.start()
   // console.log(store.getters.current_role_urls.indexOf(to.path))