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

src/xt_pages/dialysis/details/acceptsAssessment.vue

@@ -9,42 +9,47 @@
           <label>入室方式 : </label>
           <span class="content">{{ way }}</span>
         </li>
-        <li v-if="isShow('病人情况')">
-          <label>病人情况 : </label>
-          <span class="content">{{ condition }}</span>
+
+        <li v-if="isShow('体位')">
+          <label>体位 : </label>
+          <span class="content">{{ posture }}</span>
         </li>
         <li v-if="isShow('其他病情')">
           <label>其他病情:</label>
           <span class="content">{{ this.record.sick_condition_other }}</span>
         </li>
+
         <li v-if="isShow('跌倒风险预防措施')">
           <label>跌倒风险预防措施:</label>
           <span class="content">{{ precaution }}</span>
         </li>
+
         <li v-if="isShow('营养状况')">
           <label>营养状况:</label>
-          <span class="content">{{ nutritions }}</span>
+          <span class="content">{{nutritions}}</span>
         </li>
-        <li
-          v-if="
-            isShow('心理评估异常原因') &&
-              this.record.psychological_assessment == 2
-          "
-        >
-          <label>心理评估异常原因:</label>
-          <span class="content">{{
-            this.record.psychological_assessment_other
-          }}</span>
+
+        <li v-if="isShow('其他心理评估')">
+          <label>其他心理评估:</label>
+          <span class="content">{{this.record.psychological_other}}</span>
         </li>
+
+
+
+
+
+
+
       </ul>
       <ul>
-        <li v-if="isShow('病人意识')">
-          <label>病人意识 : </label>
-          <span class="content">{{ consciousness }}</span>
+        <li v-if="isShow('病人情况')">
+          <label>病人情况 : </label>
+          <span class="content">{{ condition }}</span>
         </li>
-        <li v-if="isShow('体位')">
-          <label>体位 : </label>
-          <span class="content">{{ posture }}</span>
+
+        <li v-if="isShow('病人食欲')">
+          <label>病人食欲 : </label>
+          <span class="content">{{ appetite }}</span>
         </li>
         <li v-if="isShow('跌倒风险评估评分')">
           <label>跌倒风险评估评分:</label>
@@ -54,68 +59,57 @@
           <label>其他跌倒风险预防措施:</label>
           <span class="content">{{ this.record.precaution_other }}</span>
         </li>
+
         <li v-if="isShow('心理评估')">
           <label> 心理评估</label>
           <span class="content">{{ psychologicalAssessment }}</span>
         </li>
+
+
+
+
+
+
+
+
+
+
       </ul>
       <ul>
-        <li v-if="isShow('病人食欲')">
-          <label>病人食欲 : </label>
-          <span class="content">{{ appetite }}</span>
+        <li v-if="isShow('病人意识')">
+          <label>病人意识 :</label>
+          <span class="content">{{ consciousness }}</span>
         </li>
+
         <li v-if="isShow('病情')">
           <label>病情 </label>
           <span class="content">{{sickCondition}} </span>
         </li>
+
         <li v-if="isShow('风险程度')">
           <label>风险程度:</label>
           <span class="content">{{ dangerLevel }}</span>
         </li>
-          <li v-if="isShow('摄入量')">
+
+        <li v-if="isShow('摄入量')">
           <label>摄入量:</label>
           <span class="content">{{intakes}}</span>
         </li>
-
-        <li v-if="isShow('营养状况')">
-          <label>营养状况:</label>
-          <span class="content">{{nutritions}}</span>
-        </li>
-         <li v-if="isShow('风险程度')">
-          <label>风险程度:</label>
-          <span class="content">{{dangerLevel}}</span>
-        </li>
-      </ul>
-      <ul>
-        <li v-if="isShow('心理评估')">
-          <label> 心理评估</label>
-          <span class="content">{{psychologicalAssessment}}</span>
-        </li>
-          <li v-if="isShow('其他心理评估')">
-          <label>其他心理评估:</label>
-          <span class="content">{{this.record.psychological_other}}</span>
+        <li
+          v-if="
+            isShow('心理评估异常原因') &&
+              this.record.psychological_assessment == 2
+          "
+        >
+          <label>心理评估异常原因:</label>
+          <span class="content">{{
+            this.record.psychological_assessment_other
+          }}</span>
         </li>
 
-        <li v-if="isShow('其他病情')">
-          <label>其他病情:</label>
-          <span class="content">{{this.record.sick_condition_other}}</span>
-        </li>
-      </ul>
 
-      <ul v-if="isShow('心理评估异常原因')&&this.record.psychological_assessment == 2 ">
-        <li>
-          <label>心理评估异常原因:</label>
-          <span class="content">{{this.record.psychological_assessment_other}}</span>
-        </li>
-          <li v-if="isShow('其他跌倒风险预防措施')">
-          <label>其他跌倒风险预防措施:</label>
-          <span class="content">{{this.record.precaution_other}}</span>
-        </li>
-         <li v-if="isShow('跌倒风险预防措施')">
-          <label>跌倒风险预防措施:</label>
-          <span class="content">{{precaution}}</span>
-        </li>
       </ul>
+
     </div>
     <!-- <div class="note">处方医生 : {{doctor}}</div> -->
     <div class="middleLine"></div>

src/xt_pages/dialysis/details/assessmentAfter.vue

@@ -3,15 +3,10 @@
     <h2 class="DetailsTit"><span>{{ title }}</span></h2>
     <div class="plate">
       <ul>
-        <li v-if="isShow('透后体重')">
-          <label>透后体重 : </label>
-          <span class="content" v-if="weight_after!='0'">{{ weight_after }}</span>
-          <span class="unit" v-if="weight_after!='0'">kg</span>
-        </li>
-        <li v-if="isShow('收缩压')">
-          <label>收缩压 : </label>
-          <span class="content" v-if="systolic_blood_pressure!='0'">{{ systolic_blood_pressure }}</span>
-          <span class="unit" v-if="systolic_blood_pressure!='0'">mmHg</span>
+        <li v-if="isShow('舒张压')">
+          <label>舒张压 : </label>
+          <span class="content" v-if="diastolic_blood_pressure!='0'">{{ diastolic_blood_pressure }}</span>
+          <span class="unit" v-if="diastolic_blood_pressure!='0'">mmHg</span>
         </li>
         <li v-if="isShow('实际超滤量')">
           <label>实际超滤量: </label>
@@ -19,79 +14,95 @@
           <span class="unit" v-if="actual_ultrafiltration!='0'&& this.$store.getters.xt_user.template_info.template_id == 6">ml</span>
           <span class="unit" v-if="actual_ultrafiltration!='0'&& this.$store.getters.xt_user.template_info.template_id != 6">L</span>
         </li>
-        <li v-if="isShow('凝血')">
-          <label>透析器凝血 : </label>
-          <span class="content">{{ cruor }}</span>
-        </li>
-        <li v-if="isShow('内瘘')">
-          <label>内瘘 : </label>
-          <span class="content">{{ internal_fistula }}</span>
-        </li>
         <li v-if="isShow('导管')">
           <label>导管 : </label>
           <span class="content">{{ catheter }}</span>
         </li>
-        <li v-if="isShow('穿刺处血肿')">
-          <label>穿刺处血肿 : </label>
-          <span class="content">{{ puncture_point_haematoma_name }}</span>
-        </li>
 
