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

@@ -301,9 +301,8 @@
                 <div style="flex: 1;">
                   处方脱水量
                   <span class="under-line" style="display: inline-block;width: 50%;">
-                    {{ record.prescription && record.prescription.target_ultrafiltration
-                      ? record.prescription.target_ultrafiltration : "/"
-                    }}L
+                    <span v-if="org_id==10617">{{ record.prescription.target_ultrafiltration ? record.prescription.target_ultrafiltration : "/" }}L</span>
+                     <span v-if="org_id==10612">{{ record.prescription.prescription_water ? record.prescription.prescription_water : "/" }}L</span>
                   </span>
                 </div>
                 <div style="flex: 1;">

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

@@ -408,7 +408,7 @@
           <el-form-item label="透析中进食(ml): " v-if="template_id != 36 && template_id!=6" :prop="isName('透析中进食')" :rules="isCheckmust('透析中进食')">
             <el-input v-model="form.dialysis_during"></el-input>
           </el-form-item>
-          <el-form-item label="透析中进食(g): " v-if="template_id == 36 || template_id == 6" :prop="isName('透析中进食')" :rules="isCheckmust('透析中进食')" >
+          <el-form-item label="透析中进食(kg): " v-if="template_id == 36 || template_id == 6" :prop="isName('透析中进食')" :rules="isCheckmust('透析中进食')" >
             <el-input v-model="form.dialysis_during"></el-input>
           </el-form-item>
         </el-col>

src/xt_pages/dialysis/template/DialysisPrintOrderseventyone.vue

@@ -143,7 +143,8 @@
           <div style="flex: 1;">
             处方脱水量
             <span class="under-line" style="display: inline-block;width: 50%;">
-              {{ prescription.target_ultrafiltration ? prescription.target_ultrafiltration : "/" }}L
+              <span v-if="org_id==10617">{{ prescription.target_ultrafiltration ? prescription.target_ultrafiltration : "/" }}L</span>
+              <span v-if="org_id==10612">{{ prescription.prescription_water ? prescription.prescription_water : "/" }}L</span>
             </span>
           </div>
           <div style="flex: 1;">

src/xt_pages/user/components/PatientSidebar.vue

@@ -204,68 +204,68 @@ export default {
             },
           ]
         },
-        {
-          name: '5',
-          label: '评估工具',
-          children: [
-            {
-              name: '5-1',
-              label: '跌倒评估'
-            },
-            {
-              name: '5-2',
-              label: '小儿跌倒风险评估'
-            },
-            {
-              name: '5-3',
-              label: '压疮风险评估'
-            },
-            {
-              name: '5-4',
-              label: 'OH压疮评估'
-            },
-            {
-              name: '5-5',
-              label: '日常生活能力评估'
-            },
-            {
-              name: '5-6',
-              label: '导管脱落风险评估'
-            },
-            {
-              name: '5-7',
-              label: 'RASS及疼痛评估'
-            },
-            {
-              name: '5-8',
-              label: '营养状况评估'
-            },
-            {
-              name: '5-9',
-              label: '约束告知单'
-            },
-            {
-              name: '5-10',
-              label: '心理评估'
-            },
-            {
-              name: '5-11',
-              label: '瘙痒评估'
-            },
-            {
-              name: '5-12',
-              label: '血液透析患者评估'
-            },
-            {
-              name: '5-13',
-              label: 'Glasgow昏迷评分量表'
-            },
-            {
-              name: '5-14',
-              label: '肌力评估表'
-            },
-          ]
-        },
+        // {
+        //   name: '5',
+        //   label: '评估工具',
+        //   children: [
+        //     {
+        //       name: '5-1',
+        //       label: '跌倒评估'
+        //     },
+        //     {
+        //       name: '5-2',
+        //       label: '小儿跌倒风险评估'
+        //     },
+        //     {
+        //       name: '5-3',
+        //       label: '压疮风险评估'
+        //     },
+        //     {
+        //       name: '5-4',
+        //       label: 'OH压疮评估'
+        //     },
+        //     {
+        //       name: '5-5',
+        //       label: '日常生活能力评估'
+        //     },
+        //     {
+        //       name: '5-6',
+        //       label: '导管脱落风险评估'
+        //     },
+        //     {
+        //       name: '5-7',
+        //       label: 'RASS及疼痛评估'
+        //     },
+        //     {
+        //       name: '5-8',
+        //       label: '营养状况评估'
+        //     },
+        //     {
+        //       name: '5-9',
+        //       label: '约束告知单'
+        //     },
+        //     {
+        //       name: '5-10',
+        //       label: '心理评估'
+        //     },
+        //     {
+        //       name: '5-11',
+        //       label: '瘙痒评估'
+        //     },
+        //     {
+        //       name: '5-12',
+        //       label: '血液透析患者评估'
+        //     },
+        //     {
+        //       name: '5-13',
+        //       label: 'Glasgow昏迷评分量表'
+        //     },
+        //     {
+        //       name: '5-14',
+        //       label: '肌力评估表'
+        //     },
+        //   ]
+        // },
         {
           name: '6',
           label: '文书管理',