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

src/router/modules/patient.js

@@ -326,17 +326,17 @@ export default {
     }
   },
 
-  // {//评估工具/跌倒评估
-  //   path: '/patients/patient/:id/Fallassessment',
-  //   component: () => import('@/xt_pages/user/evaluationtool/Fallassessment'),
-  //   hidden: true,
-  //   is_menu: false,
-  //   name: 'Fallassessment',
-  //   meta: {
-  //     title: 'firstDiseasePrint',
-  //     noCache: true
-  //   }
-  // },
+  { //评估工具/跌倒评估
+    path: '/patients/patient/:id/Fallassessment',
+    component: () => import('@/xt_pages/user/evaluationtool/Fallassessment'),
+    hidden: true,
+    is_menu: false,
+    name: 'Fallassessment',
+    meta: {
+      title: 'firstDiseasePrint',
+      noCache: true
+    }
+  },
   // {//小儿跌倒风险评估
   //   path: '/patients/patient/:id/pediatricFallAssessment',
   //   component: () => import('@/xt_pages/user/evaluationtool/pediatricFallAssessment'),

src/xt_pages/dialysis/batch_print/batch_print_order_sixtyeight.vue

@@ -2485,29 +2485,6 @@
                       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: 100px;
-                            line-height: 25px;
-                            text-align: left;
-                            margin-left: 2px;
-                            display: inline-block;
-                            white-space: normal;
-                          "
-                        >
-                          {{
-                            record.assessment_after_dislysis && record.assessment_after_dislysis.additional_weight
-                              ? record.assessment_after_dislysis.additional_weight
-                              : "/"
-                          }}
-                        </div>
-                      </div>
                       <div
                         class="inline_block"
                         style="flex: 1; display: inline-block"

src/xt_pages/dialysis/details/DialysisPrescription.vue

@@ -624,7 +624,7 @@
 
         <li v-if="isShow('冲洗量')">
           <label>Ns冲洗量(ml): </label>
-          <span class="content">{{this.prescription.chaptalization}}</span>
+          <span class="content">{{this.prescription.warsh_count}}</span>
         </li>
 
        

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

@@ -1116,13 +1116,13 @@
                 </el-row>
                 <el-row>
                   <el-col :span="8">
-                  <el-form-item label="Ns冲洗量(ml):" :prop="isName('冲洗量')" v-if="isShow('冲洗量') && dialysisPrescription.anticoagulant == 1">
+                  <el-form-item label="Ns冲洗量(ml):" :prop="isName('冲洗量')" v-if="isShows('冲洗量') && dialysisPrescription.anticoagulant == 1">
                     <el-input v-model="dialysisPrescription.warsh_count"></el-input>
                   </el-form-item>
                 </el-col>
 
                 <el-col :span="8">
-                  <el-form-item label="q(h):" :prop="isName('冲洗时间')" v-if="isShow('冲洗时间') && dialysisPrescription.anticoagulant == 1">
+                  <el-form-item label="q(h):" :prop="isName('冲洗时间')" v-if="isShows('冲洗时间') && dialysisPrescription.anticoagulant == 1">
                     <el-input v-model="dialysisPrescription.washing_time"></el-input>
                   </el-form-item>
                 </el-col>

src/xt_pages/outpatientDoctorStation/template/printOne.vue

@@ -39,7 +39,7 @@
               科室：{{ item.info ? getDepart(item.info.departments) : "" }}
             </div>
             <div style="margin-bottom: 10px" v-if="org_id == 10537">
-              医保卡号：{{item.patient.id_card_no}}
+              身份证号：{{item.patient.id_card_no}}
             </div>
             <div style="margin-bottom: 10px" v-else>
               医保卡号：

src/xt_pages/role/admin.vue

@@ -192,7 +192,7 @@
           size="small"
           icon="el-icon-circle-plus-outline"
           style="float:left"
-          @click="toSendInformaton">生成PDF</el-button> -->
+          @click="toSavePDFInformation">生成PDF</el-button> -->
      </div>
     
       
@@ -1057,7 +1057,9 @@ export default {
     toSavePDFInformation(){
       toSavePDFInformation().then(response=>{
          if(response.data.data == 1){
+          var information =  response.data.data.information
 
+           var orderId = response.data.data.orderId
          }
       })
     }