-        <li v-if="isShow('穿刺处血肿')&&patient_gose==3">
-          <label>科室 : </label>
-          <span class="content">{{ inpatient_department }}</span>
-        </li>
-        <li v-if="isShow('体重减少')">
-          <label>体重减少 : </label>
-          <span class="content" v-if="weight_loss!='0'">{{ weight_loss }}</span>
-          <span class="unit" v-if="weight_loss!='0'">kg</span>
+        <li v-if="isShow('体温')">
+          <label>体温 : </label>
+          <span class="content" v-if="this.record.temperature">{{ this.record.temperature }}</span>
+          <span class="unit" v-if="this.record.temperature">℃</span>
         </li>
-        <li v-if="isShow('舒张压')">
-          <label>舒张压 : </label>
-          <span class="content" v-if="diastolic_blood_pressure!='0'">{{ diastolic_blood_pressure }}</span>
-          <span class="unit" v-if="diastolic_blood_pressure!='0'">mmHg</span>
+        <li v-if="isShow('血管通路部位')">
+          <label>血管通路部位 : </label>
+          <span class="content">{{ blood_access_part }}</span>
         </li>
+
         <li v-if="isShow('实际置换量')">
           <label>实际置换量 : </label>
           <span class="content" v-if="actual_displacement!='0'">{{ actual_displacement }}</span>
           <span class="unit" v-if="actual_displacement!='0'">ml</span>
         </li>
-        <li v-if="isShow('透后症状')">
-          <label>透后症状 : </label>
-          <span class="content">{{ symptom_after_dialysis }}</span>
+        <li v-if="isShow('压迫后内瘘震颤')">
+          <label>压迫后内瘘震颤: </label>
+          <span class="content">{{ getInternal() }}</span>
         </li>
 
-        <!-- <li style="height: 0.6rem;">
-          <label></label>
-      </li> -->
-      </ul>
-      <ul>
-        <li v-if="isShow('血管通路部位')">
-          <label>血管通路部位 : </label>
-          <span class="content">{{ blood_access_part }}</span>
+        <li v-if="isShow('实际治疗时长')">
+          <label>实际治疗时长 : </label>
+          <span class="content" v-if="this.record.actual_treatment_hour">{{ this.record.actual_treatment_hour }}小时</span>
+          <span class="content" v-if="this.record.actual_treatment_minute">{{ this.record.actual_treatment_minute }}分钟</span>
         </li>
 
-        <li v-if="isShow('并发症')">
-          <label>并发症: </label>
-          <span class="content">{{ this.record.complication }}</span>
+        <li v-if="isShow('其他观察内容')&&patient_gose==3">
+          <label>其他观察内容 : </label>
+          <span class="content">{{observation_content_other }}</span>
         </li>
-        <li v-if="isShow('压迫后内瘘震颤')">
-          <label>压迫后内瘘震颤: </label>
-          <span class="content">{{ getInternal() }}</span>
+
+
+        <li v-if="this.record.dialysis_process == 2&&isShow('透析过程提前原因')">
+          <label for="tw">透析过程提前原因 : </label>
+          <span class="content" id="tw">{{this.record.in_advance_reason}}</span>
+        </li>
+        <li v-if="isShow('内瘘震颤和血管杂音')">
+          <label for="sjzl">内瘘震颤和血管杂音 : </label>
+          <span id="sjzl" class="content">{{getTremorNoise(this.record.tremor_noise)}}</span>
         </li>
 
-        <li v-if="isShow('交待病房护士/患者/陪人观察内容')&&patient_gose==3">
-          <label>交待病房护士/患者/陪人观察内容 : </label>
-          <span class="content">{{ observation_content }}</span>
+        <li v-if="isShow('动脉管道')">
+          <label for="xgtlcz">动脉管道: </label>
+          <span id="xgtlcz" class="content">{{getArterialTubeName(this.record.arterial_tube)}}</span>
         </li>
-        <li v-if="isShow('体温')">
-          <label>体温 : </label>
-          <span class="content" v-if="this.record.temperature">{{ this.record.temperature }}</span>
-          <span class="unit" v-if="this.record.temperature">℃</span>
+
+
+
+        <li v-if="isShow('透析期间进食')">
+          <label for="bzh">透析期间进食: </label>
+          <span id="bzh" class="content">{{eat_name}}</span>
         </li>
-        <li v-if="isShow('脉率')">
-          <label>脉率 : </label>
-          <span class="content" v-if="this.record.pulse_frequency">{{ this.record.pulse_frequency }}</span>
-          <span class="unit" v-if="this.record.pulse_frequency">次/分</span>
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+        <!-- <li style="height: 0.6rem;">
+          <label></label>
+      </li> -->
+      </ul>
+      <ul>
+        <li v-if="isShow('收缩压')">
+          <label>收缩压 : </label>
+          <span class="content" v-if="systolic_blood_pressure!='0'">{{ systolic_blood_pressure }}</span>
+          <span class="unit" v-if="systolic_blood_pressure!='0'">mmHg</span>
+        </li>
+        <li v-if="isShow('透析器凝血')">
+          <label>透析器凝血 : </label>
+          <span class="content">{{ cruor }}</span>
+        </li>
+        <li v-if="isShow('穿刺处血肿')">
+          <label>穿刺处血肿 : </label>
+          <span class="content">{{ puncture_point_haematoma_name }}</span>
         </li>
         <li v-if="isShow('呼吸频率')">
           <label>呼吸频率 : </label>
@@ -99,82 +110,116 @@
           <span class="unit" v-if="this.record.breathing_rate">次/min</span>
         </li>
 
-        <li v-if="isShow('实际治疗时长')">
-          <label>实际治疗时长 : </label>
-          <span class="content" v-if="this.record.actual_treatment_hour">{{ this.record.actual_treatment_hour }}小时</span>
-          <span class="content" v-if="this.record.actual_treatment_minute">{{ this.record.actual_treatment_minute }}分钟</span>
+        <li v-if="isShow('血管通路操作')">
+          <label>血管通路操作: </label>
+          <span class="content">{{ blood_access_opera }}</span>
+        </li>
+        <li v-if="isShow('透后症状')">
+          <label>透后症状 : </label>
+          <span class="content">{{ symptom_after_dialysis }}</span>
         </li>
         <li v-if="isShow('透析中入量')">
           <label>透析中入量: </label>
           <span class="content">{{ this.record.dialysis_intakes }}{{getUnit(this.record.dialysis_intakes_unit)}}</span>
         </li>
-        <li v-if="isShow('血管通路操作')">
-          <label>血管通路操作: </label>
-          <span class="content">{{ blood_access_opera }}</span>
-        </li>
+
         <li v-if="isShow('拔针后穿刺点渗血')">
           <label>拔针后穿刺点渗血: </label>
           <span class="content">{{ puncture_point_oozing_blood_name }}</span>
         </li>
-        <li v-if="isShow('患者去向')">
-          <label>患者去向: </label>
-          <span class="content">{{ patient_gose_name }}</span>
+
+        <li v-if="isShow('内瘘管拔针后压迫止血时间')">
+          <label for="ml">内瘘管拔针后压迫止血时间 : </label>
+          <span id="ml" class="content" v-if="this.record.hemostasis_minute">{{this.record.hemostasis_minute}}min</span>
+          <span id="ml" class="content" v-else>-min</span>
         </li>
