Merge remote-tracking branch 'origin/20230223_pc_vue_new_branch' into 20230223_pc_vue_new_branch

src/xt_pages/dialysis/batch_print/batch_print_order.vue

@@ -1055,6 +1055,7 @@
                           <td width="60" v-if="org_id == 9918 || org_id == 0">血温</td>
                           <td width="60" v-if="org_id == 9918 || org_id == 0">血容量</td>
                           <td width="60" v-if="org_id == 9987 || org_id == 9918 || org_id == 0">ktv</td>
+                          <td width="60" v-if="org_id == 9918 || org_id == 0">在线尿素监测</td>
                           <td>备注</td>
                         </tr>
                         <!-- </thead>
@@ -1162,6 +1163,9 @@
                           <td v-if="org_id == 9987 || org_id == 9918 || org_id == 0">
                             &nbsp;{{monitor_record.ktv?monitor_record.ktv:"/"}}
                           </td>
+                          <td width="60" v-if="org_id == 9918 || org_id == 0">
+                            {{ monitor_record.urea_monitoring?monitor_record.urea_monitoring:"/" }}
+                          </td>
                           <td>
                             {{ monitor_record.symptom }}
                             &nbsp;{{ monitor_record.dispose }} &nbsp;{{

src/xt_pages/dialysis/details/DialysisPrescription.vue

@@ -207,8 +207,8 @@
           <span class="content" v-if="getValueStr('anticoagulant', 'anticoagulant') != 1">{{ anticoagulant_shouji != "0" ? anticoagulant_shouji : "" }}</span>
           <span v-if="this.$store.getters.xt_user.template_info.org_id != 10101 && this.$store.getters.xt_user.template_info.template_id != 45">
             <span class="content" v-if="getValueStr('anticoagulant', 'anticoagulant') == 1" ></span>
-            <span class="unit"  v-if="getValueStr('anticoagulant', 'anticoagulant') == 2  && this.$store.getters.xt_user.template_info.template_id != 13  && this.$store.getters.xt_user.template_info.template_id != 23 && this.$store.getters.xt_user.template_info.template_id != 40 && this.$store.getters.xt_user.template_info.template_id != 38 && this.$store.getters.xt_user.template_info.template_id != 65 && this.$store.getters.xt_user.template_info.template_id!=0 && this.$store.getters.xt_user.template_info.org_id != 10600">{{ anticoagulant_shouji != "0" ? "iu" : "" }}</span>
-            <span class="unit"  v-if="getValueStr('anticoagulant', 'anticoagulant') == 2  && (this.$store.getters.xt_user.template_info.template_id == 13 ||  this.$store.getters.xt_user.template_info.template_id == 23 || this.$store.getters.xt_user.template_info.template_id == 40 || this.$store.getters.xt_user.template_info.template_id == 38  || this.$store.getters.xt_user.template_info.template_id == 65 ||  this.$store.getters.xt_user.template_info.template_id == 0 || this.$store.getters.xt_user.template_info.org_id == 10600)" >{{ anticoagulant_shouji != "0" ? "mg" : "" }}</span>
+            <span class="unit"  v-if="getValueStr('anticoagulant', 'anticoagulant') == 2  && this.$store.getters.xt_user.template_info.template_id != 13  && this.$store.getters.xt_user.template_info.template_id != 23 && this.$store.getters.xt_user.template_info.template_id != 40 && this.$store.getters.xt_user.template_info.template_id != 38 && this.$store.getters.xt_user.template_info.template_id != 65 && this.$store.getters.xt_user.template_info.template_id!=0 && this.$store.getters.xt_user.template_info.org_id != 10600&& this.$store.getters.xt_user.template_info.org_id != 10495">{{ anticoagulant_shouji != "0" ? "iu" : "" }}</span>
+            <span class="unit"  v-if="getValueStr('anticoagulant', 'anticoagulant') == 2  && (this.$store.getters.xt_user.template_info.template_id == 13 ||  this.$store.getters.xt_user.template_info.template_id == 23 || this.$store.getters.xt_user.template_info.template_id == 40 || this.$store.getters.xt_user.template_info.template_id == 38  || this.$store.getters.xt_user.template_info.template_id == 65 ||  this.$store.getters.xt_user.template_info.template_id == 0 || this.$store.getters.xt_user.template_info.org_id == 10600|| this.$store.getters.xt_user.template_info.org_id == 10495)" >{{ anticoagulant_shouji != "0" ? "mg" : "" }}</span>
             <span class="unit" v-if="getValueStr('anticoagulant', 'anticoagulant') == 3">
               <span v-if="this.$store.getters.xt_user.template_info.org_id == 9671">
                  {{ anticoagulant_shouji != "0" ? "mg" : "" }}
@@ -326,8 +326,8 @@
           <span class="content" v-if="getValueStr('anticoagulant', 'anticoagulant') != 1">{{ anticoagulant_weichi != "0" ? anticoagulant_weichi : "" }}</span>
           <span v-if="this.$store.getters.xt_user.template_info.org_id != 10101 && this.$store.getters.xt_user.template_info.template_id != 45">
             <span class="content" v-if="getValueStr('anticoagulant', 'anticoagulant') == 1"></span>
-            <span class="unit" v-if="getValueStr('anticoagulant', 'anticoagulant') == 2 && this.$store.getters.xt_user.template_info.template_id != 13 && this.$store.getters.xt_user.template_info.template_id != 23 && this.$store.getters.xt_user.template_info.template_id != 40 && this.$store.getters.xt_user.template_info.template_id != 38 && this.$store.getters.xt_user.template_info.template_id != 65 && this.$store.getters.xt_user.template_info.org_id!=10600 ">{{ anticoagulant_weichi != "0" ? "iu/h" : "" }}</span>
-            <span class="unit" v-if="getValueStr('anticoagulant', 'anticoagulant') == 2 && (this.$store.getters.xt_user.template_info.template_id == 13 ||  this.$store.getters.xt_user.template_info.template_id == 23 || this.$store.getters.xt_user.template_info.template_id == 40 || this.$store.getters.xt_user.template_info.template_id == 38 || this.$store.getters.xt_user.template_info.template_id == 65 || this.$store.getters.xt_user.template_info.org_id == 10600)">{{ anticoagulant_weichi != "0" ? "mg/h" : "" }}</span>
+            <span class="unit" v-if="getValueStr('anticoagulant', 'anticoagulant') == 2 && this.$store.getters.xt_user.template_info.template_id != 13 && this.$store.getters.xt_user.template_info.template_id != 23 && this.$store.getters.xt_user.template_info.template_id != 40 && this.$store.getters.xt_user.template_info.template_id != 38 && this.$store.getters.xt_user.template_info.template_id != 65 && this.$store.getters.xt_user.template_info.org_id!=10600&& this.$store.getters.xt_user.template_info.org_id!=10495 ">{{ anticoagulant_weichi != "0" ? "iu/h" : "" }}</span>
+            <span class="unit" v-if="getValueStr('anticoagulant', 'anticoagulant') == 2 && (this.$store.getters.xt_user.template_info.template_id == 13 ||  this.$store.getters.xt_user.template_info.template_id == 23 || this.$store.getters.xt_user.template_info.template_id == 40 || this.$store.getters.xt_user.template_info.template_id == 38 || this.$store.getters.xt_user.template_info.template_id == 65 || this.$store.getters.xt_user.template_info.org_id == 10600|| this.$store.getters.xt_user.template_info.org_id == 10495)">{{ anticoagulant_weichi != "0" ? "mg/h" : "" }}</span>
             <span class="unit" v-if="getValueStr('anticoagulant', 'anticoagulant') == 3">
               <span v-if="this.$store.getters.xt_user.template_info.org_id ==9671">
               {{ anticoagulant_weichi != "0" ? "mg/h" : "" }}

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

@@ -377,7 +377,7 @@
                     </el-col>
 
                     <el-col :span="8" v-if="anticoagulant!=undefined && anticoagulant.shouji != -1 && isShows('首剂')  && dialysisPrescription.anticoagulant!=1 && dialysisPrescription.anticoagulant!=12">
-                        <div v-if="this.$store.getters.xt_user.template_info.org_id != 10157 && this.$store.getters.xt_user.template_info.template_id != 54 && 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 != 9829 && this.$store.getters.xt_user.template_info.org_id != 10440 &&  this.$store.getters.xt_user.template_info.org_id != 10469 && this.$store.getters.xt_user.template_info.org_id != 10471 &&this.$store.getters.xt_user.template_info.org_id != 10495 &&this.$store.getters.xt_user.template_info.org_id != 10375 &&this.$store.getters.xt_user.template_info.org_id != 10600 && this.$store.getters.xt_user.template_info.org_id != 10702 && this.$store.getters.xt_user.template_info.org_id != 10510  && this.$store.getters.xt_user.template_info.org_id != 10480">
+                        <div v-if="this.$store.getters.xt_user.template_info.org_id != 10157 && this.$store.getters.xt_user.template_info.template_id != 54 && 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 != 9829 && this.$store.getters.xt_user.template_info.org_id != 10440 &&  this.$store.getters.xt_user.template_info.org_id != 10469 && this.$store.getters.xt_user.template_info.org_id != 10471 &&this.$store.getters.xt_user.template_info.org_id != 10495 &&this.$store.getters.xt_user.template_info.org_id != 10375 &&this.$store.getters.xt_user.template_info.org_id != 10600 && this.$store.getters.xt_user.template_info.org_id != 10702 && this.$store.getters.xt_user.template_info.org_id != 10510  && this.$store.getters.xt_user.template_info.org_id != 10480&& this.$store.getters.xt_user.template_info.org_id != 10495">
                          <div v-if="this.$store.getters.xt_user.template_info.org_id != 10101 &&this.$store.getters.xt_user.template_info.template_id != 45 &&this.$store.getters.xt_user.template_info.org_id != 10346 &&this.$store.getters.xt_user.template_info.org_id != 10387 &&this.$store.getters.xt_user.template_info.org_id != 10495 && this.$store.getters.xt_user.template_info.org_id != 10375 &&this.$store.getters.xt_user.template_info.org_id != 10551 && this.$store.getters.xt_user.template_info.org_id != 10600 && this.$store.getters.xt_user.template_info.org_id != 10510">
                             <el-form-item v-if='dialysisPrescription.anticoagulant != 1 && this.$store.getters.xt_user.template_info.template_id != 21 && this.$store.getters.xt_user.template_info.template_id != 23 && this.$store.getters.xt_user.template_info.template_id != 38 &&  this.$store.getters.xt_user.template_info.org_id != 9987 &&  this.$store.getters.xt_user.template_info.org_id!=9990' :label="'首剂(' + anticoagulant.shouji_unit + ') : '" prop="anticoagulant_shouji" :rules="isCheckmust('首剂')">
 
@@ -419,7 +419,8 @@
                                     this.$store.getters.xt_user.template_info.org_id ==10551 ||
                                     this.$store.getters.xt_user.template_info.org_id ==10600 ||
                                     this.$store.getters.xt_user.template_info.org_id ==10510 ||
-                                    this.$store.getters.xt_user.template_info.org_id ==10480
+                                    this.$store.getters.xt_user.template_info.org_id ==10480 ||
+                                    this.$store.getters.xt_user.template_info.org_id ==10495 
                                     '
                                     :label="'首剂(mg) : '" prop="anticoagulant_shouji" :rules="isCheckmust('首剂')">
                                 <el-input type="number" v-if="dialysisPrescription.anticoagulant != 1"
@@ -504,7 +505,7 @@
 
 
                     <el-col :span="8" v-if="anticoagulant!=undefined &&anticoagulant.weichi != -1 && isShows('维持')  && dialysisPrescription.anticoagulant!=1&& dialysisPrescription.anticoagulant!=12">
-                        <div v-if="this.$store.getters.xt_user.template_info.org_id != 10157  && this.$store.getters.xt_user.template_info.org_id != 9990 && this.$store.getters.xt_user.template_info.org_id != 9671  && 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 != 9829 && this.$store.getters.xt_user.template_info.org_id != 10440 && this.$store.getters.xt_user.template_info.org_id != 10469 && this.$store.getters.xt_user.template_info.org_id != 10471 && this.$store.getters.xt_user.template_info.org_id != 10495 && this.$store.getters.xt_user.template_info.org_id != 10375 && this.$store.getters.xt_user.template_info.org_id != 10600 && this.$store.getters.xt_user.template_info.org_id != 10702 && this.$store.getters.xt_user.template_info.org_id != 10510 && this.$store.getters.xt_user.template_info.org_id != 10480">
+                        <div v-if="this.$store.getters.xt_user.template_info.org_id != 10157  && this.$store.getters.xt_user.template_info.org_id != 9990 && this.$store.getters.xt_user.template_info.org_id != 9671  && 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 != 9829 && this.$store.getters.xt_user.template_info.org_id != 10440 && this.$store.getters.xt_user.template_info.org_id != 10469 && this.$store.getters.xt_user.template_info.org_id != 10471 && this.$store.getters.xt_user.template_info.org_id != 10495 && this.$store.getters.xt_user.template_info.org_id != 10375 && this.$store.getters.xt_user.template_info.org_id != 10600 && this.$store.getters.xt_user.template_info.org_id != 10702 && this.$store.getters.xt_user.template_info.org_id != 10510 && this.$store.getters.xt_user.template_info.org_id != 10480&& this.$store.getters.xt_user.template_info.org_id != 10495">
                           <div v-if="this.$store.getters.xt_user.template_info.org_id != 10101 && this.$store.getters.xt_user.template_info.template_id != 45 && this.$store.getters.xt_user.template_info.template_id != 54 && this.$store.getters.xt_user.template_info.org_id != 10346 && this.$store.getters.xt_user.template_info.org_id != 10387 && this.$store.getters.xt_user.template_info.org_id != 10495 && this.$store.getters.xt_user.template_info.org_id != 10375 ">
                             <el-form-item :label="'维持(' + anticoagulant.weichi_unit + ') : '"
                                           v-if="anticoagulant.weichi != -1 &&
@@ -519,6 +520,7 @@
                                             this.$store.getters.xt_user.template_info.org_id != 10551 &&
                                             this.$store.getters.xt_user.template_info.org_id != 10510 &&
                                             this.$store.getters.xt_user.template_info.org_id != 10480 &&
+                                            this.$store.getters.xt_user.template_info.org_id != 10495 &&
                                             this.$store.getters.xt_user.template_info.org_id != 10600" prop="anticoagulant_weichi" :rules="isCheckmust('维持')">
                                 <el-input type="number" v-if="dialysisPrescription.anticoagulant != 1"
                                           v-model="dialysisPrescription.anticoagulant_weichi"></el-input>
@@ -540,7 +542,8 @@
                                           this.$store.getters.xt_user.template_info.org_id == 10551 ||
                                           this.$store.getters.xt_user.template_info.org_id == 10600 ||
                                           this.$store.getters.xt_user.template_info.org_id == 10510 ||
-                                          this.$store.getters.xt_user.template_info.org_id == 10480
+                                          this.$store.getters.xt_user.template_info.org_id == 10480 ||
+                                          this.$store.getters.xt_user.template_info.org_id == 10495
                                           " prop="anticoagulant_weichi" :rules="isCheckmust('维持')">
                                 <el-input type="number" v-if="dialysisPrescription.anticoagulant != 1"
                                           v-model="dialysisPrescription.anticoagulant_weichi"></el-input>
@@ -630,7 +633,7 @@
                                           v-model="dialysisPrescription.no_anticoagulant_zongliang"></el-input>
                             </el-form-item>
                             <el-form-item
-                                    v-if='this.$store.getters.xt_user.template_info.template_id == 21 || this.$store.getters.xt_user.template_info.template_id == 23 || this.$store.getters.xt_user.template_info.template_id == 38||  this.$store.getters.xt_user.template_info.org_id == 9987 || this.$store.getters.xt_user.template_info.template_id == 54 || this.$store.getters.xt_user.template_info.org_id == 10346 || this.$store.getters.xt_user.template_info.org_id == 10387 || this.$store.getters.xt_user.template_info.org_id == 10495 || this.$store.getters.xt_user.template_info.org_id == 10375 || this.$store.getters.xt_user.template_info.org_id == 10551 || this.$store.getters.xt_user.template_info.org_id == 10600 || this.$store.getters.xt_user.template_info.org_id == 10510 || this.$store.getters.xt_user.template_info.org_id == 10480'
+                                    v-if='this.$store.getters.xt_user.template_info.template_id == 21 || this.$store.getters.xt_user.template_info.template_id == 23 || this.$store.getters.xt_user.template_info.template_id == 38||  this.$store.getters.xt_user.template_info.org_id == 9987 || this.$store.getters.xt_user.template_info.template_id == 54 || this.$store.getters.xt_user.template_info.org_id == 10346 || this.$store.getters.xt_user.template_info.org_id == 10387 || this.$store.getters.xt_user.template_info.org_id == 10495 || this.$store.getters.xt_user.template_info.org_id == 10375 || this.$store.getters.xt_user.template_info.org_id == 10551 || this.$store.getters.xt_user.template_info.org_id == 10600 || this.$store.getters.xt_user.template_info.org_id == 10510 || this.$store.getters.xt_user.template_info.org_id == 10480|| this.$store.getters.xt_user.template_info.org_id == 10495'
                                     :label="'总量(mg) : '" prop="anticoagulant_zongliang" :rules="isCheckmust('总量')">
                                 <el-input type="number" v-if="dialysisPrescription.anticoagulant != 1"
                                           v-model="dialysisPrescription.anticoagulant_zongliang"></el-input>

src/xt_pages/dialysis/template/DialysisPrintOrderOne.vue

@@ -604,6 +604,7 @@
               <td width="60" v-if="org_id == 9918 || org_id == 0">血温</td>
               <td width="60" v-if="org_id == 9918 || org_id == 0">血容量</td>
               <td width="60" v-if="org_id == 9987 || org_id == 9918 || org_id == 0">ktv</td>
+              <td width="60" v-if="org_id == 9918 || org_id == 0">在线尿素监测</td>
               
               <!-- <td width="60">钠浓度<br/>mmol/L</td>
             <td width="80">透析液温度<br/>℃</td>
@@ -666,6 +667,9 @@
               <td v-if="org_id == 9987 || org_id == 9918 || org_id == 0">
                 &nbsp;{{monitor.ktv?monitor.ktv:"/"}}
               </td>
+              <td width="60" v-if="org_id == 9918 || org_id == 0">
+              {{ monitor.urea_monitoring?monitor.urea_monitoring:"/" }}
+            </td>
               <td>
                 &nbsp;{{ monitor.symptom }} &nbsp;{{ monitor.dispose }} &nbsp;{{ monitor.result }}
               </td>

src/xt_pages/hospitalStation/batchStatementTemplate/hospitalBatchPrint.vue

@@ -1,6 +1,7 @@
 <template>
+  <div>
   <div id="statement-print" class="statement-print">
-    <div  v-for="(info,index) in infos">
+    <div v-for="(info,index) in infos">
     <div class="statementTitle">广东省社会医疗保险医疗费用结算单</div>
     <table class="statementTable" border="1">
       <tr>
@@ -312,6 +313,7 @@
     </table>
   </div>
   </div>
+  </div>
 </template>
 <script>
 

src/xt_pages/role/admin.vue

@@ -219,12 +219,12 @@
           @click="toCheckPDFInformation">PDF验证</el-button> -->
 
 
-          <!-- <el-button
+          <el-button
           type="primary"
           size="small"
           icon="el-icon-circle-plus-outline"
           style="float:left"
-          @click="toAutoDrug">自动生成</el-button> -->
+          @click="toAutoDrug">自动生成</el-button>
 
 
        <el-button
@@ -232,7 +232,7 @@
           size="small"
           icon="el-icon-circle-plus-outline"
           style="float:left"
-          @click="toAutoDiagnose">自动脚本</el-button> 
+          @click="toAutoDiagnose">自动脚本</el-button>
 
         <!-- <el-button
           type="primary"
@@ -248,7 +248,7 @@
           icon="el-icon-circle-plus-outline"
           style="float:left"
           @click="toCheckQuery">库存检验脚本</el-button> -->
-<!-- 
+<!--
         <el-button
           type="primary"
           size="small"

src/xt_pages/user/dialysisSolution.vue

@@ -346,7 +346,7 @@
             :span="8"
             v-if="anticoagulant.shouji != -1 && isShows('首剂')"
           >
-            <div v-if="this.$store.getters.xt_user.template_info.org_id == 10101">
+            <div v-if="this.$store.getters.xt_user.template_info.org_id == 10101 || this.$store.getters.xt_user.template_info.org_id == 10495">
               <el-form-item
                 :label="'首剂（mg）: '"
                 prop="anticoagulant_shouji"
@@ -389,7 +389,7 @@
             :span="8"
             v-if="anticoagulant.weichi != -1 && isShows('维持')"
           >
-            <div v-if="this.$store.getters.xt_user.template_info.org_id == 10101">
+            <div v-if="this.$store.getters.xt_user.template_info.org_id == 10101 || this.$store.getters.xt_user.template_info.org_id == 10495">
               <el-form-item
                 :label="'维持（mg/h）: '"
                 prop="anticoagulant_weichi"
@@ -430,7 +430,7 @@
             :span="8"
             v-if="anticoagulant.zongliang != -1 && isShows('总量')"
           >
-            <div v-if="this.$store.getters.xt_user.template_info.org_id == 10101">
+            <div v-if="this.$store.getters.xt_user.template_info.org_id == 10101 || this.$store.getters.xt_user.template_info.org_id == 10495">
               <el-form-item
                 :label="'总量（mg）: '"
                 prop="anticoagulant_zongliang"