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

@@ -87,7 +87,7 @@
                 {{ record.device_zone.name}}
               </div>
             </div>
-            <div class="inline_block" v-if="org_id!=10510 && org_id!=10460">
+            <div class="inline_block" v-if="org_id!=10510 && org_id!=10460 && org_id!=10624">
               床号：
               <div class="under_line" style="width: 50px; text-align: center">
                 {{ record.device_number.number }}
@@ -99,7 +99,7 @@
                 {{ record.patient.dialysis_no }}
               </div>
             </div>
-            <div class="inline_block" style="margin-left: 5px" v-if="org_id!=10460">
+            <div class="inline_block" style="margin-left: 5px" v-if="org_id!=10460 && org_id!=10624">
               住院号/门诊号：
               <div
                 class="under_line"
@@ -129,7 +129,7 @@
                 {{ item.name }}
               </div>
             </div>
-            <div class="inline_block" style="margin-left: 10px" v-if="org_id!=10460">
+            <div class="inline_block" style="margin-left: 10px" v-if="org_id!=10460 && org_id!=10624">
               诊断：
               <div
                 class="under_line"
@@ -928,7 +928,7 @@
                       style="padding: 2px 0; line-height: 23px; display: flex"
                     >
                       <div class="inline_block" style="flex: 1"
-                        v-if="org_id!=10440 && org_id!=0  && org_id!=10469 && org_id!=10490 && org_id!=10478 && org_id!=10495 && org_id!=10510 && org_id!=10460 && org_id!=10585 && org_id!=10567">
+                        v-if="org_id!=10440 && org_id!=0  && org_id!=10469 && org_id!=10490 && org_id!=10478 && org_id!=10495 && org_id!=10510 && org_id!=10460 && org_id!=10585 && org_id!=10567 && org_id!=10624">
                         上次透后体重：
                         <div
                           class="under_line"
@@ -954,7 +954,7 @@
                       </div>
 
                       <div class="inline_block" style="flex: 1"
-                        v-if="(org_id==10440 ||  org_id ==0 || org_id==10469 || org_id==10490 || org_id==10478  || org_id==10495 || org_id == 10460)&& org_id!=10510">
+                        v-if="(org_id==10440 ||  org_id ==0 || org_id==10469 || org_id==10490 || org_id==10478  || org_id==10495 || org_id == 10460 || org_id ==10624)&& org_id!=10510">
                         上次透后体重：
                         <div
                           class="under_line"
@@ -1013,8 +1013,8 @@
                               : "/"
                           }}
                         </div>
-                         <span v-if="org_id == 10395 || org_id == 9829 || org_id == 10440 || org_id == 10469 || org_id == 10471 || org_id==10460">ml</span> 
-                         <span v-if="org_id!=10395&&org_id!=9829 && org_id!=10440 && org_id!=10469  && org_id!=10471 && org_id!=10460">L</span>
+                         <span v-if="org_id == 10395 || org_id == 9829 || org_id == 10440 || org_id == 10469 || org_id == 10471 || org_id==10460 || org_id ==10624">ml</span> 
+                         <span v-if="org_id!=10395&&org_id!=9829 && org_id!=10440 && org_id!=10469  && org_id!=10471 && org_id!=10460 && org_id!=10624">L</span>
                       </div>
 
                       <div class="inline_block" style="flex: 1" v-if="org_id == 10469">
@@ -1445,7 +1445,8 @@
                               org_id == 9538 ||
                               org_id == 9675 ||
                               org_id == 9671 ||
-                              org_id ==10600
+                              org_id ==10600 ||
+                              org_id ==10629
                             "
                           >
                             KT/V
@@ -1676,7 +1677,8 @@
                               org_id == 9538 ||
                               org_id == 9675 ||
                               org_id == 9671 ||
-                              org_id == 10600
+                              org_id == 10600 ||
+                              org_id ==10629
                             "
                           >
                             {{ monitor_record.ktv }}
@@ -2401,7 +2403,7 @@
                   {{ "/" }}
                 </div>
               </div>
-              <div class="inline_block" v-if="org_id!=10460">
+              <div class="inline_block" v-if="org_id!=10460 && org_id!=10624">
                 床号：
                 <div class="under_line" style="width: 50px; text-align: center">
                   {{ "/" }}
@@ -2413,7 +2415,7 @@
                   {{ record.patient.dialysis_no }}
                 </div>
               </div>
-              <div class="inline_block" style="margin-left: 5px" v-if="org_id!=10460">
+              <div class="inline_block" style="margin-left: 5px" v-if="org_id!=10460 && org_id!=10624">
                 住院号/门诊号：
                 <div
                   class="under_line"
@@ -2445,7 +2447,7 @@
                   {{ item.name }}
                 </div>
               </div>
-              <div class="inline_block" style="margin-left: 10px" v-if="org_id!=10460">
+              <div class="inline_block" style="margin-left: 10px" v-if="org_id!=10460 && org_id!=10624">
                 诊断：
                 <div
                   class="under_line"
@@ -3401,6 +3403,7 @@ import { jsGetAge, uParseTime } from "@/utils/tools";
 import { getDataConfig } from "@/utils/data";
 import BreadCrumb from "@/xt_pages/components/bread-crumb";
 import print from "print-js";
