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_six.vue

@@ -93,7 +93,7 @@
                 {{ record.device_number.number }}
               </div>
             </div>
-            <div class="inline_block">
+            <div class="inline_block" v-if="org_id!=10683">
               透析号：
               <div class="under_line" style="width: 70px; text-align: center">
                 {{ record.patient.dialysis_no }}
@@ -1459,6 +1459,23 @@
                         </div>
                       </div>
 
+                      <div class="inline_block" style="margin-left: 20px">
+                        上机时间：
+                        <div
+                          class="under_line"
+                          style="width: 50px; text-align: center"
+                        >
+                          {{
+                            record.dialysis_order &&
+                            record.dialysis_order.device_number &&
+                            record.dialysis_order.device_number.number.length >
+                              0
+                              ? record.dialysis_order.device_number.number
+                              : record.device_number.number
+                          }}
+                        </div>
+                      </div>
+
                       
                       <div
                         class="row"
@@ -1910,7 +1927,7 @@
                               >
                                 <template
                                   v-if="
-                                    record.dialysis_order &&
+                                    record.dialysis_order && org_id!=10683 &&
                                     monitor_record.operate_time ==
                                       record.dialysis_order.start_time
                                   "
@@ -2597,7 +2614,7 @@
                   {{ "/" }}
                 </div>
               </div>
-              <div class="inline_block">
+              <div class="inline_block" v-if="org_id!=10683">
                 透析号：
                 <div class="under_line" style="width: 70px; text-align: center">
                   {{ record.patient.dialysis_no }}
@@ -3806,15 +3823,24 @@ export default {
             for(let j=0;j<this.records[i].monitor_records.length;j++){
               this.records[i].monitor_records[j].end = ""
               if (this.records[i].dialysis_order &&this.records[i].monitor_records[j].operate_time ==  this.records[i].dialysis_order.end_time) {
-              this.records[i].monitor_records[j].end = "【结束透析】";
-              tempmonitorflag = false;
+                if(this.org_id!=10683){
+                  this.records[i].monitor_records[j].end = "【结束透析】";
+                }
+              
+               tempmonitorflag = false;
             }
             if(this.org_id!=10515 && this.org_id!=0){
               if (tempmonitorflag && j == this.records[i].monitor_records.length - 1) {
-              this.records[i].monitor_records[j].end = "【结束透析】";
+                if(this.org_id!=10683){
+                  this.records[i].monitor_records[j].end = "【结束透析】";
+                }
+              
              }
              if(this.records[i].monitor_records[this.records[i].monitor_records.length - 1].end == ""){
-               this.records[i].monitor_records[this.records[i].monitor_records.length - 1].end = "【结束透析】"
+               if(this.org_id!=10683){
+                  this.records[i].monitor_records[this.records[i].monitor_records.length - 1].end = "【结束透析】"
+               }
+              
              }
             }
             

src/xt_pages/dialysis/template/DialysisPrintOrderFiftySeven.vue

@@ -763,6 +763,10 @@
               <span v-if="advice.advice_name!=undefined">{{
                 advice.execution_frequency
               }}</span>
+
+              <span v-if="advice.advice_name!=undefined">{{
+                advice.remark
+              }}</span>
             </td>
             <td>
               <span v-if="setAdminUserES(advice.execution_staff) == ''">

src/xt_pages/dialysis/template/DialysisPrintOrderSix.vue

@@ -103,7 +103,7 @@
               <span>{{ "/" }}</span>
             </div>
           </div>
-          <div class="inline_block">
+          <div class="inline_block" v-if="org_id!=10683">
             透析号：
             <div class="under_line" style="width: 70px; text-align: center">
               {{ patientInfo.dialysis_no }}
@@ -1511,6 +1511,16 @@
                         }}
                       </div>
                     </div>
+
+                    <div class="inline_block" style="margin-left: 20px">
+                      上机时间：
+                      <div
+                        class="under_line"
+                        style="width: 50px; text-align: center"
+                      >
+                        {{getTime(dialysisOrder.start_time, "{h}:{i}")}}
+                      </div>
+                    </div>
                   </div>
 
                   <div class="row" style="padding: 2px 0; line-height: 23px" v-if=" org_id == 3877  || org_id == 9671">
@@ -1906,7 +1916,7 @@
                                 v-if="
                                   (dialysisOrder &&
                                   monitor.operate_time ==
-                                    dialysisOrder.start_time)&&(org_id!=10414)
+                                    dialysisOrder.start_time)&&(org_id!=10414) && (org_id!=10683)
                                 "
                                 >【开始透析】 <span v-if="org_id ==10598">引血100ml/min</span>
                                 </template>
@@ -2521,7 +2531,7 @@
               <span>{{ "/" }}</span>
             </div>
             </div>
-            <div class="inline_block">
+            <div class="inline_block" v-if="org_id!=10683">
               透析号：
               <div class="under_line" style="width: 70px; text-align: center">
                 {{ patientInfo.dialysis_no }}