-        <li v-if="isShow('其他观察内容')&&patient_gose==3">
-          <label>其他观察内容 : </label>
-          <span class="content">{{observation_content_other }}</span>
+
+        <li v-if="isShow('失衡综合症')">
+          <label for="txzrl">失衡综合症: </label>
+          <span id="txzrl" class="content">{{getDisequilibriumSyndrome(this.record.disequilibrium_syndrome)}}</span>
+        </li>
+
+        <li v-if="isShow('静脉管道')">
+          <label for="bzh">静脉管道: </label>
+          <span id="bzh" class="content">{{getIntravenousTubeName(this.record.intravenous_tube)}}</span>
         </li>
 
+
+
+
+
+
+
+
+
+
+
+
+
+
+
       </ul>
       <ul>
+        <li v-if="isShow('透后体重')">
+          <label>透后体重 : </label>
+          <span class="content" v-if="weight_after!='0'">{{ weight_after }}</span>
+          <span class="unit" v-if="weight_after!='0'">kg</span>
+        </li>
+        <li v-if="isShow('内瘘')">
+          <label>内瘘 : </label>
+          <span class="content">{{ internal_fistula }}</span>
+        </li>
+        <li v-if="isShow('科室')&&patient_gose==3">
+          <label>科室 : </label>
+          <span class="content">{{ inpatient_department }}</span>
+        </li>
+        <li v-if="isShow('脉搏')">
+          <label>脉搏 : </label>
+          <span class="content" v-if="this.record.pulse_frequency">{{ this.record.pulse_frequency }}</span>
+          <span class="unit" v-if="this.record.pulse_frequency">次/分</span>
+        </li>
+
+        <li v-if="isShow('体重减少')">
+          <label>体重减少 : </label>
+          <span class="content" v-if="weight_loss!='0'">{{ weight_loss }}</span>
+          <span class="unit" v-if="weight_loss!='0'">kg</span>
+        </li>
+
+        <li v-if="isShow('并发症')">
+          <label>并发症: </label>
+          <span class="content">{{ this.record.complication }}</span>
+        </li>
+        <li v-if="isShow('交待病房护士/患者/陪人观察内容')&&patient_gose==3">
+          <label>交待病房护士/患者/陪人观察内容 : </label>
+          <span class="content">{{ observation_content }}</span>
+        </li>
+
+        <li v-if="isShow('患者去向')">
+          <label>患者去向: </label>
+          <span class="content">{{ patient_gose_name }}</span>
+        </li>
         <li v-if="isShow('透析过程')">
           <label for="tw">透析过程 : </label>
           <span class="content" id="tw" v-if="this.record.dialysis_process == 1">完成</span>
           <span class="content" id="tw" v-if="this.record.dialysis_process == 2">提前{{this.record.in_advance_minute}}min</span>
         </li>
-        <li v-if="this.record.dialysis_process == 2&&isShow('透析过程提前原因')">
-          <label for="tw">透析过程提前原因 : </label>
-          <span class="content" id="tw">{{this.record.in_advance_reason}}</span>
-        </li>
 
-
-        <li v-if="isShow('内瘘管拔针后压迫止血时间')">
-          <label for="ml">内瘘管拔针后压迫止血时间 : </label>
-          <span id="ml" class="content" v-if="this.record.hemostasis_minute">{{this.record.hemostasis_minute}}min</span>
-          <span id="ml" class="content" v-else>-min</span>
-        </li>
         <li v-if="isShow('内瘘管拔针后压迫止血操作')">
           <label for="ml">内瘘管拔针后压迫止血操作 : </label>
           <span id="ml" class="content">{{getOpera(this.record.hemostasis_opera)}}</span>
         </li>
-        <li v-if="isShow('内瘘震颤和血管杂音')">
-          <label for="sjzl">内瘘震颤和血管杂音 : </label>
-          <span id="sjzl" class="content">{{getTremorNoise(this.record.tremor_noise)}}</span>
-        </li>
-        <li v-if="isShow('失衡综合症')">
-          <label for="txzrl">失衡综合症: </label>
-          <span id="txzrl" class="content">{{getDisequilibriumSyndrome(this.record.disequilibrium_syndrome)}}</span>
-        </li>
         <li v-if="this.record.disequilibrium_syndrome == 2&&isShow('失衡综合症症状')">
           <label for="txzrl">失衡综合症症状: </label>
           <span id="txzrl" class="content">{{this.record.disequilibrium_syndrome_option}}</span>
         </li>
-        <li v-if="isShow('动脉管道')">
-          <label for="xgtlcz">动脉管道: </label>
-          <span id="xgtlcz" class="content">{{getArterialTubeName(this.record.arterial_tube)}}</span>
-        </li>
-        <li v-if="isShow('静脉管道')">
-          <label for="bzh">静脉管道: </label>
-          <span id="bzh" class="content">{{getIntravenousTubeName(this.record.intravenous_tube)}}</span>
-        </li>
+
         <li v-if="isShow('透析器')">
           <label for="hzqx">透析器: </label>
           <span id="hzqx" class="content">{{getDialyzer(this.record.dialyzer)}}</span>
         </li>
-        <li v-if="isShow('透析期间进食')">
-          <label for="bzh">透析期间进食: </label>
-          <span id="bzh" class="content">{{eat_name}}</span>
-        </li>
+
+
+
       </ul>
 
     </div>

src/xt_pages/dialysis/details/assessmentBefore.vue

@@ -8,35 +8,27 @@
           <span class="content" v-if="weight_before!='0'">{{ weight_before }}</span>
           <span class="unit" v-if="weight_before!='0'">kg</span>
         </li>
-        <li v-if="isShow('收缩压')">
-          <label>收缩压 : </label>
-          <span class="content" v-if="systolic_blood_pressure!='0'">{{ systolic_blood_pressure }}</span>
-          <span class="unit" v-if="systolic_blood_pressure!='0'">mmHg</span>
-        </li>
+
         <li v-if="isShow('前次透析后')">
           <label>前次透析后: </label>
           <span class="content" v-if="last_post_dialysis!='0'">{{ last_post_dialysis }}</span>
           <span class="unit" v-if="last_post_dialysis!='0'"></span>
         </li>
-        <li v-if="isShow('导管')">
-          <label>导管 : </label>
-          <span class="content">{{ catheter }}</span>
-          <span class="unit"></span>
-        </li>
-        <li v-if="isShow('衣物重')">
-          <label>衣物重 : </label>
-          <span class="content" v-if="additional_weight!='0'">{{ additional_weight }}</span>
-          <span class="unit" v-if="additional_weight!='0'">kg</span>
-        </li>
+
         <li v-if="isShow('干体重')">
           <label>干体重 : </label>
           <span class="content" v-if="dry_weight!='0'">{{ dry_weight }}</span>
           <span class="unit" v-if="dry_weight!='0'">kg</span>
         </li>
-        <li v-if="isShow('舒张压')">
-          <label>舒张压 : </label>
-          <span class="content" v-if="diastolic_blood_pressure!='0'">{{ diastolic_blood_pressure }}</span>
-          <span class="unit" v-if="diastolic_blood_pressure!='0'">mmHg</span>
+        <li v-if="isShow('脉搏')">
+          <label>脉搏 : </label>
+          <span class="content" v-if="pulse_frequency!='0'">{{ pulse_frequency }}</span>
+          <span class="unit" v-if="pulse_frequency!='0'">次/分</span>
+        </li>
+        <li v-if="isShow('出血')">
+          <label>出血</label>
+          <span class="content">{{ is_hemorrhage ? hemorrhage + ";" + hemorrhage_other : "无" }}</span>
+          <span class="unit"> </span>
         </li>
 
         <li v-if="isShow('透析频次')">