+import org from "../../../router/modules/org";
 export default {
   name: "BatchPrintOrderSix",
   components: {

src/xt_pages/dialysis/details/consumable/dialysisParameter.vue

@@ -155,22 +155,35 @@
         </el-table-column>
          <el-table-column align="center" label="目标脱水量"  v-if="dialysisSett.ultrafiltration_volume==1">
            <template slot-scope="scope">
-             <span v-if="scope.row.dialysis_solution.target_ultrafiltration>0">{{scope.row.dialysis_solution.target_ultrafiltration}}</span>
+             <span v-if="scope.row.dialysis_prescription.target_ultrafiltration==0">{{scope.row.dialysis_solution.target_ultrafiltration}}</span>
+
+             <span v-if="scope.row.dialysis_prescription.target_ultrafiltration>0">{{scope.row.dialysis_prescription.target_ultrafiltration}}</span>
            </template>
         </el-table-column>
         <el-table-column align="center" label="抗凝剂(首剂)(维持)(总量)"  v-if="dialysisSett.anticoagulant==1">
            <template slot-scope="scope">
-             <span>{{getAnticoagualnt(scope.row.dialysis_solution.anticoagulant)}}</span>
-             <span v-if="scope.row.dialysis_solution.anticoagulant_shouji > 0">({{scope.row.dialysis_solution.anticoagulant_shouji}})</span>
-             <span v-if="scope.row.dialysis_solution.anticoagulant_weichi > 0">({{scope.row.dialysis_solution.anticoagulant_weichi}})</span>
-             <span v-if="scope.row.dialysis_solution.anticoagulant_zongliang > 0">({{scope.row.dialysis_solution.anticoagulant_zongliang}})</span>
+             <span v-if="scope.row.dialysis_prescription.anticoagulant==''">{{getAnticoagualnt(scope.row.dialysis_solution.anticoagulant)}}</span>
+             <span v-if="scope.row.dialysis_prescription.anticoagulant!=''">{{getAnticoagualnt(scope.row.dialysis_prescription.anticoagulant)}}</span>
+
+             <span v-if="scope.row.dialysis_prescription.anticoagulant_shouji == 0">({{scope.row.dialysis_solution.anticoagulant_shouji}})</span>
+             <span v-if="scope.row.dialysis_prescription.anticoagulant_shouji > 0">({{scope.row.dialysis_prescription.anticoagulant_shouji}})</span>
+
+             <span v-if="scope.row.dialysis_prescription.anticoagulant_weichi == 0">({{scope.row.dialysis_solution.anticoagulant_weichi}})</span>
+             <span v-if="scope.row.dialysis_prescription.anticoagulant_weichi > 0">({{scope.row.dialysis_prescription.anticoagulant_weichi}})</span>
+
+             <span v-if="scope.row.dialysis_prescription.anticoagulant_zongliang == 0">({{scope.row.dialysis_solution.anticoagulant_zongliang}})</span>
+             
+             <span v-if="scope.row.dialysis_prescription.anticoagulant_zongliang > 0">({{scope.row.dialysis_prescription.anticoagulant_zongliang}})</span>
            </template>
         </el-table-column>
 
         <el-table-column align="center" label="透析时长" v-if="dialysisSett.dialysis_time ==1">
            <template slot-scope="scope">
-             <span v-if="scope.row.dialysis_solution.dialysis_duration_hour >0">{{scope.row.dialysis_solution.dialysis_duration_hour}}时</span>
-             <span v-if="scope.row.dialysis_solution.dialysis_duration_minute >0">{{scope.row.dialysis_solution.dialysis_duration_minute}}分</span>
+             <span v-if="scope.row.dialysis_prescription.dialysis_duration_hour  == 0">{{scope.row.dialysis_solution.dialysis_duration_hour}}时</span>
+             <span v-if="scope.row.dialysis_prescription.dialysis_duration_hour  > 0">{{scope.row.dialysis_prescription.dialysis_duration_hour}}时</span>
+
+             <span v-if="scope.row.dialysis_prescription.dialysis_duration_minute ==0">{{scope.row.dialysis_solution.dialysis_duration_minute}}分</span>
+             <span v-if="scope.row.dialysis_prescription.dialysis_duration_minute >0">{{scope.row.dialysis_prescription.dialysis_duration_minute}}分</span>
            </template>
         </el-table-column>
 
@@ -188,19 +201,22 @@
 
         <el-table-column align="center" label="透析器"  v-if="dialysisSett.dialysis_dialyszers == 1">
            <template slot-scope="scope">
-             <span>{{scope.row.dialysis_solution.dialysis_dialyszers}}</span>
+             <span v-if="scope.row.dialysis_prescription.dialysis_dialyszers==''">{{scope.row.dialysis_solution.dialysis_dialyszers}}</span>
+             <span v-if="scope.row.dialysis_prescription.dialysis_dialyszers!=''">{{scope.row.dialysis_prescription.dialysis_dialyszers}}</span>
            </template>
         </el-table-column>
 
          <el-table-column align="center" label="灌流器"  v-if="dialysisSett.dialysis_irrigation ==1">
            <template slot-scope="scope">
-             <span>{{scope.row.dialysis_solution.dialysis_irrigation}}</span>
+             <span v-if="scope.row.dialysis_prescription.dialysis_irrigation==''">{{scope.row.dialysis_solution.dialysis_irrigation}}</span>
+             <span v-if="scope.row.dialysis_prescription.dialysis_irrigation!=''">{{scope.row.dialysis_prescription.dialysis_irrigation}}</span>
            </template>
         </el-table-column>
 
         <el-table-column align="center" label="滤过器"  v-if="dialysisSett.dialysis_irrigation ==1">
            <template slot-scope="scope">
-             <span>{{scope.row.dialysis_solution.dialysis_strainer}}</span>
+             <span v-if="scope.row.dialysis_prescription.dialysis_strainer!=''">{{scope.row.dialysis_prescription.dialysis_strainer}}</span>
+             <span v-if="scope.row.dialysis_prescription.dialysis_strainer==''">{{scope.row.dialysis_solution.dialysis_strainer}}</span>
            </template>
         </el-table-column>
         
@@ -246,7 +262,8 @@
 
         <el-table-column align="center" label="血管通路" v-if="dialysisSett.blood_access==1">
            <template slot-scope="scope">
-             <span>{{getBloodAccessOption(scope.row.dialysis_solution.blood_access)}}</span>
+             <span v-if="scope.row.dialysis_prescription.blood_access==''">{{getBloodAccessOption(scope.row.dialysis_solution.blood_access)}}</span>
+             <span v-if="scope.row.dialysis_prescription.blood_access!=''">{{getBloodAccessOption(scope.row.dialysis_prescription.blood_access)}}</span>
            </template>
         </el-table-column>
 

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

@@ -266,7 +266,8 @@
                 org_id == 10599 ||
                 org_id == 10597 ||
                 org_id == 10599 || 
-                org_id == 10612) &&
+                org_id == 10612 ||
+                org_id ==10580) &&
                 org_id!=10387
             "
           >