@@ -4661,15 +4671,17 @@ export default {
           const monitor = this.monitors[index];
           this.monitors[index].end = "";
           if (Object.keys(monitor).length > 0 && index > 1) {
-            if (
-              (this.dialysisOrder &&
-              monitor.operate_time == this.dialysisOrder.end_time)&&(this.org_id!=10414)
-            ) {
-              this.monitors[index].end = "【结束透析】";
+            if ((this.dialysisOrder &&monitor.operate_time == this.dialysisOrder.end_time)&&(this.org_id!=10414)) {
+              if(this.org_id!=10683){
+                this.monitors[index].end = "【结束透析】";
+              }
+              
               tempmonitorflag = false;
             }
             if ((tempmonitorflag && index == this.monitors.length - 1)&&(this.org_id!=10414)) {
-              this.monitors[index].end = "【结束透析】";
+              if(this.org_id!=10683){
+                this.monitors[index].end = "【结束透析】";
+              }
             }
           }
         }

src/xt_pages/hospitalStation/index.vue

@@ -242,10 +242,12 @@ export default {
       loadingone: false,
       read_loading: false,
       registers: [
+        { value: 240101, label: '门诊视同住院' },
         { value: 21, label: '普通住院' },
         // {value: 12, label: '门诊挂号'},
         // {value: 13, label: '急诊'},
         { value: 14, label: '门诊慢性病' }
+
         // {value: 15, label: '门诊统筹'},
         // {value: 16, label: '门诊慢性病'},
         // {value: 21, label: '普通住院'}

src/xt_pages/user/vascularAccess.vue

@@ -158,7 +158,7 @@
               </el-col>
               <el-col :span="8">
                 <el-form-item label="血管通路类型:" :required="true" prop="blood_access_part_opera_id">
-                  <el-select v-model="form.blood_access_part_opera_id" placeholder="请选择"  style="width:200px">
+                  <el-select v-model="form.blood_access_part_opera_id" placeholder="请选择"  style="width:200px" clearable>
                       <el-option
                           v-for="item in blood_access_part_opera"
                           :key="item.id"
@@ -203,7 +203,7 @@
               </el-col>
               <el-col :span="8">
                 <el-form-item label="使用状态:" :required="true" prop="user_status">
-                  <el-select v-model="form.user_status" placeholder="请选择" style="width:200px" @change="changeStatus">
+                  <el-select v-model="form.user_status" placeholder="请选择" style="width:200px" @change="changeStatus" clearable>
                       <el-option
                           v-for="item in options"
                           :key="item.id"
@@ -217,7 +217,7 @@
           <el-row :gutter="24" v-show="showOne">
               <el-col :span="8">
                 <el-form-item label="导管感染转归:">
-                    <el-select v-model="form.ci_type" placeholder="请选择" style="width:200px" @change="changeStatus">
+                    <el-select v-model="form.ci_type" placeholder="请选择" style="width:200px" @change="changeStatus" clearable>
                       <el-option
                             v-for="item in optionsTwo"
                             :key="item.id"
@@ -229,7 +229,7 @@
               </el-col>
               <el-col :span="8">
                 <el-form-item label="血培养检查结果:">
-                    <el-select v-model="form.blood_cultupe" placeholder="请选择" style="width:200px" @change="changeStatus">
+                    <el-select v-model="form.blood_cultupe" placeholder="请选择" style="width:200px" @change="changeStatus" clearable>
                       <el-option
                             v-for="item in optionsThree"
                             :key="item.id"
@@ -241,7 +241,7 @@
               </el-col>
               <el-col :span="8">
                 <el-form-item label="患者导管转归类型:">
-                    <el-select v-model="form.sequelae_type" placeholder="请选择" style="width:200px" @change="changeStatus">
+                    <el-select v-model="form.sequelae_type" placeholder="请选择" style="width:200px" @change="changeStatus" clearable>
                       <el-option
                             v-for="item in optionsOne"
                             :key="item.id"
@@ -321,7 +321,7 @@
             </el-col>
              <el-col :span="8">
                <el-form-item label="血管通路类型:" :required="true" prop="blood_access_part_opera_id">
-                 <el-select v-model="form.blood_access_part_opera_id" placeholder="请选择"  style="width:150px">
+                 <el-select v-model="form.blood_access_part_opera_id" placeholder="请选择"  style="width:150px" clearable>
                     <el-option
                         v-for="item in blood_access_part_opera"
                         :key="item.id"
@@ -375,7 +375,7 @@
             </el-col>
              <el-col :span="8">
                <el-form-item label="使用状态:" :required="true" prop="user_status">
-                 <el-select v-model="form.user_status" placeholder="请选择" style="width:150px" @change="changeStatus">
+                 <el-select v-model="form.user_status" placeholder="请选择" style="width:150px" @change="changeStatus" clearable>
                     <el-option
                         v-for="item in options"
                         :key="item.id"
@@ -389,7 +389,7 @@
            <el-row v-show="showOne">
             <el-col :span="8">
                <el-form-item label="导管感染转归:">
-                  <el-select v-model="form.ci_type" placeholder="请选择" style="width:150px" @change="changeStatus">
+                  <el-select v-model="form.ci_type" placeholder="请选择" style="width:150px" @change="changeStatus" clearable>
                      <el-option
                            v-for="item in optionsTwo"
                            :key="item.id"
@@ -401,7 +401,7 @@
              </el-col>
              <el-col :span="8">
                <el-form-item label="血培养检查结果:">
-                  <el-select v-model="form.blood_cultupe" placeholder="请选择" style="width:150px" @change="changeStatus">
+                  <el-select v-model="form.blood_cultupe" placeholder="请选择" style="width:150px" @change="changeStatus" clearable>
                      <el-option
                            v-for="item in optionsThree"
                            :key="item.id"