@@ -44,108 +36,106 @@
           <span class="content">{{dialysis_count?dialysis_count:''}}</span>
           <span class="unit">{{ dialysis_count?'次/周':''}}</span>
         </li>
-         <li v-if="isShow('透析期间')">
-          <label>透析期间 : </label>
-          <span class="content" v-if="dialysis_interphase!='0'">{{ dialysis_interphase }}</span>
-          <span class="unit" v-if="dialysis_interphase!='0'"></span>
+
+        <li v-if="isShow('穿刺针')">
+          <label>穿刺针 : </label>
+          <span class="content">{{this.record.puncture_needle}}</span>
         </li>
-        <li v-if="isShow('并发症')">
-          <label>并发症: </label>
-          <span class="content">{{ complication }}</span>
-          <span class="unit"></span>
+
+        <li v-if="isShow('位置')">
+          <label>位置</label>
+          <span class="content" v-if="this.record.venous_catheterization_part != -1">{{getVenousCatheterizationPart(this.record.venous_catheterization_part)}}</span>
         </li>
-         <li v-if="isShow('体温')">
-          <label>体温 : </label>
-          <span class="content" v-if="temperature!='0'">{{ temperature }}</span>
-          <span class="unit" v-if="temperature!='0'">℃</span>
+
+
+
+        <li  v-if="isShow('其他中心静脉导管')">
+          <label>其他中心静脉导管:</label>
+          <span class="content">{{ ductus_arantii_other }}</span>
+          <span class="unit"> </span>
         </li>
-        <li v-if="isShow('脉搏')">
-          <label>脉搏 : </label>
-          <span class="content" v-if="pulse_frequency!='0'">{{ pulse_frequency }}</span>
-          <span class="unit" v-if="pulse_frequency!='0'">次/分</span>
+
+        <li  v-if="isShow('其他感染情况')">
+          <label>其他感染情况:</label>
+          <span class="content">{{ infect_other }}</span>
+          <span class="unit"> </span>
+        </li>
+
+        <li  v-if="isShow('其他皮肤情况')">
+          <label>其他皮肤情况:</label>
+          <span class="content">{{ skin_other }}</span>
+          <span class="unit"> </span>
         </li>
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
       </ul>
       <ul>
-        <li v-if="isShow('透析机型号')">
-            <label>透析机型号:</label>
-            <span class="content" v-if="machine_type!='0'">
-              {{machine_type}}
-            </span>
+        <li v-if="isShow('收缩压')">
+          <label>收缩压 : </label>
+          <span class="content" v-if="systolic_blood_pressure!='0'">{{ systolic_blood_pressure }}</span>
+          <span class="unit" v-if="systolic_blood_pressure!='0'">mmHg</span>
         </li>
 
+        <li v-if="isShow('导管')">
+          <label>导管 : </label>
+          <span class="content">{{ catheter }}</span>
+          <span class="unit"></span>
+        </li>
+        <li v-if="isShow('透析期间')">
+          <label>透析期间 : </label>
+          <span class="content" v-if="dialysis_interphase!='0'">{{ dialysis_interphase }}</span>
+          <span class="unit" v-if="dialysis_interphase!='0'"></span>
+        </li>
         <li v-if="isShow('呼吸频率')">
           <label>呼吸频率 : </label>
           <span class="content" v-if="breathing_rate!='0'">{{ breathing_rate }}</span>
           <span class="unit" v-if="breathing_rate!='0'">次/分</span>
         </li>
-        <li v-if="isShow('透析前症状')">
-          <label>透析前症状 : </label>
-          <span class="content">{{ symptom_before_dialysis }}</span>
+
+        <li v-if="isShow('并发症')">
+          <label>并发症: </label>
+          <span class="content">{{ complication }}</span>
           <span class="unit"></span>
         </li>
-        <li v-if="isShow('出血')">
-          <label>出血</label>
-          <span class="content">{{ is_hemorrhage ? hemorrhage + ";" + hemorrhage_other : "无" }}</span>
-          <span class="unit"> </span>
-        </li>
+
         <li v-if="isShow('血管通路(内瘘)')">
           <label>血管通路(内瘘) : </label>
           <span class="content">{{blood_access_internal_fistula}}</span>
         </li>
-          <li v-if="isShow('血管杂音')">
-          <label>血管杂音 : </label>
-          <span class="content">{{getBloodAccessNoise(this.record.blood_access_noise)}}</span>
-        </li>
-
-        <li v-if="isShow('穿刺针')">
-          <label>穿刺针 : </label>
-          <span class="content">{{this.record.puncture_needle}}</span>
-        </li>
-          <li v-if="isShow('穿刺方式')">
+        <li v-if="isShow('穿刺方式')">
           <label>穿刺方式 : </label>
           <span class="content">{{getWay(this.record.puncture_way)}}</span>
         </li>
-        <li  v-if="isShow('中心静脉置管')">
-          <label>中心静脉置管</label>
-          <span class="content">{{getVenousCatheterization(this.record.venous_catheterization)}}</span>
-          <span class="unit"> </span>
-        </li>
-        <li v-if="isShow('位置')">
-          <label>位置</label>
-          <span class="content" v-if="this.record.venous_catheterization_part != -1">{{getVenousCatheterizationPart(this.record.venous_catheterization_part)}}</span>
-        </li>
         <li v-if="isShow('其他位置')">
           <label>其他位置</label>
           <span class="content" v-if="this.record.venous_catheterization_part_other&&this.record.venous_catheterization_part_other.length > 0">{{venous_catheterization_part_other}}</span>
         </li>
-      </ul>
-      <ul >
-        <li v-if="isShow('中心静脉导管')">
-          <label>中心静脉导管: </label>
-          <span class="content">{{this.record.ductus_arantii}}</span>
-        </li>
-        <li  v-if="isShow('其他中心静脉导管')">
-          <label>其他中心静脉导管:</label>
-          <span class="content">{{ ductus_arantii_other }}</span>
-          <span class="unit"> </span>
-        </li>
 
         <li v-if="isShow('急诊')">
           <label>急诊: </label>
           <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>
-          <li  v-if="isShow('感染')">
-          <label>感染:</label>
-          <span class="content">{{this.record.is_infect == 1 ? '无' : '有' }}</span>
-          <span class="unit"> </span>
-        </li>
 
-        <li  v-if="isShow('其他感染情况')">
-          <label>其他感染情况:</label>
-          <span class="content">{{ infect_other }}</span>
-          <span class="unit"> </span>
-        </li>
 
         <li  v-if="isShow('外露')">
           <label>外露:</label>
@@ -153,30 +143,139 @@
           <span class="unit">cm</span>
         </li>
 
