添加字段

src/xt_pages/dialysis/batch_print/batch_print_order_five.vue

@@ -186,6 +186,12 @@
                       <check-box text="导管脱落" :checked="isValueIndexOfCheck(record.assessment_before_dislysis, 'ductus_arantii', '导管脱落')"></check-box>
                       <check-box text="感染" :checked="isValueIndexOfCheck(record.assessment_before_dislysis, 'ductus_arantii', '感染')"></check-box>
                       <check-box text="破损" :checked="isValueIndexOfCheck(record.assessment_before_dislysis, 'ductus_arantii', '破损')"></check-box>
+                      <div class="inline_block">
+                        其它：
+                        <div class="under_line" style="width: 150px;text-align: left">
+                          {{ record.assessment_before_dislysis?record.assessment_before_dislysis.ductus_arantii_other:''}}
+                        </div>
+                      </div>
                     </div>
                   </div>
                   <div class="row" style="padding: 2px 0;line-height:19px;">
@@ -494,8 +500,8 @@
                     </div>
                     <div class="inline_block" style="margin-left:30px;">
                       透析期间进食：
-                      <check-box text="无" :checked="record.assessment_after_dislysis.is_eat == 1?true:false"></check-box>
-                      <check-box text="有" :checked="record.assessment_after_dislysis.is_eat == 2?true:false"></check-box>
+                      <check-box text="无" :checked="record.assessment_after_dislysis&&record.assessment_after_dislysis.is_eat == 1?true:false"></check-box>
+                      <check-box text="有" :checked="record.assessment_after_dislysis&&record.assessment_after_dislysis.is_eat == 2?true:false"></check-box>
                     </div>
                     <!--<div class="inline_block" style="margin-left: 30px;">-->
                     <!--实际超滤量：-->

src/xt_pages/dialysis/batch_print/batch_print_order_five_one.vue

@@ -186,6 +186,12 @@
                       <check-box text="导管脱落" :checked="isValueIndexOfCheck(record.assessment_before_dislysis, 'ductus_arantii', '导管脱落')"></check-box>
                       <check-box text="感染" :checked="isValueIndexOfCheck(record.assessment_before_dislysis, 'ductus_arantii', '感染')"></check-box>
                       <check-box text="破损" :checked="isValueIndexOfCheck(record.assessment_before_dislysis, 'ductus_arantii', '破损')"></check-box>
+                      <div class="inline_block">
+                        其它：
+                        <div class="under_line" style="width: 150px;text-align: left">
+                          {{ record.assessment_before_dislysis?record.assessment_before_dislysis.ductus_arantii_other:''}}
+                        </div>
+                      </div>
                     </div>
                   </div>
                   <div class="row" style="padding: 2px 0;line-height:19px;">

src/xt_pages/dialysis/details/acceptsAssessment.vue

@@ -38,10 +38,7 @@
           <span class="content">{{this.record.score}}分</span>
         </li>
 
-        <li  v-if="isShow('跌倒风险预防措施')">
-          <label>跌倒风险预防措施:</label>
-          <span class="content">{{precaution}}</span>
-        </li>
+
       </ul>
 
 
@@ -76,7 +73,7 @@
         </li>
       </ul>
 
-      <ul >
+      <ul>
         <li v-if="isShow('其他心理评估')">
           <label>其他心理评估:</label>
           <span class="content">{{this.record.psychological_other}}</span>
@@ -95,7 +92,12 @@
         </li>
       </ul>
 
-
+      <ul>
+        <li v-if="isShow('跌倒风险预防措施')">
+          <label>跌倒风险预防措施:</label>
+          <span class="content">{{precaution}}</span>
+        </li>
+      </ul>
     </div>
     <!-- <div class="note">处方医生 : {{doctor}}</div> -->
     <div class="middleLine"></div>
@@ -164,8 +166,7 @@
           '1': '镇定剂',
           '2': '约束带',
           '3': '床栏',
-          '4': '加强宣教',
-
+          '4': '加强宣教'
 
         }
       }
@@ -244,7 +245,7 @@
         if (this.record.id == 0) {
           return ''
         } else {
-          return this.precautions[this.record.posture] == undefined ? '' : this.precautions[this.record.posture] + ''
+          return this.precautions[this.record.precaution] == undefined ? '' : this.precautions[this.record.precaution] + ''
         }
       }
     },

src/xt_pages/dialysis/details/assessmentBefore.vue

@@ -124,14 +124,14 @@
 
         <li v-if="isShow('急诊')">
           <label>急诊: </label>
-          <span class="content" v-if="this.record.emergency_treatment != -1">{{getEmergencyTreatment(this.record.emergency_treatment)}}</span>
+          <span class="content">{{getEmergencyTreatment(this.record.emergency_treatment)}}</span>
           <span class="content" v-if="this.record.emergency_treatment_other&&this.record.emergency_treatment_other.length > 0">,{{emergency_treatment_other}}</span>
         </li>
       </ul>
       <ul>
         <li  v-if="isShow('感染')">
           <label>感染:</label>
-          <span class="content">{{this.record.is_infect == 1 ? '有' : '无' }}</span>
+          <span class="content">{{this.record.is_infect == 1 ? '无' : '有' }}</span>
           <span class="unit"> </span>
         </li>
 

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

@@ -337,8 +337,8 @@
           <el-form-item label="感染： " v-if="isShow('感染')">
             <el-select v-model="assessmentBeforeDislysis.is_infect">
               <el-option :key="0" label="请选择" :value="0"></el-option>
-              <el-option label="是" value="1"></el-option>
-              <el-option label="否" value="2"></el-option>
+              <el-option label="无" value="1"></el-option>
+              <el-option label="有" value="2"></el-option>
             </el-select>
           </el-form-item>
         </el-col>
@@ -737,7 +737,11 @@ export default {
 
 
 
-
+          if (this.predialysis_evaluation['is_infect'] == 0) {
+            this.assessmentBeforeDislysis['is_infect'] = ''
+          } else {
+            this.assessmentBeforeDislysis['is_infect'] = this.predialysis_evaluation['is_infect'] + ''
+          }
 
           //
           //

src/xt_pages/dialysis/template/dialysisPrintOrderFive.vue

@@ -176,6 +176,12 @@
                   <check-box text="导管脱落" :checked="predialysis.ductus_arantii.indexOf('导管脱落')>-1?true:false"></check-box>
                   <check-box text="感染" :checked="predialysis.ductus_arantii.indexOf('感染')>-1?true:false"></check-box>
                   <check-box text="破损" :checked="predialysis.ductus_arantii.indexOf('破损')>-1?true:false"></check-box>
+                  <div class="inline_block">
+                    其它：
+                    <div class="under_line" style="width: 50px;text-align: left">
+                      <span>{{predialysis.ductus_arantii_other}}</span>
+                    </div>
+                  </div>
                 </div>
               </div>
               <div class="row" style="padding: 2px 0;line-height:19px;">