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

src/api/role/admin.js

@@ -108,4 +108,29 @@ export function toTestTwo(params){
     method:"get",
     params:params
   })
+}
+
+export function toTestThree(params){
+  return request({
+    url:"/api/sign/createuploadpact",
+    method:"get",
+    params:params,
+  })
+}
+
+export function toTestFour(params){
+  return request({
+    url:"/api/sign/createuserid",
+    method:"Get",
+    params:params
+  })
+} 
+
+export function toTestFive(params){
+  
+  return request({
+     url:"/api/sign/createenterpriserealname",
+     method:"Get",
+     params:params
+  })
 }

src/xt_pages/dialysis/batch_print/batch_print_order_six.vue

@@ -2571,7 +2571,7 @@
                     <div
                       class="row"
                       style="padding: 2px 0; line-height: 23px; display: flex"
-                      v-if="org_id == 10223"
+                      v-if="org_id == 10223 || org_id == 0 || org_id ==9538"
                     >
                       <div class="inline_block" style="flex: 1">
                         穿刺处血肿：

src/xt_pages/dialysis/batch_print/batch_print_order_sixtyFive.vue

@@ -78,13 +78,13 @@
               <div class="inline_block">
                 病区：
                 <div class="under_line" style="width: 50px; text-align: center">
-                  {{ "/" }}
+                  {{ record.device_zone.name?record.device_zone.name:"/" }}
                 </div>
               </div>
               <div class="inline_block">
                 床号：
                 <div class="under_line" style="width: 50px; text-align: center">
-                  {{ "/" }}
+                  {{ record.device_number.number?record.device_number.number:"/"}}
                 </div>
               </div>
               <div class="inline_block">
@@ -140,6 +140,31 @@
                 </div>
               </div>
             </div>
+
+            <div
+                class="row"
+                style="padding: 2px 0; line-height: 23px; display: flex"
+              >
+                <div
+                  class="inline_block"
+                  style="flex: 1; display: inline-block"
+                >
+                  身份证：
+                  <div
+                    class="under_line"
+                    style="
+                      width: 840px;
+                      line-height: 25px;
+                      text-align: left;
+                      margin-left: 2px;
+                      display: inline-block;
+                      white-space: normal;
+                    "
+                  >
+                    {{record.patient.id_card_no}}
+                  </div>
+                </div>
+              </div>
   
             <div
               class="row"
@@ -184,9 +209,9 @@
                             style="width: 70px; text-align: center"
                           >
                             {{
-                              record.patient.total_dialysis +
+                              record.Count +
                               record.patient.user_sys_before_count
-                                ? record.patient.total_dialysis +
+                                ?  record.Count +
                                   record.patient.user_sys_before_count
                                 : "/"
                             }}

src/xt_pages/dialysis/components/dialysisParametersDialog.vue

@@ -21,7 +21,8 @@
         type="date"
         format="yyyy-MM-dd"
         value-format="yyyy-MM-dd"
-        placeholder="选择日期">
+        placeholder="选择日期"
+        @change="selectEndtime">
         </el-date-picker>
         <el-button icon="el-icon-printer" type="primary" @click="toPrint">打印</el-button>
 
@@ -121,14 +122,18 @@ export default {
             })
         },
        selectStartime() {
-        this.start_time = parseTime(this.startTime, '{y}-{m}-{d}')
-        this.query.start_time = parseTime(this.startTime, '{y}-{m}-{d}')
+        // this.start_time = parseTime(this.startTime, '{y}-{m}-{d}')
+        // this.query.start_time = parseTime(this.startTime, '{y}-{m}-{d}')
+         this.start_time = this.startTime
+         this.query.start_time = this.startTime
         this.getlist()
 
       },
       selectEndtime() {
-        this.end_time = parseTime(this.endTime, '{y}-{m}-{d}')
-        this.query.end_time = parseTime(this.endTime, '{y}-{m}-{d}')
+        // this.end_time = parseTime(this.endTime, '{y}-{m}-{d}')
+        // this.query.end_time = parseTime(this.endTime, '{y}-{m}-{d}')
+        this.end_time = this.endTime
+        this.query.end_time = this.endTime
         this.getlist()
 
       },

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