-        <li  v-if="isShow('皮肤')">
-          <label>皮肤:</label>
-          <span class="content">{{getSkin(this.record.skin)}}</span>
+        <li  v-if="isShow('血管通路部位')">
+          <label>血管通路部位:</label>
+          <span class="content">{{ getBloodAccessPart(this.record.blood_access_part_id) }}</span>
+          <span class="unit"> </span>
+        </li>
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+      </ul>
+      <ul >
+        <li v-if="isShow('舒张压')">
+          <label>舒张压 : </label>
+          <span class="content" v-if="diastolic_blood_pressure!='0'">{{ diastolic_blood_pressure }}</span>
+          <span class="unit" v-if="diastolic_blood_pressure!='0'">mmHg</span>
+        </li>
+        <li v-if="isShow('衣物重')">
+          <label>衣物重 : </label>
+          <span class="content" v-if="additional_weight!='0'">{{ additional_weight }}</span>
+          <span class="unit" v-if="additional_weight!='0'">kg</span>
+        </li>
+        <li v-if="isShow('体温')">
+          <label>体温 : </label>
+          <span class="content" v-if="temperature!='0'">{{ temperature }}</span>
+          <span class="unit" v-if="temperature!='0'">℃</span>
+        </li>
+        <li v-if="isShow('透析前症状')">
+          <label>透析前症状 : </label>
+          <span class="content">{{ symptom_before_dialysis }}</span>
           <span class="unit"></span>
         </li>
 
-        <li  v-if="isShow('其他皮肤情况')">
-          <label>其他皮肤情况:</label>
-          <span class="content">{{ skin_other }}</span>
+
+        <li v-if="isShow('透析机型号')">
+          <label>透析机型号:</label>
+          <span class="content" v-if="machine_type!='0'">
+              {{machine_type}}
+            </span>
+        </li>
+
+
+        <li v-if="isShow('血管杂音')">
+          <label>血管杂音 : </label>
+          <span class="content">{{getBloodAccessNoise(this.record.blood_access_noise)}}</span>
+        </li>
+
+        <li  v-if="isShow('中心静脉置管')">
+          <label>中心静脉置管</label>
+          <span class="content">{{getVenousCatheterization(this.record.venous_catheterization)}}</span>
           <span class="unit"> </span>
         </li>
 
-        <li  v-if="isShow('血管通路部位')">
-          <label>血管通路部位:</label>
-          <span class="content">{{ getBloodAccessPart(this.record.blood_access_part_id) }}</span>
+
+        <li v-if="isShow('中心静脉导管')">
+          <label>中心静脉导管: </label>
+          <span class="content">{{this.record.ductus_arantii}}</span>
+        </li>
+        <li  v-if="isShow('感染')">
+          <label>感染:</label>
+          <span class="content">{{this.record.is_infect == 1 ? '无' : '有' }}</span>
           <span class="unit"> </span>
         </li>
 
+        <li  v-if="isShow('皮肤')">
+          <label>皮肤:</label>
+          <span class="content">{{getSkin(this.record.skin)}}</span>
+          <span class="unit"></span>
+        </li>
+
+
         <li  v-if="isShow('血管通路操作')">
           <label>血管通路操作:</label>
           <span class="content">{{ getBloodAccessOpera(this.record.blood_access_part_opera_id) }}</span>
           <span class="unit"> </span>
         </li>
 
+
+
+
+
+
+
+
       </ul>
     </div>
     <div class="note">备注 : <span>{{ remark }}</span></div>

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

@@ -7,13 +7,130 @@
       :modal-append-to-body="false"
     >
       <el-form ref="form" :model="form" label-width="160px">
+
+
+
+
+
+
         <!-- <el-row :gutter="20"> -->
         <el-row :gutter="20">
+          <el-col :span="8"  v-if="isShow('实际治疗时长')">
+            <el-form-item label="实际治疗时长(时):">
+              <!-- <el-input v-model="form.actual_treatment_hour"></el-input> -->
+              <el-time-picker
+                v-model="actualTreatmentHourShow"
+                placeholder="透析时长"
+                style="width:100%;"
+                value-format="H:m"
+                format="H:m"
+                @change="selectActualTreatmentHour"
+              >
+              </el-time-picker>
+            </el-form-item>
+          </el-col>
+
+
+          <el-col :span="8" v-if="isShow('实际超滤量')">
+            <el-form-item label="实际超滤量(L): " v-if="this.template_id != 6" >
+              <el-input v-model="form.actual_ultrafiltration"></el-input>
+            </el-form-item>
+            <el-form-item label="实际超滤量(ml): " v-if="this.template_id == 6" >
+              <el-input v-model="form.actual_ultrafiltration"></el-input>
+            </el-form-item>
+          </el-col>
+
+
           <el-col :span="8" v-if="isShow('透后体重')">
             <el-form-item label="透后体重(kg): " >
               <el-input v-model="form.weight_after"></el-input>
             </el-form-item>
           </el-col>
+
+
+          <el-col :span="8" v-if="isShow('透析器凝血')">
+            <el-form-item label="透析器凝血: " >
+              <el-input v-model="form.cruor" readonly @focus="showDialog('1')"></el-input>
+            </el-form-item>
+          </el-col>
+
+          <el-col :span="8"  v-if="isShow('拔针后穿刺点渗血')">
+            <el-form-item label="拔针后穿刺点渗血: ">
+              <el-radio-group v-model="form.puncture_point_oozing_blood">
+                <el-radio :label="1">有</el-radio>
+                <el-radio :label="2">无</el-radio>
+              </el-radio-group>
+            </el-form-item>
+          </el-col>
+
+          <el-col :span="8" v-if="isShow('穿刺处血肿')">
+            <el-form-item label="穿刺处血肿: ">
+              <el-radio-group v-model="form.puncture_point_haematoma">
+                <el-radio :label="1">有</el-radio>
+                <el-radio :label="2">无</el-radio>
+              </el-radio-group>
+            </el-form-item>
+          </el-col>
+
+
+          <el-col :span="8" v-if="isShow('压迫后内瘘震颤')">
+            <el-form-item label="压迫后内瘘震颤: ">
+              <el-select v-model="form.internal_fistula_tremor_ac">
+                <el-option :key="0" label="请选择" :value="0"></el-option>
+
+                <el-option v-for="item in internalFistulaTremorAcOptions" :label="item.name" :value="item.id"
+                           :key="item.id"></el-option>
+              </el-select>
+
+            </el-form-item>
+          </el-col>
+
+
+          <el-col :span="8" v-if="isShow('并发症')">
+            <el-form-item label="并发症: ">
+              <el-input v-model="form.complication" readonly @focus="showDialog('5')"></el-input>
+            </el-form-item>
+          </el-col>
+
+
+          <el-col :span="8" v-if="isShow('患者去向')">
+            <el-form-item label="患者去向: ">
+              <el-select v-model="form.patient_gose">
+                <el-option :key="0" label="请选择" :value="0"></el-option>
+
+                <el-option v-for="item in patientGoseOptions" :label="item.name" :value="item.id"
+                           :key="item.id"></el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+
+
+          <el-row :gutter="20" v-if="form.patient_gose==3&&isShow('科室')">
+            <el-col :span="24" >
+              <el-form-item label="科室: ">
+                <el-input v-model="form.inpatient_department" :rows="5"></el-input>
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row :gutter="20" v-if="form.patient_gose==3&&isShow('交待观察内容')">
+            <el-col :span="24" >
+              <el-form-item label="交待观察内容: ">
+                <el-input placeholder="交待病房护士/患者/陪人观察内容" v-model="form.observation_content" :rows="5" readonly
+                          @focus="showDialog('6')"></el-input>
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row :gutter="20" v-show="form.patient_gose==3&&isShow('其他观察内容')">
+            <el-col :span="24">
+              <el-form-item label="其他观察内容: ">
+                <el-input v-model="form.observation_content_other" :rows="5"></el-input>
+              </el-form-item>
+            </el-col>
+          </el-row>
+
+
+
+
           <el-col :span="8" v-if="isShow('体重减少')">
             <el-form-item label="体重减少(kg): " >
               <el-input v-model="form.weight_loss"></el-input>
