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

src/xt_pages/DepositManagement/DepositRefund.vue

@@ -20,28 +20,24 @@
             </el-button>
           </div>
         </div>
-        <div
-          style="
-            justify-content: flex-start;
-            margin: 0px 0 12px 0;
-            display: flex;
+        <div style=" justify-content: flex-start;
+            margin: 0px 0 12px 0; display: flex;
             align-items: center;
           "
         >
-          <div style="display: flex">
-            <div style="width: 250px">
+            <div style="flex: 1;">
               <el-input
                 size="small"
-                style="width: 200px; margin-left: 10px"
+                style="width: 200px;"
                 class="filter-item"
                 placeholder="请输入编号/患者名称"
                 v-model.trim="tmp_keyword"
               />
             </div>
 
-            <div style="width: 287px;margin-right: 30px;white-space: nowrap;">
+            <div style="flex: 1;white-space: nowrap;">
               退款类型：
-              <el-select v-model="tmp_refundtype" placeholder="请选择" @change="updaterefundtype">
+              <el-select v-model="tmp_refundtype" placeholder="请选择" @change="updaterefundtype" style="width: 130px;">
                 <el-option
                   v-for="item in refundtypelist"
                   :key="item.name"
@@ -52,9 +48,9 @@
               </el-select>
             </div>
 
-            <div style="width: 288px;margin-right: 30px;white-space: nowrap;">
+            <div style="white-space: nowrap;flex: 1;">
               审核状态：
-              <el-select v-model="tmp_examinetype" placeholder="请选择" @change="updateexaminetype">
+              <el-select v-model="tmp_examinetype" placeholder="请选择" @change="updateexaminetype" style="width: 130px;">
                 <el-option
                   v-for="item in examinelist"
                   :key="item.name"
@@ -65,7 +61,7 @@
               </el-select>
             </div>
 
-            <div style="width: 465px;white-space: nowrap;">
+            <div style="white-space: nowrap;flex: 1;">
               <span>日期查询：</span>
               <el-date-picker
                 unlink-panels
@@ -79,16 +75,19 @@
               >
               </el-date-picker>
             </div>
-            <el-button
-              size="small"
-              class="filter-item"
-              type="primary"
-              icon="el-icon-search"
-              @click="search_tmp"
+            <div style="margin-left: 5px;">
+              <el-button
+                size="small"
+                class="filter-item"
+                type="primary"
+                icon="el-icon-search"
+                @click="search_tmp"
               >查询</el-button
-            >
+              >
+            </div>
+           
           </div>
-        </div>
+
         <el-table
           ref="multipleTable"
           :header-cell-style="{

src/xt_pages/data/basicConfig.vue

@@ -46,9 +46,9 @@
                 <el-switch v-model="good_out_open" @change="changeGoodOutOpen"></el-switch>
             </p>
 
-            <p style="margin-top:20px;">药品耗材在结算时出库：
+            <!-- <p style="margin-top:20px;">药品耗材在结算时出库：
                 <el-switch v-model="drug_settle_open" @change="changeSettleOpen"></el-switch>
-            </p>
+            </p> -->
         </div>
 
 

src/xt_pages/dialysis/batch_print/batch_print_order_six.vue

@@ -1586,7 +1586,7 @@
                           <td width="50" v-if="org_id == 10478 || org_id ==10510">动脉压<br />(mmHg)</td>
                           <td width="50">静脉压<br />(mmHg)</td>
                           <td width="50">跨膜压<br />(mmHg)</td>
-                          <td width="60" v-if="org_id != 9836">
+                          <td width="60" v-if="org_id != 9836 && org_id!=10644">
                             透析液温度(°C)
                           </td>
                           <td width="60" v-if="org_id == 9836">体温(°C)</td>
@@ -1597,7 +1597,8 @@
                               org_id != 10121 &&
                               org_id != 9675 &&
                               org_id!=10490  &&
-                              org_id!=10600
+                              org_id!=10600 &&
+                              org_id!=10644
                             "
                           >
                             电导度<br />(ms/cm)
@@ -1650,7 +1651,10 @@
                               org_id == 9671 ||
                               org_id ==10600 ||
                               org_id ==10629 ||
-                              org_id == 10510
+                              org_id == 10510 ||
+                              org_id == 0 ||
+                              org_id == 10598
+
                             "
                           >
                             KT/V