@@ -337,7 +338,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!=10480  && org_id!=10551 && org_id!=10597 && org_id!=10599 && org_id!=10612 && org_id!=10580)
               || org_id == 10387
             "
           >
@@ -393,7 +394,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 == 10485 || org_id == 10375 || org_id ==10480 || org_id ==10551 || org_id ==10597 || org_id ==10599 || org_id ==10612 || org_id ==10580)
                 && org_id!=10387
             "
           >
@@ -446,7 +447,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!=10485 && org_id!=10395 && org_id!=10375 && org_id!=10480 && org_id!=10551 && org_id!=10597 && org_id!=10599&& org_id!=10612 && org_id!=10580) ||
               org_id == 10387
             "
           >
@@ -1177,7 +1178,7 @@
                 org_id== 10432 ||
                 org_id== 10445 ||
                 org_id== 10410 ||
-                org_id == 10485 || org_id == 10375 || org_id == 10480 || org_id == 10551 || org_id ==10612) &&
+                org_id == 10485 || org_id == 10375 || org_id == 10480 || org_id == 10551 || org_id ==10612 || org_id ==10580) &&
                 org_id!=10387
             "
           >
@@ -1225,7 +1226,7 @@
               org_id!=10445 &&
               org_id!=10410 &&
               org_id!=10485 &&
-              org_id!=10375 &&  org_id!=10480 &&  org_id!=10551 && org_id!=10612)
+              org_id!=10375 &&  org_id!=10480 &&  org_id!=10551 && org_id!=10612 && org_id!=10580)
               || org_id == 10387
             "
           >
@@ -1289,7 +1290,8 @@
                 org_id == 10551 ||
                 org_id == 10597||
                 org_id == 10599 ||
-                org_id ==10612)
+                org_id ==10612 || 
+                org_id==10580)
                 && org_id!=10387
             "
           >
@@ -1353,7 +1355,8 @@
               org_id!=10551 &&
               org_id!=10597 &&
               org_id!=10599 &&
-              org_id!=10612
+              org_id!=10612 &&
+              org_id!=10580
               )
               || org_id == 10387
             "

src/xt_pages/dialysis/details/dialysisMonitoring.vue

@@ -15,10 +15,10 @@
           <th width="76px">静脉压/动脉压({{monitores[0]&&monitores[0]['venous_pressure_type'] == 2 ? 'kpa' : 'mmHg'}})</th>
           <th v-if="isShow('血流量')" width="92px">血流量(ml/min)</th>
           <th v-if="isShow('跨膜压')" width="76px">跨膜压({{monitores[0]&&monitores[0]['transmembrane_pressure_type'] == 2 ? 'kpa' : 'mmHg'}})</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 || 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!=10387 " 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 == 10387"  width="76px"> 超滤量(L) </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!=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==10387" width="50px"> 超滤率 <br />(L/h) </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 || 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 == 10580) &&this.$store.getters.xt_user.template_info.org_id!=10387 " 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!=10580) || this.$store.getters.xt_user.template_info.org_id == 10387"  width="76px"> 超滤量(L) </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 == 10580) && 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!=10580 ) || this.$store.getters.xt_user.template_info.org_id==10387" width="50px"> 超滤率 <br />(L/h) </th>
           <th v-if="isShow('钠浓度')" width="92px">钠浓度(mmol/L)</th>
           <th v-if="isShow('透析液温度')" 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!=10558" width="92px" > 置换率(ml/min) </th>

src/xt_pages/dialysis/longSignPrint.vue

@@ -33,7 +33,7 @@
                             
                             </div>  
                             <div v-if="(org_id ==0 || org_id==10440 || org_id == 10478 || org_id ==10223) && org_id!=10278">单次用量:{{it.single_dose}}{{it.single_dose_unit }}</div>  
-                            <div v-if="org_id!=0 && org_id!=10278 && org_id!=10138">执行频率:{{it.execution_frequency}}</div>  
+                            <div v-if="org_id!=0 && org_id!=10278 && org_id!=10138 && org_id!=10223">执行频率:{{it.execution_frequency}}</div>  
                             <div v-if="org_id!=10278">给药途径:{{it.delivery_way}}</div>  
                             <div v-if="org_id == 0 || org_id==10223">
                                 <span>配药者:</span>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;

src/xt_pages/dialysis/template/DialysisPrintOrderSeventyTwo.vue

@@ -67,25 +67,25 @@
           <div class="inline_block">
             病区：
             <div class="under_line" style="width: 50px; text-align: center">