@@ -37,63 +154,22 @@
               <el-input v-model="form.diastolic_blood_pressure"></el-input>
             </el-form-item>
           </el-col>
-          <el-col :span="8" v-if="isShow('脉搏')">
-            <el-form-item label="脉搏(次/分): " >
-              <el-input v-model="form.pulse_frequency"></el-input>
-            </el-form-item>
-          </el-col>
 
           <el-col :span="8" v-if="isShow('呼吸频率')">
             <el-form-item label="呼吸频率(次/min): " >
               <el-input v-model="form.breathing_rate"></el-input>
             </el-form-item>
           </el-col>
-        <!-- </el-row>
 
-        <el-row :gutter="20"> -->
-          <el-col :span="8" v-if="isShow('实际超滤量')">
-            <el-form-item label="实际超滤量(L): " v-if="this.template_id != 6" >
-              <el-input v-model="form.actual_ultrafiltration"></el-input>
-            </el-form-item>
-            <el-form-item label="实际超滤量(ml): " v-if="this.template_id == 6" >
-              <el-input v-model="form.actual_ultrafiltration"></el-input>
-            </el-form-item>
-          </el-col>
-          <el-col :span="8" v-if="isShow('实际置换量')">
-            <el-form-item label="实际置换量(L): "  >
-              <el-input v-model="form.actual_displacement"></el-input>
+
+          <el-col :span="8" v-if="isShow('脉搏')">
+            <el-form-item label="脉搏(次/分): " >
+              <el-input v-model="form.pulse_frequency"></el-input>
             </el-form-item>
           </el-col>
 
 
 
-
-          <el-col :span="8"  v-if="isShow('实际治疗时长')">
-            <el-form-item label="实际治疗时长(时):">
-              <!-- <el-input v-model="form.actual_treatment_hour"></el-input> -->
-              <el-time-picker
-                v-model="actualTreatmentHourShow"
-                placeholder="透析时长"
-                style="width:100%;"
-                value-format="H:m"
-                format="H:m"
-                @change="selectActualTreatmentHour"
-              >
-              </el-time-picker>
-            </el-form-item>
-          </el-col>
-        <!-- </el-row>
-
-        <el-row :gutter="20"> -->
-          <el-col :span="8" v-if="isShow('凝血')">
-            <el-form-item label="凝血: " >
-              <!-- <el-select v-model="form.cruor" >
-                  <el-option v-for="item in cruorOptions" :key="item.id" :label="item.name" :value="item.id"></el-option>
-              </el-select>
-               -->
-              <el-input v-model="form.cruor" readonly @focus="showDialog('1')"></el-input>
-            </el-form-item>
-          </el-col>
           <el-col :span="8" v-if="isShow('透后症状')">
             <el-form-item label="透后症状: " >
               <el-input v-model="form.symptom_after_dialysis" readonly @focus="showDialog('2')"></el-input>
@@ -116,6 +192,24 @@
               </el-select>
             </el-form-item>
           </el-col>
+
+        <!-- </el-row>
+
+        <el-row :gutter="20"> -->
+
+          <!--<el-col :span="8" v-if="isShow('实际置换量')">-->
+            <!--<el-form-item label="实际置换量(L): "  >-->
+              <!--<el-input v-model="form.actual_displacement"></el-input>-->
+            <!--</el-form-item>-->
+          <!--</el-col>-->
+
+
+
+
+        <!-- </el-row>
+
+        <el-row :gutter="20"> -->
+
         <!-- </el-row>
 
         <el-row :gutter="20"> -->
@@ -153,81 +247,7 @@
               <el-input v-model="form.catheter" readonly @focus="showDialog('4')"></el-input>
             </el-form-item>
           </el-col>
-          <el-col :span="8" v-if="isShow('并发症')">
-            <el-form-item label="并发症: ">
-              <el-input v-model="form.complication" readonly @focus="showDialog('5')"></el-input>
-            </el-form-item>
-          </el-col>
-          <el-col :span="8"  v-if="isShow('拔针后穿刺点渗血')">
-            <el-form-item label="拔针后穿刺点渗血: ">
-              <el-radio-group v-model="form.puncture_point_oozing_blood">
-                <el-radio :label="1">有</el-radio>
-                <el-radio :label="2">无</el-radio>
-              </el-radio-group>
-            </el-form-item>
-          </el-col>
-        <!-- </el-row>
 
-
-        <el-row :gutter="20"> -->
-          <el-col :span="8" v-if="isShow('穿刺处血肿')">
-            <el-form-item label="穿刺处血肿: ">
-              <el-radio-group v-model="form.puncture_point_haematoma">
-                <el-radio :label="1">有</el-radio>
-                <el-radio :label="2">无</el-radio>
-              </el-radio-group>
-            </el-form-item>
-          </el-col>
-          <el-col :span="8" v-if="isShow('压迫后内瘘震颤')">
-            <el-form-item label="压迫后内瘘震颤: ">
-              <el-select v-model="form.internal_fistula_tremor_ac">
-                <el-option :key="0" label="请选择" :value="0"></el-option>
-
-                <el-option v-for="item in internalFistulaTremorAcOptions" :label="item.name" :value="item.id"
-                           :key="item.id"></el-option>
-              </el-select>
-
-            </el-form-item>
-          </el-col>
-          <el-col :span="8" v-if="isShow('患者去向')">
-            <el-form-item label="患者去向: ">
-              <el-select v-model="form.patient_gose">
-                <el-option :key="0" label="请选择" :value="0"></el-option>
-
-                <el-option v-for="item in patientGoseOptions" :label="item.name" :value="item.id"
-                           :key="item.id"></el-option>
-              </el-select>
-            </el-form-item>
-          </el-col>
-        </el-row>
-
-
-        <el-row :gutter="20" v-if="form.patient_gose==3&&isShow('科室')">
-          <el-col :span="24" >
-            <el-form-item label="科室: ">
-              <el-input v-model="form.inpatient_department" :rows="5"></el-input>
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row :gutter="20" v-if="form.patient_gose==3&&isShow('交待观察内容')">
-          <el-col :span="24" >
-            <el-form-item label="交待观察内容: ">
-              <el-input placeholder="交待病房护士/患者/陪人观察内容" v-model="form.observation_content" :rows="5" readonly
-                        @focus="showDialog('6')"></el-input>
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row :gutter="20" v-show="form.patient_gose==3&&isShow('其他观察内容')">
-          <el-col :span="24">
-            <el-form-item label="其他观察内容: ">
-              <el-input v-model="form.observation_content_other" :rows="5"></el-input>
-            </el-form-item>
-          </el-col>
-        </el-row>
-
-
-
-        <el-row :gutter="20" >
           <el-col :span="8" v-if="isShow('透析过程')">
             <el-form-item label="透析过程: ">
               <el-select v-model="form.dialysis_process">
@@ -245,17 +265,17 @@
           </el-col>
 
           <el-col :span="8" v-if="isShow('透析过程提前原因')">
-          <el-form-item label="透析过程提前原因: ">
-            <el-input v-model="form.in_advance_reason" readonly @focus="showDialog('7')"></el-input>
+            <el-form-item label="透析过程提前原因: ">
+              <el-input v-model="form.in_advance_reason" readonly @focus="showDialog('7')"></el-input>
 
-          </el-form-item>
+            </el-form-item>
           </el-col>
 
