Merge branch 'superman' of http://git.shengws.com/zhangbj/xt_vue into superman

src/xt_pages/dialysis/batch_print/batch_print_order_five.vue

@@ -500,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/details/acceptsAssessment.vue

@@ -11,7 +11,8 @@
           <label>病人情况 : </label>
           <span class="content">{{ condition }}</span>
         </li>
-      
+      </ul>
+      <ul>
         <li v-if="isShow('病人意识')">
           <label>病人意识 : </label>
           <span class="content">{{ consciousness }}</span>
@@ -30,19 +31,18 @@
           <label>病情 </label>
           <span class="content">{{sickCondition}} </span>
         </li>
-     
+      </ul>
+      <ul>
         <li v-if="isShow('跌倒风险评估评分')">
           <label>跌倒风险评估评分:</label>
           <span class="content">{{this.record.score}}分</span>
         </li>
+
+
       </ul>
 
 
       <ul>
-        <li  v-if="isShow('跌倒风险预防措施')">
-          <label>跌倒风险预防措施:</label>
-          <span class="content">{{precaution}}</span>
-        </li>
         <li v-if="isShow('摄入量')">
           <label>摄入量:</label>
           <span class="content">{{intakes}}</span>
@@ -52,9 +52,18 @@
           <label>营养状况:</label>
           <span class="content">{{nutritions}}</span>
         </li>
-  
+      </ul>
+      <ul>
+
+        <li v-if="isShow('风险程度')">
+          <label>风险程度:</label>
+          <span class="content">{{dangerLevel}}</span>
+        </li>
 
-        
+        <li v-if="isShow('心理评估')">
+          <label> 心理评估</label>
+          <span class="content">{{psychologicalAssessment}}</span>
+        </li>
       </ul>
 
       <ul v-if="isShow('心理评估异常原因')&&this.record.psychological_assessment == 2 ">
@@ -62,7 +71,9 @@
           <label>心理评估异常原因:</label>
           <span class="content">{{this.record.psychological_assessment_other}}</span>
         </li>
- 
+      </ul>
+
+      <ul>
         <li v-if="isShow('其他心理评估')">
           <label>其他心理评估:</label>
           <span class="content">{{this.record.psychological_other}}</span>
@@ -75,22 +86,18 @@
       </ul>
 
       <ul>
-        <li v-if="isShow('风险程度')">
-          <label>风险程度:</label>
-          <span class="content">{{dangerLevel}}</span>
-        </li>
-
-        <li v-if="isShow('心理评估')">
-          <label> 心理评估</label>
-          <span class="content">{{psychologicalAssessment}}</span>
-        </li>
         <li v-if="isShow('其他跌倒风险预防措施')">
           <label>其他跌倒风险预防措施:</label>
           <span class="content">{{this.record.precaution_other}}</span>
         </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>
@@ -159,8 +166,7 @@
           '1': '镇定剂',
           '2': '约束带',
           '3': '床栏',
-          '4': '加强宣教',
-
+          '4': '加强宣教'
 
         }
       }

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/AssessmentAfterDislysis.vue

@@ -283,17 +283,7 @@
           </el-col>
           <el-col :span="8"  v-if="isShow('失衡综合症症状')">
             <el-form-item label="失衡综合症症状: ">
-
-              <el-select v-model="form.disequilibrium_syndrome_option">
-                <!--<el-option :key="0" label="请选择" :value="0"></el-option>-->
-
-                <!--<el-option v-for="item in this.$store.getters.disequilibrium_syndrome_option" :label="item.name" :value="item.id"-->
-                           <!--:key="item.id"></el-option>-->
-
-
                 <el-input v-model="form.disequilibrium_syndrome_option" readonly @focus="showDialog('8')"></el-input>
-
-              </el-select>
             </el-form-item>
           </el-col>
 

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'] + ''
+          }
 
           //
           //