-              <span v-if="org_id == 10121||org_id == 10138||org_id == 10414 ||org_id == 10447 || org_id == 0 || org_id ==10460 || org_id ==10567">{{
+              <!-- <span v-if="org_id == 10121||org_id == 10138||org_id == 10414 ||org_id == 10447  || org_id ==10460 || org_id ==10567">{{
                 patientInfo.DialysisSchedule.device_zone.name
                   ? patientInfo.DialysisSchedule.device_zone.name
                   : ""
               }}</span>
-              <span v-else>{{ "/" }}</span>
+              <span v-else>{{ "/" }}</span> -->
             </div>
           </div>
           <div class="inline_block" >
             床号：
             <div class="under_line" style="width: 50px; text-align: center">
-              <span v-if="org_id == 10121||org_id == 10414 || org_id == 10447 || org_id == 9675 || org_id == 0 || org_id ==10460 || org_id ==10515 || org_id == 10567">{{
+              <!-- <span v-if="org_id == 10121||org_id == 10414 || org_id == 10447 || org_id == 9675 || org_id == 0 || org_id ==10460 || org_id ==10515 || org_id == 10567">{{
                 dialysisOrder &&
                 dialysisOrder.DeviceNumber &&
                 dialysisOrder.DeviceNumber.number.length > 0
                   ? dialysisOrder.DeviceNumber.number
                   : patientInfo.DialysisSchedule.device_number.number
               }}</span>
-              <span v-else>{{ "/" }}</span>
+              <span v-else>{{ "/" }}</span> -->
             </div>
           </div>
           <div class="inline_block">
@@ -1087,7 +1087,7 @@
                   <div style="width: 100%;text-align: center;">
                     <div style="border-bottom: 1px solid black;">治疗记录</div>
                     <div style="display: flex;">
-                      <div style="flex: 0.8;border-right: 1px solid black;">时间</div>
+                      <div style="flex: 0.8;border-right: 1px solid black;"><span>时间</span></div>
                       <div style="flex: 0.8;border-right: 1px solid black;">血压<br/>(mmHg)</div>
                       <div style="flex: 0.9;border-right: 1px solid black;">脉搏<br/>(次/分)</div>
                       <div style="flex: 0.9;border-right: 1px solid black;">血流量<br />(ml/min)</div>
@@ -1096,8 +1096,7 @@
                       <div style="flex: 0.9;border-right: 1px solid black;">钠浓度<br/>(mmol/L)</div>
                       <div style="flex: 0.9;border-right: 1px solid black;">超滤量<br/>(ml)</div>
                       <div style="flex: 1;border-right: 1px solid black;" v-if="prescription.mode_id == 2">置换液速度<br/>(ml/h)</div>
-                      <div style="flex: 1.2;border-right: 1px solid black;" v-if="prescription.anticoagulant_name == 7 && 
-                        prescription.anticoagulant_name != ''">肝素剩余量度(ml)
+                      <div style="flex: 1.2;border-right: 1px solid black;" v-if="prescription.anticoagulant_name=='低分子肝素钠'">肝素剩余量度(ml)
                       </div>
                       <div style="flex: 2;">病情变化及处理</div>
                     </div>
@@ -1151,9 +1150,10 @@
                     <div style="flex: 1;border-right: 1px solid black;" v-if="prescription.mode_id == 2">
                       {{ monitor.replacement_speed ? monitor.replacement_speed : "" }}
                     </div>
-                    <div style="flex: 1.2;border-right: 1px solid black;" v-if="prescription.anticoagulant == 7 && prescription.anticoagulant_name != ''">
+                    <div style="flex: 1.2;border-right: 1px solid black;" v-if="prescription.anticoagulant_name=='低分子肝素钠'">
 
                     </div>
+                    <!-- v-if="prescription.anticoagulant == 7 && prescription.anticoagulant_name != ''" -->
                     <div style="flex: 2;">
                       <div style="min-height: 35px;
                           line-height: 35px; overflow: hidden; "

src/xt_pages/dialysis/template/DialysisPrintOrderSix.vue

@@ -79,10 +79,10 @@
               <check-box :checked="receiverTreatmentAccess.condition == 1"></check-box>
             </div>
           </div>
-          <div class="inline_block">
+          <div class="inline_block" v-if="org_id!=10624">
             病区：
             <div class="under_line" style="width: 50px; text-align: center">
-              <span v-if="org_id == 10121||org_id == 10138||org_id == 10414 ||org_id == 10447 || org_id == 0 || org_id ==10460 || org_id ==10567">{{
+              <span v-if="org_id == 10121||org_id == 10138||org_id == 10414 ||org_id == 10447  || org_id ==10567">{{
                 patientInfo.DialysisSchedule.device_zone.name
                   ? patientInfo.DialysisSchedule.device_zone.name
                   : ""
@@ -90,10 +90,10 @@
               <span v-else>{{ "/" }}</span>
             </div>
           </div>
-          <div class="inline_block" v-if="org_id!=10460">
+          <div class="inline_block" v-if="org_id!=10460&&org_id!=10624">
             床号：
             <div class="under_line" style="width: 50px; text-align: center">
-              <span v-if="org_id == 10121||org_id == 10414 || org_id == 10447 || org_id == 9675 || org_id == 0 || org_id ==10460 || org_id ==10515 || org_id == 10567">{{
+              <span v-if="org_id == 10121||org_id == 10414 || org_id == 10447 || org_id == 9675 || org_id ==10515 || org_id == 10567">{{
                 dialysisOrder &&
                 dialysisOrder.DeviceNumber &&
                 dialysisOrder.DeviceNumber.number.length > 0
@@ -109,7 +109,7 @@
               {{ patientInfo.dialysis_no }}
             </div>
           </div>
-          <div class="inline_block" style="margin-left: 5px;" v-if="org_id!=9675 && org_id!=10447&&org_id!=10460">
+          <div class="inline_block" style="margin-left: 5px;" v-if="org_id!=9675 && org_id!=10447&&org_id!=10460&&org_id!=10624">
             住院号/门诊号：
             <div class="under_line" style="width: 70px;text-align: left" v-if="receiverTreatmentAccess.admission_number">
               {{ receiverTreatmentAccess.admission_number }}
@@ -136,7 +136,7 @@
            
           </div>
 
-          <div class="inline_block" style="margin-left: 10px" v-if="org_id!=10460">
+          <div class="inline_block" style="margin-left: 10px" v-if="org_id!=10460&&org_id!=10624">
             诊断：
             <div
               class="under_line"
@@ -203,7 +203,7 @@
                         }}
                       </div>
                     </div>
-                    <div class="inline_block" style="flex: 1">
+                    <div class="inline_block" style="flex: 1" v-if="org_id!=10624">
                       透前症状：
                       <div
                         class="under_line"
@@ -896,11 +896,19 @@
                         class="under_line"
                         style="width: 30px; text-align: center"
                       >
-                        {{
+                        <span v-if="org_id!=10624">{{
                           prescription.dialysis_duration_minute
                             ? prescription.dialysis_duration_minute
                             : "/"
                         }}
+                        </span> 
+
+                        <span v-if="org_id ==10624">{{
+                          prescription.dialysis_duration_minute
+                            ? prescription.dialysis_duration_minute
+                            : "0"
+                        }}
+                        </span> 
                       </div>
                       min
                     </div>
@@ -1576,7 +1584,7 @@
                           置换量<br />(ml)
                         </td>
                         <td width="50" v-if="org_id == 3877 || org_id == 0 || org_id == 10449">滤前压(mmHg)</td>
-                        <td width="50" v-if="org_id == 9538 || org_id ==10600">KT/V</td>
+                        <td width="50" v-if="org_id == 9538 || org_id ==10600 || org_id ==10629">KT/V</td>
                         <td width="50" v-if="org_id == 9919">在线尿素监测</td>
                         <td width="50" v-if="org_id == 9671">在线尿素监测</td>
                         <td width="50" v-if="org_id == 9538 || org_id == 9919 || org_id== 9671">血容量<br />(L)</td>
@@ -1683,8 +1691,13 @@
                           {{ monitor.replacement_rate? monitor.replacement_rate: ""}}
                         </td>
                         <td v-if="org_id!=10600">
-                          <span v-if="org_id!=9671 && org_id!=10440"> {{ monitor.ultrafiltration_volume? monitor.ultrafiltration_volume: ""}}</span>
-                          <span v-if="org_id==9671 || org_id==10440"> {{ monitor.ultrafiltration_volume? monitor.ultrafiltration_volume: "0"}}</span>
+                          <span v-if="org_id!=9671 && org_id!=10440 && org_id!=10617"> {{ monitor.ultrafiltration_volume? monitor.ultrafiltration_volume: ""}}</span>
+                          <span v-if="org_id==9671 || org_id==10440 || org_id ==10617">
+                              <span v-if="org_id ==10617 && monindex == 0">{{ monitor.ultrafiltration_volume? monitor.ultrafiltration_volume: "/"}}</span>
+                              <span v-if="org_id ==10617 && monindex == monitors.length-1">{{ monitor.ultrafiltration_volume? monitor.ultrafiltration_volume: "/"}}</span>
+                              <span v-if="org_id ==10617 && (monindex != monitors.length-1 || monindex != 0)">{{ monitor.ultrafiltration_volume? monitor.ultrafiltration_volume: "/"}}</span>    
+                              <span v-if="org_id !=10617">{{ monitor.ultrafiltration_volume? monitor.ultrafiltration_volume: "0"}}</span> 
+                           </span>
                         </td>
                         <td width="50" v-if="org_id == 10600 || org_id == 10598"><br/> {{ monitor.ultrafiltration_rate? monitor.ultrafiltration_rate: "0"}}</td>
                         <td
@@ -1705,7 +1718,7 @@
                           </span>
                         </td>
                         <td width="50" v-if="org_id == 3877 || org_id == 0 || org_id == 10449">{{ monitor.filter_pressure?monitor.filter_pressure:""}}</td>
-                        <td width="50" v-if="org_id == 9919 || org_id == 9538 || org_id == 9671 || org_id ==10600">
+                        <td width="50" v-if="org_id == 9919 || org_id == 9538 || org_id == 9671 || org_id ==10600 || org_id ==10629">
                           {{ monitor.ktv?monitor.ktv:"" }}
                         </td>
                         <td width="50" v-if="org_id == 9538 || org_id == 9919 || org_id == 9671">
@@ -2358,7 +2371,7 @@
               <check-box :checked="receiverTreatmentAccess.condition == 1"></check-box>
             </div>
           </div>
-            <div class="inline_block" v-if="org_id!=10510">
+            <div class="inline_block" v-if="org_id!=10510 && org_id!=10624">
               病区：
               <div class="under_line" style="width: 50px; text-align: center">
               <span v-if="org_id == 10121||org_id == 10138 || org_id == 9675 || org_id == 10447 || org_id == 0 || org_id ==10460">{{
@@ -2369,7 +2382,7 @@
               <span v-else>{{ "/" }}</span>
             </div>
             </div>
-            <div class="inline_block" v-if="org_id!=10510 && org_id!=10460" >
+            <div class="inline_block" v-if="org_id!=10510 && org_id!=10460 && org_id!=10624" >
               床号：
               <div class="under_line" style="width: 50px; text-align: center">
               <span v-if="org_id == 10121 || org_id == 9675 || org_id == 10447 || org_id == 0 ||org_id == 10460">{{
@@ -2389,7 +2402,7 @@
               </div>
             </div>
             <div class="inline_block" style="margin-left: 5px"
-            v-if="org_id!=9675 && org_id!=10447 && org_id!=10460">
+            v-if="org_id!=9675 && org_id!=10447 && org_id!=10460&&org_id!=10624">
             住院号/门诊号：
             <div
               class="under_line"
@@ -2811,12 +2824,7 @@
                       style="flex: 1"
                       v-if="org_id != 10223 && org_id!=10375 && org_id!=10598"
                     >
-                       <span v-if="org_id!=10460 ">
-                          透析中入量(L)：
-                        </span>
-                        <span v-if="org_id==10460">
-                          透析中入量(ml)：
-                        </span>
+
                       <div
                         class="under_line"
                         style="width: 70px; text-align: center"
@@ -2827,6 +2835,12 @@
                             : "/"
                         }}
                       </div>
+                      <span v-if="org_id!=10460">
+                          透析中入量(L)：
+                        </span>
+                        <span v-if="org_id==10460">
+                          透析中入量(ml)：
+                        </span>
                       {{ getUnit(afterdialysis.dialysis_intakes_unit) }}
                     </div>
 
@@ -2842,8 +2856,8 @@
                             : "/"
                         }}
                       </div>
-                      <span v-if="org_id!=9675&&org_id!=10447"> ml</span>
-                      <span v-if="org_id ==9675||org_id==10447">L</span>
+                      <span v-if="org_id!=9675&&org_id!=10447 &&org_id!=10624"> ml</span>
+                      <span v-if="org_id ==9675||org_id==10447 || org_id==10624">L</span>
                     </div>
                   </div>
                   <div
@@ -3011,7 +3025,7 @@
                     </div>
                   </div>
                   <div
-                    v-if="org_id!=10460"
+                    v-if="org_id!=10460 &&org_id!=10624"
                     class="row"
                     style="padding: 2px 0; line-height: 23px; display: flex"
                   >

src/xt_pages/outpatientDoctorStation/components/deskPrescription.vue

@@ -277,7 +277,7 @@
                                   <el-input style="width:50%;" @input="searchAction"
                                             @keyup.enter.native='searchAction'
                                             v-model.trim="search_keyword"
-                                            placeholder="请输入药品名字"></el-input>
+                                            placeholder="请输入药品名字" :clearable="true"></el-input>
                                   <el-select style="margin-left:5px;width:50%;" v-model="value" placeholder=""
                                              @change="changeKind">
                                       <el-option
@@ -393,7 +393,7 @@
                                   <el-input style="width:50%;" @input="searchProjectAction"
                                             @keyup.enter.native='searchProjectAction'
                                             v-model.trim="search_project_keyword"
-                                            placeholder="请输入项目名称"></el-input>
+                                            placeholder="请输入项目名称" :clearable="true"></el-input>
 
                                   <el-select style="float: right;width: 49%;" v-model="value" placeholder=""
                                              @change="changeClass">
@@ -1752,23 +1752,34 @@ export default {
       }
       this.$refs.additionalCharges.hide()
 
-    }, searchProjectAction() {
+    }, 
+    // 项目
+    searchProjectAction() {
       console.log('~~~~',this.search_project_keyword)
-      console.log('5555',this.tabProject)
-      console.log('6666',this.allProject)
-      // console.log('4444',this.tabProject[1].first_letter.indexOf(this.search_project_keyword) != -1)
+      const tabProjects = this.allProject
+      console.log('4444',tabProjects)
       if (this.search_project_keyword.length == 0) {
         this.tabProject = this.allProject
       } else {
         let arr = []
-        for (let i = 0; i < this.tabProject.length; i++) {
+
+        for (let i = 0; i < tabProjects.length; i++) {
             // console.log('4444',this.tabProject[i].first_letter.indexOf(this.search_project_keyword) != -1)
-            if (this.tabProject[i].project_name.indexOf(this.search_project_keyword) != -1 ||
-            this.tabProject[i].first_letter.indexOf(this.search_project_keyword) !=-1) {
-              arr = arr.concat(this.tabProject[i])
+            if (tabProjects[i].project_name.indexOf(this.search_project_keyword) != -1 ||
+                tabProjects[i].first_letter.indexOf(this.search_project_keyword) !=-1) {
+              arr = arr.concat(tabProjects[i])
             }
 
         }
+
+        // for (let i = 0; i < this.tabProject.length; i++) {
+        //     // console.log('4444',this.tabProject[i].first_letter.indexOf(this.search_project_keyword) != -1)
+        //     if (this.tabProject[i].project_name.indexOf(this.search_project_keyword) != -1 ||
+        //     this.tabProject[i].first_letter.indexOf(this.search_project_keyword) !=-1) {
+        //       arr = arr.concat(this.tabProject[i])
+        //     }
+
+        // }
         this.tabProject = arr
         console.log('kkkk',this.tabProject);
       }
@@ -1788,22 +1799,34 @@ export default {
       }
 
     },
+    // 药品
     searchAction() {
+      const drug2 =this.allDrugs
+      console.log('this.allDrugs',drug2);
       if (this.search_keyword.length == 0) {
         this.drugs = this.allDrugs
       } else {
+       
         let arr = []
-        for (let i = 0; i < this.drugs.length; i++) {
-          if (this.drugs[i].drug_name.indexOf(this.search_keyword) != -1 ||
-           this.drugs[i].wubi.indexOf(this.search_keyword) != -1 ||
-           this.drugs[i].pinyin.indexOf(this.search_keyword) != -1 ||
-           this.drugs[i].first_letter.indexOf(this.search_keyword) != -1
+        for (let i = 0; i < drug2.length; i++) {
+          if (drug2[i].drug_name.indexOf(this.search_keyword) != -1 ||
+            drug2[i].wubi.indexOf(this.search_keyword) != -1 ||
+            drug2[i].pinyin.indexOf(this.search_keyword) != -1 ||
+            drug2[i].first_letter.indexOf(this.search_keyword) != -1
            ) {
-            arr = arr.concat(this.drugs[i])
+            arr = arr.concat(drug2[i])
           }
         }
+        // for (let i = 0; i < this.drugs.length; i++) {
+        //   if (this.drugs[i].drug_name.indexOf(this.search_keyword) != -1 ||
+        //    this.drugs[i].wubi.indexOf(this.search_keyword) != -1 ||
+        //    this.drugs[i].pinyin.indexOf(this.search_keyword) != -1 ||
+        //    this.drugs[i].first_letter.indexOf(this.search_keyword) != -1
+        //    ) {
+        //     arr = arr.concat(this.drugs[i])
+        //   }
+        // }
         this.drugs = arr
-
       }
 
     },
@@ -3877,6 +3900,8 @@ export default {
       getHisProject().then(response => {
         if (response.data.state == 1) {
           var project = response.data.data.project
+          // this.tabProject = project
+          console.log('zzzzzzzzzz',project);
           for (let i = 0; i < project.length; i++) {
             let obj = {
               id: project[i].id,
@@ -3899,7 +3924,6 @@ export default {
               bbx01:project[i].bbx01,
               zuobiao_stock_num:0,
               number:""
-
             }
             this.tabProject.push(obj)
           }

src/xt_pages/outpatientDoctorStation/components/prescriptionTable.vue

@@ -6,7 +6,7 @@
             <el-table-column align="center" prop="day" width="70" label="序号" fixed>
                 <template slot-scope="scope">
                     <div style="display:flex;align-items:center;">
-                        <el-input :disabled="prescription.is_medicine_status" v-model="scope.row.groupno" placeholder=""></el-input>
+                        <el-input :disabled="prescription.is_medicine_status" v-model="scope.row.groupno" placeholder="" @input="getAllIndex(scope.row)"></el-input>
                     </div>
                 </template>
             </el-table-column>
@@ -716,6 +716,36 @@
         }
         return num
       },
+      getAllIndex(val){
+        console.log("val",val)
+        console.log("prescription.advices",this.prescription.advices)
+        var obj = {id:0,day:"",delivery_way:"",execution_frequency:""}
+        if(this.prescription.advices!=null && this.prescription.advices.length>0){
+           for(let i=0;i<this.prescription.advices.length;i++){
+            console.log("this.prescription.advices[i].groupno",this.prescription.advices[i].groupno)
+            if(parseInt(val.groupno) == parseInt(this.prescription.advices[i].groupno) && parseInt(val.id)!= parseInt(this.prescription.advices[i].id)){
+              console.log("this.prescription.advices[i]",this.prescription.advices[i])
+               obj.id = val.id
+               obj.day = this.prescription.advices[i].day
+               obj.delivery_way = this.prescription.advices[i].delivery_way
+               obj.execution_frequency = this.prescription.advices[i].execution_frequency
+               console.log("-----------------",obj)
+             }
+           }
+        }
+        console.log("-----------------",obj)
+
+        if(this.prescription.advices!=null && this.prescription.advices.length>0){
+           for(let i=0;i<this.prescription.advices.length;i++){
+            if(obj.id == parseInt(val.id)){
+              this.prescription.advices[i].delivery_way = obj.delivery_way
+              this.prescription.advices[i].execution_frequency =obj.execution_frequency
+              this.prescription.advices[i].day = obj.day
+             }
+           }
+        }
+        console.log("hahhhahdhha",this.prescription.advices)
+      },
 
     }, mounted() {
       this.getInitData()

src/xt_pages/outpatientDoctorStation/doctorDesk.vue

@@ -6,7 +6,6 @@
     <div class="app-container" style="display:flex;flex: 1;padding: 10px 20px 0px 20px;">
       <div class="mainLeft">
 
-
         <el-date-picker
           v-model="record_date"
           prefix-icon="el-icon-date"
@@ -313,7 +312,17 @@
           <checkPrint ref="checkPrint" v-if="selecting_schs3.length > 0" :paramsObj='paramsObj3'
                       :newHisPatient="hisPatientInfo"></checkPrint>
         </div>
-
+        <template>
+          <el-button
+            style="float:right;"
+            size="small"
+            icon="el-icon-printer"
+            @click="printThisPage"
+            type="primary"
+          >打印
+          </el-button
+          >
+        </template>
       </el-dialog>
       <span slot="footer" class="dialog-footer">
         <el-button @click="centerDialogVisible = false">取 消</el-button>
@@ -510,7 +519,6 @@
           </div>
         </div>
       </div>
-
       <span slot="footer" class="dialog-footer">
         <el-button @click="startVisibility = false">取 消</el-button>
       </span>
@@ -983,7 +991,7 @@ export default {
 
           //排班
           for (let i = 0; i < response.data.data.list_two.length; i++) {
-            console.log('hahhahahahahahahah', response.data.data.list_two)
+            // console.log('hahhahahahahahahah', response.data.data.list_two)
             //未就诊
             if (response.data.data.list_two[i].prescription.length == 0 && response.data.data.list_two[i].his_patient.id == 0) {
               let obj = {

src/xt_pages/outpatientDoctorStation/prescriptionTemplatedetail.vue

@@ -613,21 +613,25 @@
 
           }
 
+          console.log("数据wwwwwwwwwwwww",this.prescriptions[i].project)
+          
           for (let b = 0; b < this.prescriptions[i].project.length; b++) {
+            this.prescriptions[i].project[b].single_dose = this.prescriptions[i].project[b].single_dose.toString()
             this.prescriptions[i].project[b].price = this.prescriptions[i].project[b].price.toString()
             this.prescriptions[i].project[b].total = this.prescriptions[i].project[b].total.toString()
             this.prescriptions[i].project[b].delivery_way = this.prescriptions[i].project[b].delivery_way.toString()
 
             this.prescriptions[i].project[b].day_count = parseInt(this.prescriptions[i].project[b].day_count)
             this.prescriptions[i].project[b].frequency_type = parseInt(this.prescriptions[i].project[b].frequency_type)
-            this.prescriptions[i].project[b].week_day = this.prescriptions[i].project[b].week_day.toString()
+            this.prescriptions[i].project[b].week_day = this.prescriptions[i].project[b].number_days.toString()
 
           }
         }
         let data = {
           'prescriptions': this.prescriptions
         }
-
+        console.log("paramoowowowowoowowowowowowowow",data)
+       
         createdTemplate(params, data).then(response => {
           if (response.data.state == 1) {
             this.$message.success('保存成功')
@@ -1507,6 +1511,7 @@
       },
 
       comfirm() {
+        console.log("temlist",this.teamList)
         // if (this.curPrescriptions.order_status == 2) {
         //   this.$message.error('该处方已经结算，无法继续添加药品或者项目')
         //   this.teamList = []
@@ -1733,7 +1738,7 @@
                   type: temp2[b].type,
                   frequency_type: 1,
                   day_count: 0,
-                  week_day: ''
+                  week_day:temp2[b].number_days
                 }
                 if (temp2[b].type == 2) {
                   obj['project'] = temp2[b].project
@@ -1784,7 +1789,8 @@
           }
         }
         this.teamList = selection
-      }, getPrescriptionTemplateInfo() {
+      }, 
+      getPrescriptionTemplateInfo() {
         let params = {
           id: this.$route.query.id
         }
@@ -1797,6 +1803,7 @@
             if (response.data.data.template.id > 0) {
               this.tempForm.name = response.data.data.template.name
               this.tempForm.mode_id = response.data.data.template.mode
+              console.log("数据woowowowo",response.data.data.prescriptions)
               for (let i = 0; i < response.data.data.prescriptions.length; i++) {
                 var prescription = response.data.data.prescriptions[i]
                 let tempAdvice = []
@@ -1852,8 +1859,8 @@
                         type: prescription.project[b].type,
                         frequency_type: prescription.project[b].frequency_type,
                         day_count: prescription.project[b].day_count,
-                        week_day: prescription.project[b].week_day
-
+                        week_day: prescription.project[b].week_day,
+                        number_days:prescription.project[b].week_day
 
                       }
 
@@ -1893,7 +1900,8 @@
                           type: prescription.project[b].type,
                           frequency_type: prescription.project[b].frequency_type,
                           day_count: prescription.project[b].day_count,
-                          week_day: prescription.project[b].week_day
+                          week_day: prescription.project[b].week_day,
+                          number_days:prescription.project[b].week_day
 
                         }
 
@@ -1930,7 +1938,8 @@
                         type: prescription.project[b].type,
                         frequency_type: prescription.project[b].frequency_type,
                         day_count: prescription.project[b].day_count,
-                        week_day: prescription.project[b].week_day
+                        week_day: prescription.project[b].week_day,
+                        number_days:prescription.project[b].week_day
 
 
                       }
@@ -1971,7 +1980,8 @@
                           type: prescription.project[b].type,
                           frequency_type: prescription.project[b].frequency_type,
                           day_count: prescription.project[b].day_count,
-                          week_day: prescription.project[b].week_day
+                          week_day: prescription.project[b].week_day,
+                          number_days:prescription.project[b].week_day
 
                         }
 

src/xt_pages/outpatientDoctorStation/template/prinSeven.vue

@@ -136,7 +136,7 @@
                         &nbsp;&nbsp;<span>
                           {{ it.execution_frequency }}&nbsp;{{
                             it.delivery_way
-                          }}&nbsp;</span>&nbsp;&nbsp;<span>{{ it.advice_desc}}</span>
+                          }}&nbsp;共{{ it.day}}天</span>&nbsp;&nbsp;<span>{{ it.advice_desc}}</span>
                       </template>
                     </div>
 
@@ -195,7 +195,7 @@
                         &nbsp;&nbsp;<span>
                           {{ it.execution_frequency }}&nbsp;{{
                             it.delivery_way
-                          }}&nbsp;</span>&nbsp;&nbsp;<span>{{ it.advice_desc}}</span>
+                          }}&nbsp;共{{ it.day}}天</span><span>{{ it.advice_desc}} </span>
                       </template>
                     </div>
 
@@ -404,7 +404,7 @@
             <p>日期：{{ getTime(item.ctime) ? getTime(item.ctime) : "" }}</p>
           </div> -->
           <div  style="border-bottom: 2px solid #000; width: 100%;margin-right: 30px;padding: 0 10px;line-height: 24px;" >
-            <p style="text-align: right;">医师：{{ item.creator ? item.creator : "" }}</p>
+            <p style="text-align: right;">医师：{{ item.doctor ? item.doctor : "" }}</p>
           </div>
           <!-- <div style="display: flex;justify-content: space-around;border-bottom: 2px solid #000;">
             <p style="width:300px;">大额处方患者意见：
@@ -558,20 +558,17 @@ export default{
     },
     getPrescriptionPrint() {
       var params = {
-        // patient_id:this.patient_id,
-        // record_date:this.record_date,
-        // prescription_id:this.prescription_id,
         patient_id: this.patient_id,
         record_date: this.record_date,
         prescription_id: this.prescription_id,
         ids: this.ids,
         p_type: 2,
       };
-      console.log("params", params);
       getPrescriptionPrint(params).then((response) => {
         if (response.data.state == 1) {
           var advicePrint = response.data.data.advicePrint;
           console.log("adviceprint9999", advicePrint);
+          console.log("response.data.data", response.data.data);
           this.advicePrint = advicePrint;
           this.prescriptions = advicePrint;
 
@@ -602,10 +599,10 @@ export default{
           }
         }
 
-          console.log('4444444',this.advicePrint);
+          // console.log('4444444',this.advicePrint);
         //  console.log('55555555',this.arr);
 
-          console.log(this.doctorList_1, "医生列表");
+          // console.log(this.doctorList_1, "医生列表");
           if (this.doctorList_1.length > 0) {
             var operatorsLen = this.doctorList_1.length;
             for (var index = 0; index < operatorsLen; index++) {
@@ -617,12 +614,12 @@ export default{
             }
           }
 
-          console.log("处方222222", this.prescriptions);
+          // console.log("处方222222", this.prescriptions);
           var hisPatient = response.data.data.hisPatient;
-          console.log("hisPatient", hisPatient);
+          // console.log("hisPatient", hisPatient);
           this.hisPatient = hisPatient;
           var projectlist = response.data.data.projectlist;
-          console.log("所有项目列表", projectlist);
+          // console.log("所有项目列表", projectlist);
           this.projectList = projectlist;
         }
       });
@@ -658,7 +655,7 @@ export default{
       return name;
     },
     getTotalOne(id) {
-      console.log('999999999',this.prescriptions);
+      // console.log('999999999',this.prescriptions);
       var total = 0;
       var addtotal = 0;
       var zimuyao = 0;

src/xt_pages/user/components/PatientDetail.vue

@@ -1224,11 +1224,12 @@
             <div class="print_footnote_panel">
               <div class="proj">
                 <span class="proj_title">日期：</span>
-                <!-- {{ getTime(patientPrint.created_time) }} -->
-                <span v-if="org_id == 3907 || org_id == 9671|| org_id == 9675 || org_id == 10394">{{
+               
+                <span v-if="org_id == 3907 || org_id == 9671|| org_id == 9675 || org_id == 10394 || org_id ==10612 || org_id == 0">{{
                   getTime(patientPrint.created_time)
                 }}</span>
                 <span v-else>{{ printDate }}</span>
+              
               </div>
               <div class="proj">
                  <span class="proj_title">医生签名：