-        <!-- </el-row>
+          <!-- </el-row>
 
 
 
-        <el-row :gutter="20" > -->
+          <el-row :gutter="20" > -->
           <el-col :span="8" v-if="isShow('透析过程提前其他原因')">
             <el-form-item label="透析过程提前其他原因: ">
               <el-input v-model="form.in_advance_reason_other" :rows="2"></el-input>
@@ -276,13 +296,13 @@
               </el-select>
             </el-form-item>
           </el-col>
-<!--
-        </el-row>
+          <!--
+                  </el-row>
 
 
 
 
-        <el-row :gutter="20"> -->
+                  <el-row :gutter="20"> -->
           <el-col :span="8" v-if="isShow('内瘘震颤和血管杂音')">
             <el-form-item label="内瘘震颤和血管杂音: " >
               <el-select v-model="form.tremor_noise">
@@ -305,15 +325,15 @@
           </el-col>
           <el-col :span="8"  v-if="isShow('失衡综合症症状')">
             <el-form-item label="失衡综合症症状: ">
-                <el-input v-model="form.disequilibrium_syndrome_option" readonly @focus="showDialog('8')"></el-input>
+              <el-input v-model="form.disequilibrium_syndrome_option" readonly @focus="showDialog('8')"></el-input>
             </el-form-item>
           </el-col>
 
-        <!-- </el-row>
+          <!-- </el-row>
 
 
 
-        <el-row :gutter="20"  > -->
+          <el-row :gutter="20"  > -->
           <el-col :span="8" v-if="isShow('动脉管道')">
             <el-form-item label="动脉管道: ">
               <el-select v-model="form.arterial_tube">
@@ -352,29 +372,7 @@
               </el-radio-group>
             </el-form-item>
           </el-col>
-
-        <!-- </el-row>
-
-    <el-col :span="8" v-if="isShow('穿刺处血肿')">
-            <el-form-item label="穿刺处血肿: ">
-              <el-radio-group v-model="form.puncture_point_haematoma">
-                <el-radio :label="1">有</el-radio>
-                <el-radio :label="2">无</el-radio>
-              </el-radio-group>
-            </el-form-item>
-          </el-col>
-
-
-
-
-        <el-row :gutter="20"> -->
-          <el-col :span="24">
-            <el-form-item label="备注: ">
-              <el-input type="textarea" v-model="form.remark" :rows="5"></el-input>
-            </el-form-item>
-          </el-col>
         </el-row>
-        <!-- </el-row> -->
       </el-form>
 
       <span slot="footer" class="dialog-footer">
@@ -719,6 +717,7 @@ export default {
         }
       },
       selectActualTreatmentHour(val) {
+
         var valTime = val.split(':')
         this.form.actual_treatment_hour = valTime[0]
         this.form.actual_treatment_minute = valTime[1]

src/xt_pages/dialysis/details/dialog/MultiSelectBox/index.vue

@@ -1,7 +1,7 @@
 <template>
   <el-dialog   append-to-body :show-close="isClose" :close-on-click-modal="isClose" :close-on-press-escape="isClose" :title="propsForm.titles" :visible.sync="propsForm.visibility"   >
     <el-checkbox-group v-model="checkedData"  >
-      <el-checkbox v-for="item in propsForm.values" :label="item.name" :key="item.id"></el-checkbox>
+      <el-checkbox v-for="(item,index) in propsForm.values" :label="item.name" :key="index"></el-checkbox>
     </el-checkbox-group>
     <el-input v-show="propsForm.isShowTextArea" v-model="customData"  type="textarea" :rows="6" placeholder="自定义"></el-input>
     <span slot="footer" class="dialog-footer">
@@ -52,7 +52,7 @@
           var customData = this.customData.split(',')
           for(var index in customData) {
             returnData.push(customData[index])
-          } 
+          }
         }
         return returnData;
         // if(this.propsForm.customData != undefined){
@@ -85,7 +85,7 @@
             if(this.propsForm.values[index].name in checkedDataObj) {
               this.checkedData.push(this.propsForm.values[index].name);
               readyDataObj[this.propsForm.values[index].name] = 1;
-            } 
+            }
           }
           var addtion = []
           var addtionObj = {};
@@ -99,7 +99,7 @@
         }
       }
     }
-    
+
 
   }
 </script>

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

@@ -49,6 +49,38 @@
             </el-form-item>
           </el-col>
 
+          <el-col :span="8">
+            <el-form-item label="呼吸频率(次/分)：" v-if="isShow('呼吸频率')">
+              <el-input type="number" v-model="assessmentBeforeDislysis.breathing_rate"></el-input>
+            </el-form-item>
+          </el-col>
+
+          <el-col :span="8">
+            <el-form-item label="出血： " v-if="isShow('出血')">
+              <el-select v-model="assessmentBeforeDislysis.is_hemorrhage">
+                <el-option :key="0" label="请选择" :value="0"></el-option>
+
+                <el-option label="是" value="1"></el-option>
+                <el-option label="否" value="2"></el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+
+
+          <el-col :span="8" v-if="assessmentBeforeDislysis.is_hemorrhage == 1&&isShow('出血选项')">
+            <el-form-item label="出血选项： ">
+              <div>
+                <el-input v-model="assessmentBeforeDislysis.hemorrhage" @focus="showInnerDialog('6')"></el-input>
+              </div>
+            </el-form-item>
+          </el-col>
+          <el-col :span="8" v-if="assessmentBeforeDislysis.is_hemorrhage == 1&&isShow('其他出血情况')">
+            <el-form-item label="其他出血情况： ">
+              <el-input v-model="assessmentBeforeDislysis.hemorrhage_other"></el-input>
+            </el-form-item>
+          </el-col>
+
+
           <!-- </el-row>
 
           <el-row :gutter="20"> -->
@@ -117,18 +149,6 @@
             </el-form-item>
           </el-col>
 
-          <el-col :span="8">
-            <el-form-item label="透析机型号:" v-if="isShow('透析机型号')">
-              <el-input v-model="assessmentBeforeDislysis.machine_type"></el-input>
-            </el-form-item>
-          </el-col>
-
-          <el-col :span="8">
-            <el-form-item label="呼吸频率(次/分)：" v-if="isShow('呼吸频率')">
-              <el-input type="number" v-model="assessmentBeforeDislysis.breathing_rate"></el-input>
-            </el-form-item>
-          </el-col>
-
           <el-col :span="8">
 
             <el-form-item label="血管通路部位： " v-if="isShow('血管通路部位')">
@@ -152,23 +172,6 @@
           </el-col>
 
 
-          <!-- </el-row>
-
-
-          <el-row :gutter="20"> -->
-          <el-col :span="8">
-            <el-form-item label="穿刺方法： " v-if="isShow('穿刺方法')">
-
-              <el-select v-model="assessmentBeforeDislysis.puncture_method">
-                <el-option :key="0" label="请选择" :value="0"></el-option>
-
-                <el-option v-for="item in puncture_method" :label="item.name" :value="item.name"
-                           :key="item.id"></el-option>
-              </el-select>
-
-            </el-form-item>
-          </el-col>
-
           <el-col :span="8">
             <el-form-item label="并发症： " v-if="isShow('并发症')">
 
@@ -176,20 +179,13 @@
             </el-form-item>
           </el-col>
 