@@ -1757,7 +1761,7 @@
                                 : "/"
                             }}
                           </td>
-                          <td v-if="org_id != 9836">
+                          <td v-if="org_id != 9836 && org_id!=10644">
                             {{
                               monitor_record.dialysate_temperature
                                 ? monitor_record.dialysate_temperature
@@ -1779,7 +1783,8 @@
                               org_id != 10121 &&
                               org_id != 9675 && 
                               org_id!=10490 &&
-                              org_id!=10600
+                              org_id!=10600 &&
+                              org_id!=10644
                             "
                           >
                             {{
@@ -1883,7 +1888,9 @@
                               org_id == 9671 ||
                               org_id == 10600 ||
                               org_id ==10629 ||
-                              org_id ==10510
+                              org_id ==10510 ||
+                              org_id== 0 ||
+                              org_id ==10598
                             "
                           >
                             {{ monitor_record.ktv }}

src/xt_pages/dialysis/batch_print/batch_print_order_sixtyeight.vue

@@ -727,7 +727,9 @@
                           class="under_line"
                           style="width: 100px; text-align: center"
                         >
-                          /
+                        {{
+                          getDisplaceLiquiPart(record.prescription.displace_liqui_part)
+                        }}
                         </div>
                       </div>
                       <div
@@ -1748,7 +1750,7 @@
                               font-weight: 520;
                               font-size: 16px;
                               padding: 6px 8px;
-                              line-height: 30px;
+                              line-height: 24px;
                             "
                           >
                             医嘱内容
@@ -1785,7 +1787,7 @@
                             </td>
 
                             <td
-                              height="35px"
+                              height="26px"
                               colspan="2"
                               class="advice-name"
                               style="padding-left: 7px"
@@ -1809,7 +1811,7 @@
                               >
                               <span v-if="advice[0].single_dose != 0">
 
-                                <span v-if="advice[0].advice_name!='血液透析滤过'"> {{ advice[0].single_dose}}{{ advice[0].single_dose_unit }}</span>
+                                <span v-if="advice[0].advice_name!='血液透析滤过'&& advice[0].advice_name!='血液透析' && advice[0].advice_name!='电脑血糖监测'"> {{ advice[0].single_dose}}{{ advice[0].single_dose_unit }}</span>
                                 </span
                               >
 
@@ -3118,9 +3120,11 @@ export default {
         "腹痛",
       ],
       org_id: "",
+      displaceLiquiPartOptions:[]
     };
   },
   created() {
+    this.displaceLiquiPartOptions = this.$store.getters.displace_liqui;
     var bloodAccessParOpera = getDataConfig(
       "hemodialysis",
       "vascular_access_desc"
@@ -3233,11 +3237,8 @@ export default {
             }
 
             var delghTwo = 0;
-            if (
-              this.records[recordIndex].advices &&
-              this.records[recordIndex].advices.length < 10
-            ) {
-              delghTwo = 10 - this.records[recordIndex].advices.length;
+            if (this.records[recordIndex].advices &&this.records[recordIndex].advices.length < 18) {
+              delghTwo =  this.records[recordIndex].advices.length;
             } else {
               delghTwo = 0;
             }
@@ -3348,6 +3349,16 @@ export default {
       });
   },
   methods: {
+    getDisplaceLiquiPart: function (val) {
+      let displace_liqui_part_name = "/";
+      const displace_liqui_part = this.displaceLiquiPartOptions;
+      for (let i = 0; i < displace_liqui_part.length; i++) {
+        if (displace_liqui_part[i].id == val) {
+          displace_liqui_part_name = displace_liqui_part[i].name;
+        }
+      }
+      return displace_liqui_part_name;
+    },
     getUnit: function (val) {
       if (val.assessment_after_dislysis == null) {
         return "";

src/xt_pages/dialysis/details/index.vue

@@ -538,7 +538,10 @@
                 </div>
                 <div class="printCell" style="display:flex;" v-if="org_id ==10598 || org_id == 0">
                   <div style="">透析时长:
-                   <span>{{main_collection.prescription.dialysis_duration_hour }}小时 <span v-if="main_collection.prescription.dialysis_duration_minute>0">{{main_collection.prescription.dialysis_duration_minute }}分 </span></span>
+                   <span>{{main_collection.prescription.dialysis_duration_hour }}小时 <span v-if="main_collection.prescription.dialysis_duration_minute>0">{{main_collection.prescription.dialysis_duration_minute }}分 </span></span>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
+                  </div>
+                  <div style="">置换方式:
+                    {{ getDisplaceLiquiPart(main_collection.prescription.displace_liqui_part) }}
                   </div>
                 </div>
               </div>
@@ -1548,10 +1551,11 @@ export default {
       // end_time2:'',
       first_monitor:{},
       last_monitor:{},
+      displaceLiquiPartOptions:[]
     }
   },
   created() {
-
+   this.displaceLiquiPartOptions = this.$store.getters.displace_liqui;
    this.blood_access_part_opera = getDataConfig('hemodialysis', 'vascular_access_desc')
    this.org_id = this.$store.getters.xt_user.org.id,
    this.printDate = moment().format("YYYY-MM-DD HH:mm:ss")
@@ -1766,6 +1770,16 @@ export default {
     this.websocketSend(unObj)
   },
   methods: {
+    getDisplaceLiquiPart: function (val) {
+      let displace_liqui_part_name = "/";
+      const displace_liqui_part = this.displaceLiquiPartOptions;
+      for (let i = 0; i < displace_liqui_part.length; i++) {
+        if (displace_liqui_part[i].id == val) {
+          displace_liqui_part_name = displace_liqui_part[i].name;
+        }
+      }
+      return displace_liqui_part_name;
+    },
     getModeName(id){
         var name = ""
         if(id == 1){

src/xt_pages/dialysis/dialysisPrintOrder.vue

@@ -928,6 +928,18 @@
         >
         </div>
       </template>
+      <template v-if="org_template_info.template_id == 75">
+        <div>
+          <el-button
+          :loading="loading"
+          size="small"
+          icon="el-icon-printer"
+          @click="printThisPage"
+          type="primary"
+          >打印</el-button
+        >
+        </div>
+      </template>
     </div>
     <div class="app-container" style="min-height: 0">
       <!--<div class="order-print-btn"-->
@@ -1429,6 +1441,10 @@
             v-if="org_template_info.template_id == 74">
 
           </DialysisPrintOrderSop>
+          <DialysisPrintOrderseventyfive v-bind:childResponse="childResponse"
+            v-if="org_template_info.template_id == 75">
+
+          </DialysisPrintOrderseventyfive>
         </div>
       </el-container>
     </div>
@@ -1521,6 +1537,7 @@ import DialysisPrintOrderseventyone from './template/DialysisPrintOrderseventyon
 import DialysisPrintOrderSeventyTwo from './template/DialysisPrintOrderSeventyTwo'
 import DialysisPrintOrderSeventythree from './template/DialysisPrintOrderSeventythree'
 import DialysisPrintOrderSop from './template/DialysisPrintOrderSop'
+import DialysisPrintOrderseventyfive from './template/DialysisPrintOrderseventyfive'
 import DialysisPrintOrderZero from './template/DialysisPrintOrderZero'
 export default {
   name: "dialysisPrintOrder",
@@ -1599,6 +1616,7 @@ export default {
     DialysisPrintOrderSeventyTwo,
     DialysisPrintOrderSeventythree,
     DialysisPrintOrderSop,
+    DialysisPrintOrderseventyfive,
     DialysisPrintOrderZero,
     LabelBox,
     BreadCrumb,
@@ -1772,7 +1790,7 @@ export default {
       // if(this.$store.getters.xt_user.org.id == 0){
       //   this.org_template_info.template_id = 65
       // }
-
+      console.log('0000000011111',this.org_template_info.template_id);
       var ptime = Math.round(new Date().getTime() / 1000);
       this.print_time = uParseTime(ptime, "{y}-{m}-{d} {h}:{i}");
 
@@ -2274,6 +2292,13 @@ export default {
           style: style4,
           scanStyles: false,
         });
+      }else if (this.org_template_info.template_id == 75) {
+        printJS({
+          printable: "dialysis-print-box-1",
+          type: "html",
+          style: style2,
+          scanStyles: false,
+        });
       }
        else if (this.org_template_info.template_id == 199 ) {
         printJS({
@@ -2915,7 +2940,7 @@ export default {
     changePatient(schedual) {
       console.log('schedual',schedual);
       var xtdate = parseTime(schedual.schedule_date, "{y}-{m}-{d}");
-      console.log('fffff',this.org_template_info.template_id);
+      console.log('fffff打印单单号',this.org_template_info.template_id);
       this.x_tdate=xtdate
 
       // this.queryParams.xtdate = xtdate;

src/xt_pages/dialysis/template/DialysisPrintOrderSix.vue

@@ -1713,8 +1713,8 @@
                         <td width="60" v-if="org_id == 9836">体温(°C)</td>
                         <td width="60" v-if="org_id == 9919">血温(°C)</td>
                         <td width="60" v-if="org_id == 9671">血温(°C)</td>
-                        <td width="60" v-if="org_id!=9836&&org_id!=9919&&org_id!=9671">透析液温度(°C)</td>
-                        <td width="50" v-if="org_id != 10121 &&  org_id!=10600">
+                        <td width="60" v-if="org_id!=9836&&org_id!=9919&&org_id!=9671 && org_id!=10644">透析液温度(°C)</td>
+                        <td width="50" v-if="org_id != 10121 &&  org_id!=10600 && org_id!=10644">
                           <span v-if="org_id != 0 && org_id !=10469 && org_id!=10490 "> 电导度<br />(ms/cm)</span>
                           <span v-if="org_id ==10469"> 钠浓度<br />(mmol/L)</span>
                           <span v-if="org_id == 0 || org_id == 10490"> 置换液的速度<br />(ml/h)</span>
@@ -1729,8 +1729,8 @@
                           <span v-if="org_id!=10598">(ml)</span>
                           <span v-if="org_id==10598">(L)</span>
                         </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 || org_id ==10629 || org_id ==10510">KT/V</td>
+                        <td width="50" v-if="org_id == 3877 || org_id == 10449">滤前压(mmHg)</td>
+                        <td width="50" v-if="org_id == 9538 || org_id ==10600 || org_id ==10629 || org_id ==10510 || org_id == 10580 || org_id == 0 || org_id == 10598">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>
@@ -1812,7 +1812,7 @@
                           {{ monitor.temperature ? monitor.temperature : "" }}
                         </td>
 
-                         <td v-if="org_id!=9919 && org_id!=9671 && org_id!=9836">
+                         <td v-if="org_id!=9919 && org_id!=9671 && org_id!=9836 && org_id!=10644">
                           {{monitor.dialysate_temperature? monitor.dialysate_temperature: ""}}
                         </td>
 
@@ -1826,7 +1826,7 @@
                         </td>
 
 
-                        <td v-if="org_id != 9538 &&org_id != 10121 &&org_id!=10600">
+                        <td v-if="org_id != 9538 &&org_id != 10121 &&org_id!=10600 && org_id!=10644">
                           <span v-if="org_id!=0&&org_id!=10469 && org_id!=10490"> {{ monitor.conductivity ? monitor.conductivity : "" }}</span>
                           <span v-if="org_id==10469"> {{ monitor.sodium_concentration ? monitor.sodium_concentration : "" }}</span>
                           <span v-if="org_id==0||org_id==10490"> {{ monitor.replacement_speed ? monitor.replacement_speed : "" }}</span>
@@ -1867,7 +1867,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 || org_id ==10629 || org_id ==10510">
+                        <td width="50" v-if="org_id == 9919 || org_id == 9538 || org_id == 9671 || org_id ==10600 || org_id ==10629 || org_id ==10510 || org_id ==10580 || org_id == 0 || org_id ==10598">
                           {{ monitor.ktv?monitor.ktv:"" }}
                         </td>
                         <td width="50" v-if="org_id == 9538 || org_id == 9919 || org_id == 9671">
@@ -1967,7 +1967,7 @@
                           "
                           width="50"
                         ></td>
-                        <td v-if="org_id == 9919||org_id == 9538 || org_id == 9671"></td>
+                        <td v-if="org_id == 9919||org_id == 9538 || org_id == 9671 || org_id == 0"></td>
                         <td v-if="org_id == 9538"></td>
                         <td v-if="org_id == 10598 || org_id == 0"></td>
                         <td v-if="org_id == 10490 || org_id == 0"></td>

src/xt_pages/dialysis/template/DialysisPrintOrderSixtyeight.vue

@@ -1579,7 +1579,7 @@
                             }}{{ advice.prescribing_number_unit }}</span
                           >
                           <span v-if="advice.single_dose != 0">
-                            <span v-if="advice.advice_name!='血液透析滤过'">
+                            <span v-if="advice.advice_name!='血液透析滤过'&&advice.advice_name!='血液透析'&&advice.advice_name!='电脑血糖监测'">
                               {{ advice.single_dose}}{{ advice.single_dose_unit }}
                             </span>
                             </span>

src/xt_pages/outpatientCharges/allListTemplate/printFour.vue

@@ -1,6 +1,6 @@
 <template>
   <div id="allList-print" class="allList-print">
-    <div v-for='(i,index) in pageArr.length' :key="index">
+    <div v-for='(i,index) in pageArr.length' :key="index" style="page-break-after: always;">
       <div class="allListTitle">{{ $store.getters.xt_user.org.org_name }}费用汇总</div>
       <div class="allListInfo">
         <div>患者姓名：{{ patient.name }}</div>

src/xt_pages/outpatientDoctorStation/doctorDesk.vue

@@ -646,9 +646,14 @@
                 </div>
                 <div class="printCell" style="display:flex;" v-if="org_id ==10598 || org_id == 0">
                   <div style="">透析时长:
-                   <span>{{main_collection.prescription.dialysis_duration_hour }}小时 <span v-if="main_collection.prescription.dialysis_duration_minute>0">{{main_collection.prescription.dialysis_duration_minute }}分</span></span>
+                   <span>{{main_collection.prescription.dialysis_duration_hour }}小时 <span v-if="main_collection.prescription.dialysis_duration_minute>0">{{main_collection.prescription.dialysis_duration_minute }}分</span></span>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
+                  </div>
+                  <div style="">置换方式:
+                    {{ getDisplaceLiquiPart(main_collection.prescription.displace_liqui_part) }}
                   </div>
                 </div>
+
+               
               </div>
             </div>
           </div>
@@ -786,11 +791,22 @@ export default {
       patient_diagnoses: [],
       // zuobiao_project:[],
       befor:{},
-      LastCaseHistory:{}
+      LastCaseHistory:{},
+      displaceLiquiPartOptions:[],
     }
   },
 
   methods: {
+    getDisplaceLiquiPart: function (val) {
+      let displace_liqui_part_name = "/";
+      const displace_liqui_part = this.displaceLiquiPartOptions;
+      for (let i = 0; i < displace_liqui_part.length; i++) {
+        if (displace_liqui_part[i].id == val) {
+          displace_liqui_part_name = displace_liqui_part[i].name;
+        }
+      }
+      return displace_liqui_part_name;
+    },
     open_four(){
       this.$refs.prescriptions.getZuobiaoGoodStock()
       this.$refs.prescriptions.getZuobiaoDrugStock()
@@ -6072,6 +6088,7 @@ export default {
 
   },
   created() {
+    this.displaceLiquiPartOptions = this.$store.getters.displace_liqui;
     this.anticoagulants_confit = this.$store.getters.anticoagulants_confit
     this.printDate = moment().format('YYYY-MM-DD HH:mm:ss')
     this.$nextTick(() => {

src/xt_pages/outpatientDoctorStation/prescriptionTemplatedetail.vue

@@ -744,16 +744,16 @@
       },
 
       searchProjectAction() {
-
+        const tabProject1 = this.allProject
         if (this.search_project_keyword.length == 0) {
           this.tabProject = this.allProject
 
         } else {
           let arr = []
-          for (let i = 0; i < this.tabProject.length; i++) {
-            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])
+          for (let i = 0; i < tabProject1.length; i++) {
+            if (tabProject1[i].project_name.indexOf(this.search_project_keyword) != -1 ||
+            tabProject1[i].first_letter.indexOf(this.search_project_keyword) !=-1) {
+              arr = arr.concat(tabProject1[i])
             }
           }
           this.tabProject = arr
@@ -761,20 +761,20 @@
         }
       },
       searchAction() {
+        const drugs1 = this.allDrugs
         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) {
-              arr = arr.concat(this.drugs[i])
+          for (let i = 0; i < drugs1.length; i++) {
+            if (drugs1[i].drug_name.indexOf(this.search_keyword) != -1 ||
+            drugs1[i].wubi.indexOf(this.search_keyword) != -1 ||
+            drugs1[i].pinyin.indexOf(this.search_keyword) != -1 ||
+            drugs1[i].first_letter.indexOf(this.search_keyword) != -1) {
+              arr = arr.concat(drugs1[i])
             }
           }
           this.drugs = arr
-
         }
 
       },
@@ -810,6 +810,7 @@
         return getDictionaryDataConfig(module, filed_name)
 
       },
+      // 药品数据源
       getInitData() {
         getInitData().then(response => {
           if (response.data.state == 0) {
@@ -829,6 +830,7 @@
             }
 
             this.allDrugs = response.data.data.drugs
+            console.log('111111',response.data.data.drugs);
             this.advices_template = response.data.data.advices_template
             this.doctors = response.data.data.doctors
             for (let i = 0; i < this.doctors.length; i++) {
@@ -2463,6 +2465,7 @@
       this.getZuobiaoDrugStock()
       this.getZuobiaoGoodStock()
       this.getPrescriptionTemplateInfo()
+      // 获取所有药品
       this.getInitData()
       //获取所有项目
       this.getlist()

src/xt_pages/outpatientDoctorStation/template/prineight.vue

@@ -70,12 +70,15 @@
           <!-- 精二 -->
           <div style="border-bottom: 1px solid black;border-top: 1px solid black;width: 100%;"
             v-if="prescriptions[index].med_type == '1112'">
-            <div style="display: flex;">
-              <div style="flex: 1;">处方编号:</div>
+            <div style="display: flex;margin: 10px 0;">
+              <div style="flex: 1;">处方编号:
+                {{ item.prescription_number.substring(
+                  item.prescription_number.length - 6
+                ) }}</div>
               <div style="flex: 1;">日期:{{ getTime(item.ctime) ? getTime(item.ctime) : "" }}</div>
             </div>
             
-            <div  style="display: flex;margin: 10px 0;line-height: 24px;padding: 0 10px;">
+            <div  style="display: flex;padding: 0 10px;">
               <p style="width: 200px;">姓名:{{ item.patient.name ? item.patient.name : "" }}</p>
               <p style="width: 200px;">
                 性别:
@@ -98,7 +101,7 @@
             </div>
             <div style="display: flex;">
               <div style="flex: 1;">临床诊断:{{ getDiagnosis(item.info.diagnosis) }}</div>
-              <div style="flex: 1;">身份证号:</div>
+              <div style="flex: 1;">身份证号:{{item.patient.id_card_no}}</div>
             </div>
             <div style="flex: 2;margin: 10px 0;">住址/电话:{{ item.patient.home_address }}&nbsp;<span>{{ item.patient.phone }}</span></div>
             <div style="display: flex;">

src/xt_pages/user/dialysisRecord.vue

@@ -528,7 +528,7 @@ import { uParseTime } from "@/utils/tools";
 import { parseTime } from '@/utils'
 import { fetchAllDoctorAndNurse } from "@/api/doctor";
 import print from "print-js";
-
+const moment = require('moment')
 export default {
   name: "dialysisRecord",
   data() {
@@ -567,6 +567,7 @@ export default {
       dialysisShow:false,
 
       newTime:'',
+      org_id:0
 
     };
   },
@@ -607,11 +608,22 @@ export default {
     },
     getPatientDialysisRecords() {
       console.log("prams",this.queryParams)
+        if(this.org_id ==10679 || this.org_id == ""){
+          if( this.queryParams.start_time == ""){
+            this.queryParams.start_time = moment().month(moment().month() - 1).startOf('month').format('YYYY-MM-DD')
+          }
+          if(this.queryParams.end_time == ""){
+            this.queryParams.end_time =  moment().month(moment().month() - 1).endOf('month').format('YYYY-MM-DD') 
+          }
+               
+        }
+        console.log("hahahhaha",this.queryParams)
       getPatientDialysisRecords(this.queryParams).then(response => {
         if (response.data.state == 1) {
           this.total = response.data.data.total;
           this.recordData = response.data.data.records;
           console.log("郭23232323232232323",this.recordData)
+        
         }
       });
     },
@@ -895,6 +907,7 @@ export default {
 
     var xtuser = this.$store.getters.xt_user;
     this.orgname = xtuser.org.org_name;
+    this.org_id = this.$store.getters.xt_user.template_info.org_id;
 
   },mounted(){
 

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))