@@ -1752,6 +1752,7 @@
         this.$router.push({path:"/dialysis/consumable/dialysis/count/print?schedule_type="+this.schedule_type+"&partion_type="+this.partion_type+"&schedule_date="+this.query.schedule_date})
       },
       handleSelectionChange(val){
+        
         var arr = []
         for(let i=0;i<val.length;i++){
           arr.push(val[i].id)

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

@@ -23,7 +23,7 @@
                 <div>
                  <span v-if="printObj.zone == 1">分区/</span>
                  <span v-if="printObj.number == 1">床位号:</span>
-                 <span v-if="printObj.zone == 1">{{main_collection.zone.name}}/</span> 
+                 <span v-if="printObj.zone == 1">{{main_collection.device_number.zone.name}}/</span> 
                  <span v-if="printObj.number == 1">{{main_collection.device_number.number}}</span>
                 </div>
                 <div>姓名:
@@ -297,12 +297,13 @@
       getlist(){
          var params = {
           schedule_type:this.schedule_type,
-          partion_id:this.partion_id,
+          partition_id:this.partion_id,
           schedule_date:this.schedule_date,
           keywords:this.keyword,
           page:this.page,
           limit:this.limit,
          }
+         console.log("param222222o2o2o",params)
         getDialysisParameter(params).then(response=>{
             if(response.data.state == 1){
               var list = response.data.data.list
@@ -402,7 +403,7 @@
         return type_name
       },
       getCurrentDate: function () {
-        console.log(this.$route.query.week_type)
+       
         var myDate = new Date();
         var year = myDate.getFullYear(); //年
         var month = myDate.getMonth() + 1; //月
@@ -436,19 +437,18 @@
         if(newday > dayNum){
           let lastDay = day - (newday - dayNum)
           console.log("lastDay1",lastDay)
-          var str = year + "年" + month + "月" + lastDay + "日  " + days;
+          var str = year + "年" + month + "月" + lastDay + "日  " 
           return str;
         }else if(newday < dayNum){
           let lastDay = day + (dayNum - newday)
           console.log("lastDay2",lastDay)
-          var str = year + "年" + month + "月" + lastDay + "日  " + days;
+          var str = year + "年" + month + "月" + lastDay + "日  " 
           return str;
         }else{
-          var str = year + "年" + month + "月" + day + "日  " + days;
+          var str = year + "年" + month + "月" + day + "日  " 
           return str;
         }
-
-
+        
       },
 
        compare(property) {

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

@@ -313,12 +313,14 @@
                         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 != 10495 &&
+                        this.$store.getters.xt_user.template_info.org_id != 10375">
                        <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 != 10495 &&
+                          this.$store.getters.xt_user.template_info.org_id != 10375 ">
                             <el-form-item
                                     v-if='dialysisPrescription.anticoagulant != 1 &&
                                     this.$store.getters.xt_user.template_info.template_id != 21 &&
@@ -363,7 +365,9 @@
                                     this.$store.getters.xt_user.template_info.org_id == 9987 ||
                                     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 ==10495 ||
+                                    this.$store.getters.xt_user.template_info.org_id ==10375
+                                    '
                                     :label="'首剂(mg) : '" prop="anticoagulant_shouji" :rules="isCheckmust('首剂')">
                                 <el-input type="number" v-if="dialysisPrescription.anticoagulant != 1"
                                           v-model="dialysisPrescription.anticoagulant_shouji"></el-input>
@@ -414,8 +418,8 @@
 
 
                     <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">
-                          <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 ">
+                        <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">
+                          <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 &&
                                            this.$store.getters.xt_user.template_info.template_id != 21 &&
@@ -424,7 +428,8 @@
                                             this.$store.getters.xt_user.template_info.org_id != 9987  &&
                                             this.$store.getters.xt_user.template_info.org_id != 54 &&
                                             this.$store.getters.xt_user.template_info.org_id != 9990 &&
-                                            this.$store.getters.xt_user.template_info.org_id != 10495" prop="anticoagulant_weichi" :rules="isCheckmust('维持')">
+                                            this.$store.getters.xt_user.template_info.org_id != 10495 &&
+                                            this.$store.getters.xt_user.template_info.org_id != 10375" prop="anticoagulant_weichi" :rules="isCheckmust('维持')">
                                 <el-input type="number" v-if="dialysisPrescription.anticoagulant != 1"
                                           v-model="dialysisPrescription.anticoagulant_weichi"></el-input>
                                 <el-input type="number" disabled v-if="dialysisPrescription.anticoagulant == 1"
@@ -440,7 +445,8 @@
                                           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 == 9990 ||
-                                          this.$store.getters.xt_user.template_info.org_id == 10495
+                                          this.$store.getters.xt_user.template_info.org_id == 10495 ||
+                                          this.$store.getters.xt_user.template_info.org_id == 10375
                                           " prop="anticoagulant_weichi" :rules="isCheckmust('维持')">
                                 <el-input type="number" v-if="dialysisPrescription.anticoagulant != 1"
                                           v-model="dialysisPrescription.anticoagulant_weichi"></el-input>
@@ -496,10 +502,10 @@
 
 
                     <el-col :span="8" v-if="anticoagulant!=undefined &&anticoagulant.zongliang != -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 != 9671 && this.$store.getters.xt_user.template_info.org_id != 9675 && 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">
+                        <div v-if="this.$store.getters.xt_user.template_info.org_id != 10157 && this.$store.getters.xt_user.template_info.org_id != 9671 && this.$store.getters.xt_user.template_info.org_id != 9675 && 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">
                           <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">
                             <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 != 9990 && this.$store.getters.xt_user.template_info.org_id != 10495'
+                                    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 != 9990 && this.$store.getters.xt_user.template_info.org_id != 10495 && this.$store.getters.xt_user.template_info.org_id != 10375'
                                     :label="'总量(' + anticoagulant.zongliang_unit + ') : '" prop="anticoagulant_zongliang" :rules="isCheckmust('总量')">
                                 <el-input type="number" v-if="dialysisPrescription.anticoagulant != 1"
                                           v-model="dialysisPrescription.anticoagulant_zongliang"></el-input>
@@ -507,7 +513,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 '
+                                    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 '
                                     :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/details/dialog/treatmentSummaryDialog.vue

@@ -59,7 +59,7 @@
           </el-form-item>
         </el-col>
       </el-row>
-      <el-button type="primary" size="small" @click="autoClick" style="margin-top: 5px;margin-bottom: 5px;" v-if="org_id ==9671 || org_id==10440 || org_id == 10495">自动生成</el-button>
+      <el-button type="primary" size="small" @click="autoClick" style="margin-top: 5px;margin-bottom: 5px;">自动生成</el-button>
       <el-row :gutter="20">
 
         <el-col v-if="isShow('透析小结')">

src/xt_pages/dialysis/template/DialysisPrintOrderSix.vue

@@ -2674,7 +2674,7 @@
                   <div
                     class="row"
                     style="padding: 2px 0; line-height: 23px; display: flex"
-                    v-if="org_id == 9538||org_id == 9675"
+                    v-if="org_id == 9538||org_id == 9675 || org_id == 0"
                   >
                     <div
                       class="inline_block"
@@ -2691,7 +2691,7 @@
                           white-space: normal;
                         "
                       >
-                        {{ lastafterdialysis.cvc_a ? lastafterdialysis.cvc_a : "/" }}
+                        {{ afterdialysis.cvc_a ? afterdialysis.cvc_a : "/" }}
                       </div>ml,V端<div
                         class="under_line"
                         style="
@@ -2703,7 +2703,7 @@
                           white-space: normal;
                         "
                       >
-                        {{ lastafterdialysis.cvc_v ? lastafterdialysis.cvc_v : "/" }}
+                        {{ afterdialysis.cvc_v ? afterdialysis.cvc_v : "/" }}
                       </div>ml
                       
                     </div>

src/xt_pages/dialysis/template/DialysisPrintOrderSixtyFive.vue

@@ -74,25 +74,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">{{
+              <span >{{
                 patientInfo.DialysisSchedule.device_zone.name
                   ? patientInfo.DialysisSchedule.device_zone.name
-                  : ""
+                  : "/"
               }}</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">{{
+              <span>{{
                 dialysisOrder &&
                 dialysisOrder.DeviceNumber &&
                 dialysisOrder.DeviceNumber.number.length > 0
                   ? dialysisOrder.DeviceNumber.number
                   : patientInfo.DialysisSchedule.device_number.number
               }}</span>
-              <span v-else>{{ "/" }}</span>
+              
             </div>
           </div>
           <div class="inline_block">
@@ -114,6 +114,30 @@
             </div>
           </div>
         </div>
+        <div
+            class="row"
+            style="padding: 2px 0; line-height: 23px; display: flex"
+            >
+              <div
+                class="inline_block"
+                style="flex: 1; display: inline-block"
+              >
+                身份证：
+                <div
+                  class="under_line"
+                  style="
+                    width: 860px;
+                    line-height: 25px;
+                    text-align: left;
+                    margin-left: 2px;
+                    display: inline-block;
+                    white-space: normal;
+                  "
+                >
+                  {{ patientInfo.id_card_no }}
+                </div>
+              </div>
+            </div>
         <div class="row">
           <div class="inline_block">
             入科方式：

src/xt_pages/outpatientCharges/outpatientChargesManagement.vue

@@ -1097,7 +1097,7 @@ export default {
         { value: '990602', label: '门诊特殊病(990602)' },
         { value: '1402', label: '门诊特殊病(1402)' },
         { value: '1401', label: '门诊慢性病(1401)' },
-
+        { value: '2302', label: '异地就医(2302)' },
         { value: '1111', label: '精一' },
         { value: '1112', label: '精二' },
         { value: '0', label: '自费' }
@@ -1112,6 +1112,8 @@ export default {
         { value: '990602', label: '门诊特殊病(990602)' },
         { value: '1402', label: '门诊特殊病(1402)' },
         { value: '1401', label: '门诊慢性病(1401)' },
+        { value: '2302', label: '异地就医(2302)' },
+
 
         { value: '0', label: '自费' }
 

src/xt_pages/outpatientDoctorStation/components/deskPrescription.vue

@@ -60,7 +60,7 @@
                   </el-form-item>
 
 
-                
+
 
 
                   <el-form-item label="过敏病史: " prop="name" label-position="right">
@@ -563,6 +563,7 @@ export default {
         { value: 990602, label: '门诊特殊病(990602)' },
         { value: 1402, label: '门诊特殊病(1402)' },
         { value: 1401, label: '门诊慢特病(1401)' },
+        { value: 2302, label: '异地就医(2302)' },
         { value: 1111, label: '精一' },
         { value: 1112, label: '精二' },
         { value: 0, label: '自费' }
@@ -2077,7 +2078,7 @@ export default {
         }
 
       }
-      
+
       // console.log("info233333333333333333333",info.id)
       // console.log("LAST_INFO2323232323WO",last_info.patient_diagnosis)
       this.patient_diagnose = []
@@ -2094,13 +2095,13 @@ export default {
       }
 
       if(info.id > 0){
-       
+
         if (info.patient_diagnosis.length == 0) {
           this.patient_diagnose = []
         } else {
           this.patient_diagnose = []
           for (let i = 0; i < info.patient_diagnosis.split(",").length; i++) {
-           
+
             if(info.patient_diagnosis.split(',')[i].length > 0) {
               this.patient_diagnose.push(parseInt(info.patient_diagnosis.split(',')[i]))
             }
@@ -2387,7 +2388,7 @@ export default {
               reg_type: this.register_type,
               patient_diagnose:str
             }
-            
+
             for (let i = 0; i < this.prescriptions.length; i++) {
               if (this.prescriptions[i].advices.length > 0 && this.prescriptions[i].project.length == 0) {
                 this.prescriptions[i]['type'] = 1
@@ -2427,7 +2428,7 @@ export default {
                   this.$emit('editKeepLoad', false)
                   return
                 }
-          
+
 
                 if(this.prescriptions[i].advices[b].prescribing_number == ""){
                   this.$message.error(`处方${i+1}的${this.prescriptions[i].advices[b].drug_name}总量未填写`)
@@ -2800,7 +2801,7 @@ export default {
             this.$message.error('科室不能为空')
             return
           }
-          
+
           var str = ""
           if(patient_diagnose!=""){
              str = this.patient_diagnose.join(',')

src/xt_pages/outpatientDoctorStation/treatTemplate/printOne.vue

@@ -331,6 +331,19 @@
             console.log('所有项目列表', projectlist)
             this.projectList = projectlist
             this.hisPatient = response.data.data.hisPatient
+            this.advicePrint.map((item) => {
+              console.log(item.project.length);
+              if (item.project.length > 0) {
+                for (var i = item.project.length - 1; i >= 0; i--) {
+                  if (item.project[i].type == 2) {
+                    if (item.project[i].project.cost_classify == 3) {
+                      console.log("!1111111")
+                      item.project.splice(i, 1);
+                    }
+                  }
+                }
+              }
+            });
 
           }
         })

src/xt_pages/outpatientDoctorStation/treatTemplate/printTwo.vue

@@ -490,6 +490,7 @@ export default {
               for (var i = item.project.length - 1; i >= 0; i--) {
                 if (item.project[i].type == 2) {
                   if (item.project[i].project.cost_classify == 3) {
+                    console.log("!1111111")
                     item.project.splice(i, 1);
                   }
                 }

src/xt_pages/role/admin.vue

@@ -28,7 +28,22 @@
           size="small"
           icon="el-icon-circle-plus-outline"
           style="float:left"
-          @click="toTestOne">个人用户实名</el-button> -->
+          @click="toTestOne">创建个人用户实名</el-button> -->
+
+          <!-- <el-button
+          type="primary"
+          size="small"
+          icon="el-icon-circle-plus-outline"
+          style="float:left"
+          @click="toTestFive">创建企业用户并实名</el-button> -->
+
+
+          <!-- <el-button
+          type="primary"
+          size="small"
+          icon="el-icon-circle-plus-outline"
+          style="float:left"
+          @click="toTestFour">添加企业成员</el-button> -->
          
           <!-- <el-button
           type="primary"
@@ -36,6 +51,20 @@
           icon="el-icon-circle-plus-outline"
           style="float:left"
           @click="toTestTwo">创建个人印章</el-button> -->
+
+           <!-- <el-button
+          type="primary"
+          size="small"
+          icon="el-icon-circle-plus-outline"
+          style="float:left"
+          @click="toTestThree">创建合同</el-button> -->
+
+          <!-- <el-button
+          type="primary"
+          size="small"
+          icon="el-icon-circle-plus-outline"
+          style="float:left"
+          @click="toTestSeven">添加合同签署人</el-button> -->
           
      </div>
     
@@ -191,7 +220,7 @@
 </template>
 
 <script>
-import { adminMainView, getAdmins, setAdminStatus,toSign,toTestOne,toTestTwo } from "@/api/role/admin";
+import { adminMainView, getAdmins, setAdminStatus,toSign,toTestOne,toTestTwo,toTestThree,toTestFour,toTestFive } from "@/api/role/admin";
 import { getRoles } from "@/api/role/role";
 
 import { parseTime } from "@/utils";
@@ -504,6 +533,38 @@ export default {
           console.log("sign",sign)
         }
       })
+    },
+    toTestThree(){
+      toTestThree().then(response=>{
+        if(response.data.state ==1){
+          var sign = response.data.data.sign
+          console.log("sign",sign)
+        }
+      })
+    },
+    toTestFour(){
+      toTestFour().then(response=>{
+        if(response.data.state==1){
+          var sign =  response.data.data.sign
+          console.log("sign",sign)
+        }
+      })
+    },
+    toTestFive(){
+      toTestFive().then(response=>{
+        if(response.data.state==1){
+          var sign =  response.data.data.sign
+          console.log("sign",sign)
+        }
+      })
+    },
+    toTestSeven(){
+      toTestSeven().then(response=>{
+        if(response.data.state ==1){
+          var sign =  response.data.data.sign
+          console.log("sign",sign)
+        }
+      })
     }
   },
   watch: {

src/xt_pages/user/components/PatientForm.vue

@@ -1504,6 +1504,11 @@ export default {
          this.form.past_history = "既往否认冠心病、糖尿病等慢性疾病；否认肝炎、结核、艾滋、梅毒等传染病史；否认药物、食物过敏史；无重大手术、外伤史。"
          this.form.present_history = "患者于30年前体检查尿蛋白+，行肾穿刺活检，病理结果示：IgA肾病，此后于香港当地医院规范治疗，定时复查，至2021年12月复查发现血肌酐渐升高，300+umol/L，血压高于正常，开始为肾透析行右前臂自体动静脉内瘘成形术，1年前导入透析治疗，每周2次，每次5小时，规律维持至今。平素无胸闷、心慌，无咳嗽、咳痰，无恶心、呕吐，饮食、睡眠可，尿量约1000ml/日。本次检查感染四项阴性，血红蛋白103g/L，PTH 28.2pmol/L， Ca 2.17mmol/L ，P 1.57mmol/L。"
          this.form.remark = "神志清，精神可，体型肥胖，面色黝黑，颜面、眼睑无浮肿，皮肤未见出血点、瘀斑；胸廓对称，心前区无隆起，心界向左扩大，心音有力，节律规整，未闻及明显杂音，双肺呼吸音粗；腹部呈脂肪堆积，腹软，无包块、无皮疹、无静脉曲张、无压痛；脊柱、四肢未见畸形，关节活动正常，肌力正常；双下肢无明显水肿；右前臂自体动静脉内瘘能触及震颤、闻及连续杂音。"
+         this.form.temperature = 36.5
+         this.form.pulse=75
+         this.form.respiratory = 20
+         this.form.sbp=150
+         this.form.dbp = 80
       }
     }
 

src/xt_pages/user/inspection.vue

@@ -119,7 +119,7 @@
             }"
               :row-style="{ color: '#303133' }"
               :data="items"
-              border
+              border=""
               style="width: 100%"
               id="user-inspection-order"
 
@@ -131,7 +131,7 @@
                 min-width="180"
               >
                 <template slot-scope="scope">
-                  {{ scope.row.item_name }} {{ scope.row.item_name_addition }}
+                 <span v-if="scope.row.item_name!=''"> {{ scope.row.item_name }} {{ scope.row.item_name_addition }}</span> 
                 </template>
               </el-table-column>
 
@@ -1220,6 +1220,7 @@ export default {
       this.$refs[formName].resetFields()
     },
     handleCurrentChange(row) {
+      console.log("row-2-23-23-",row)
       this.itemDate = ''
       this.form.method = 'add'
       if (typeof row === 'undefined' || row == null) {
@@ -1236,6 +1237,7 @@ export default {
         this.queryParams.project_id = this.project.project_id
         this.queryParams.page = 1
         this.total = 0
+        console.log("wowowowowow")
         this.fetchPatientInspections(this.queryParams)
       }
     },
@@ -1278,6 +1280,7 @@ export default {
             }
 
             this.inspections = response.data.data.inspections
+            console.log("this.inpections",this.inspections)
             if (inspections == null) {
               this.inspections = []
               return false
@@ -1285,27 +1288,44 @@ export default {
             var inspectionsMap = {}
             this.inspectionsMap = {}
             for (var index in inspections) {
+
               inspectionsMap[inspections[index].item_id] = inspections[index]
               this.inspectionsMap[inspections[index].item_id] = inspections[index]
             }
-
+            console.log("inspectionsMap",this.inspectionsMap)
             var items = this.project.inspection_reference
+            console.log("i5ems2323232wo",items)
             for (var index in items) {
+             
+             console.log("obj",items[index])
+              // console.log("inspectionsMap",inspectionsMap[items[index].item_id])
               var item = {}
+            
               for (var key in items[index]) {
+                //  console.log("key",key,items[index][key])
+                //  console.log("item[key]",item[key])
                 item[key] = items[index][key]
               }
+             
               if (item.item_id > 0) {
-                if (inspectionsMap[items[index].item_id] == undefined) {
-                  item.value = inspectionsMap[items[index].id].inspect_value
-                  item.item_name = inspectionsMap[items[index].id].item_name
+                 
+                if (typeof(inspectionsMap[parseInt(items[index].item_id)])  == "undefined") {
+                  
+                  // item.value = inspectionsMap[items[index].id].inspect_value
+                  // item.item_name = inspectionsMap[items[index].id].item_name
+
+                  item.value = ""
+                  item.item_name = ""
+              
 
                 } else {
+                 
                   item.value = inspectionsMap[items[index].item_id].inspect_value
                   item.item_name = inspectionsMap[items[index].item_id].item_name
 
                 }
               } else {
+               
                 item.value = inspectionsMap[items[index].id].inspect_value
                 item.item_name = inspectionsMap[items[index].id].item_name
 
@@ -1323,8 +1343,9 @@ export default {
                   item.value_direction = '↑'
                 }
               }
+              console.log("items23233232",item)
               this.items.push(item)
-
+              console.log("items232232332wo",this.items)
 
               if(item.value.indexOf("http") >= 0){
                 this.isPic = true