-          <el-col :span="8">
-            <el-form-item label="穿刺针： " v-if="isShow('穿刺针')">
-              <el-input v-model="assessmentBeforeDislysis.puncture_needle" @focus="showInnerDialog('11')"></el-input>
-            </el-form-item>
-          </el-col>
           <el-col :span="8">
             <el-form-item label="前次透析后：" v-if="isShow('前次透析后')">
               <el-input v-model="assessmentBeforeDislysis.last_post_dialysis" @focus="showInnerDialog('1')"></el-input>
             </el-form-item>
           </el-col>
 
-          <!-- </el-row>
 
-          <el-row :gutter="20"> -->
           <el-col :span="8">
             <el-form-item label="透析期间： " v-if="isShow('透析期间')">
               <el-input v-model="assessmentBeforeDislysis.dialysis_interphase" @focus="showInnerDialog('2')">>
@@ -203,38 +199,17 @@
             </el-form-item>
           </el-col>
 
-          <el-col :span="8">
-            <el-form-item label="出血： " v-if="isShow('出血')">
-              <el-select v-model="assessmentBeforeDislysis.is_hemorrhage">
-                <el-option :key="0" label="请选择" :value="0"></el-option>
 
-                <el-option label="是" value="1"></el-option>
-                <el-option label="否" value="2"></el-option>
-              </el-select>
-            </el-form-item>
-          </el-col>
-          <!--
-                </el-row>
 
-                <el-row :gutter="20"> -->
 
-          <el-col :span="8" v-if="assessmentBeforeDislysis.is_hemorrhage == 1&&isShow('出血选项')">
-            <el-form-item label="出血选项： ">
-              <div>
-                <el-input v-model="assessmentBeforeDislysis.hemorrhage" @focus="showInnerDialog('6')"></el-input>
-              </div>
-            </el-form-item>
-          </el-col>
-          <el-col :span="8" v-if="assessmentBeforeDislysis.is_hemorrhage == 1&&isShow('其他出血情况')">
-            <el-form-item label="其他出血情况： ">
-              <el-input v-model="assessmentBeforeDislysis.hemorrhage_other"></el-input>
+
+          <el-col :span="8">
+            <el-form-item label="透析机型号:" v-if="isShow('透析机型号')">
+              <el-input v-model="assessmentBeforeDislysis.machine_type"></el-input>
             </el-form-item>
           </el-col>
-        </el-row>
-
 
-        <el-row :gutter="20" v-if="isShow('透析频次')">
-          <el-col :span="8">
+          <el-col :span="8" v-if="isShow('透析频次')">
             <el-form-item label="透析频次(次/周):">
               <el-input v-model="assessmentBeforeDislysis.dialysis_count"></el-input>
             </el-form-item>
@@ -250,13 +225,12 @@
           </el-col>
 
           <el-col :span="8">
-            <el-form-item label="血管通路其他:" v-if="isShow('血管通路(内瘘)其他')">
+            <el-form-item label="血管通路(内瘘)其他:" v-if="isShow('血管通路(内瘘)其他')">
               <el-input v-model="assessmentBeforeDislysis.internal_fistula_other"></el-input>
             </el-form-item>
           </el-col>
-          <!-- </el-row>
 
-          <el-row :gutter="20" > -->
+
           <el-col :span="8" v-if="isShow('血管杂音')">
             <el-form-item label="血管杂音： ">
               <el-select v-model="assessmentBeforeDislysis.blood_access_noise">
@@ -269,6 +243,14 @@
           </el-col>
 
 
+          <el-col :span="8">
+            <el-form-item label="穿刺针： " v-if="isShow('穿刺针')">
+              <el-input v-model="assessmentBeforeDislysis.puncture_needle" @focus="showInnerDialog('11')"></el-input>
+            </el-form-item>
+          </el-col>
+
+
+
           <el-col :span="8">
             <el-form-item label="穿刺方式： " v-if="isShow('穿刺方式')">
               <el-select v-model="assessmentBeforeDislysis.puncture_way">
@@ -292,10 +274,8 @@
               </el-select>
             </el-form-item>
           </el-col>
-          <!-- </el-row>
 
 
-          <el-row :gutter="20"> -->
           <el-col :span="8">
 
             <el-form-item label="位置： " v-if="isShow('位置')">
@@ -365,6 +345,7 @@
           </el-col>
 
 
+
           <el-col :span="8" v-if="isShow('其他感染情况')">
             <el-form-item label="其他感染情况:">
               <el-input v-model="assessmentBeforeDislysis.infect_other"></el-input>
@@ -372,6 +353,8 @@
           </el-col>
 
 
+
+
           <el-col :span="8" v-if="isShow('外露')">
             <el-form-item label="外露(cm):">
               <el-input v-model="assessmentBeforeDislysis.exposed"></el-input>
@@ -397,17 +380,31 @@
             </el-form-item>
           </el-col>
 
-
-          <!-- </el-row>
-
-
-          <el-row :gutter="20"> -->
           <el-col :span="24">
             <el-form-item label="备注： ">
               <el-input type="textarea" v-model="assessmentBeforeDislysis.remark" :rows="5"></el-input>
             </el-form-item>
           </el-col>
+          <!-- </el-row>
+
+
+          <el-row :gutter="20"> -->
+          <!--<el-col :span="8">-->
+            <!--<el-form-item label="穿刺方法： " v-if="isShow('穿刺方法')">-->
+
+              <!--<el-select v-model="assessmentBeforeDislysis.puncture_method">-->
+                <!--<el-option :key="0" label="请选择" :value="0"></el-option>-->
+
+                <!--<el-option v-for="item in puncture_method" :label="item.name" :value="item.name"-->
+                           <!--:key="item.id"></el-option>-->
+              <!--</el-select>-->
+
+            <!--</el-form-item>-->
+          <!--</el-col>-->
+
         </el-row>
+
+
       </el-form>
       <span slot="footer" class="dialog-footer">
                 <el-button @click="handleCancle">取 消</el-button>

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

@@ -1299,11 +1299,11 @@
             if (this.waitUploadAdvices.length > 0) {
               const params = {
                 advices: this.waitUploadAdvices,
-                advice_date: parseTime(this.$route.query.date, '{y}-{m}-{d}'),
+                advice_date: uParseTime(this.$route.query.date, '{y}-{m}-{d}'),
                 advice_doctor: this.waitUploadAdvices[0].advice_doctor,
                 advice_type: this.waitUploadAdvices[0].advice_type,
                 parent_id: this.patient_id,
-                start_time: parseTime(this.$route.query.date, '{y}-{m}-{d}'),
+                start_time: uParseTime(this.$route.query.date, '{y}-{m}-{d}'),
                 remark: ''
               }
               CreateGroupAdvice(this.$route.query.patient_id, 0, params).then(rs => {
@@ -1674,11 +1674,11 @@
             if (this.waitUploadAdvices.length > 0) {
               const params = {
                 advices: this.waitUploadAdvices,
-                advice_date: parseTime(this.$route.query.date, '{y}-{m}-{d}'),
+                advice_date: uParseTime(this.$route.query.date, '{y}-{m}-{d}'),
                 advice_doctor: this.waitUploadAdvices[0].advice_doctor,
                 advice_type: this.waitUploadAdvices[0].advice_type,
                 parent_id: this.patient_id,
-                start_time: parseTime(this.$route.query.date, '{y}-{m}-{d}'),
+                start_time: uParseTime(this.$route.query.date, '{y}-{m}-{d}'),
                 remark: ''
               }
               CreateGroupAdvice(this.$route.query.patient_id, 0, params).then(rs => {