Merge branch '20201109_pc_vue_new_branch' of http://git.shengws.com/csx/Vue_New into 20201109_pc_vue_new_branch

src/xt_pages/dialysis/details/index.vue

@@ -268,7 +268,6 @@
         :his_is_open="his_is_open"
         :lastAssessment="lastAssessment"
         :stockType="stockType"
-        :dialysis_prescription="dialysis_prescription"
       >
       </nav-igation>
 
@@ -598,7 +597,6 @@ export default {
       patient: { id: 0 }, // 患者信息
       schedual: { id: 0 }, // 患者排班信息
       prescription: { id: 0 }, // 透析处方
-      dialysis_prescription:{id:0},
       solution: { id: 0 }, // 透析方案
       system_prescribe: { id: 0 },
       receiver_treatment_access: { id: 0 }, // 接诊评估
@@ -792,17 +790,25 @@ export default {
         { title: '透后评估', finish: false },
         { title: '治疗小结', finish: false }
       ]
-     
+
       steps[0].finish = this.prescription.id && this.prescription.creater > 0
       steps[1].finish = this.receiver_treatment_access.id > 0
-      steps[2].finish = this.predialysis_evaluation.id > 0 && this.predialysis_evaluation.creater > 0
+      steps[2].finish =
+        this.predialysis_evaluation.id > 0 &&
+        this.predialysis_evaluation.creater > 0
       steps[3].finish = this.doctor_advices.length > 0
       steps[5].finish = this.dialysis_order.id > 0
-      steps[4].finish = this.double_check.id > 0 && this.double_check.creater > 0 &&this.double_check.modifier > 0
-      steps[7].finish = this.dialysis_order.id > 0 && this.dialysis_order.stage == 2
-      
+      steps[7].finish =
+        this.dialysis_order.id > 0 && this.dialysis_order.stage == 2
+
+      steps[4].finish =
+        this.double_check.id > 0 &&
+        this.double_check.creater > 0 &&
+        this.double_check.modifier > 0
       steps[6].finish = this.monitor_records.length > 0
-      steps[8].finish = this.assessment_after_dislysis.id > 0 &&this.assessment_after_dislysis.creater > 0
+      steps[8].finish =
+        this.assessment_after_dislysis.id > 0 &&
+        this.assessment_after_dislysis.creater > 0
       steps[9].finish = this.treatment_summary.id > 0
 
       return steps
@@ -968,13 +974,13 @@ export default {
 
       this.doctor_advices = []
       getDialysisScheduleDetail(this.patient_id, dateStr).then(rs => {
+
         var resp = rs.data
         if (resp.state == 1) {
           var patient = resp.data.patient // 患者信息
           var schedual = resp.data.schedual // 患者排班信息
           console.log("排班22222222222",schedual)
           var prescription = resp.data.prescription // 透析处方
-        
           if (prescription != null) {
             if (prescription.body_fluid == -2) {
               prescription.body_fluid = 0
@@ -987,17 +993,13 @@ export default {
                prescription.plasma_separator  = ""
             }
           }
-         this.prescription = prescription == null ? { id: 0 } : prescription
-         
-         this.dialysis_prescription = prescription
-         this.dialysis_prescription.mode_id = schedual.mode_id
-         console.log("巴以建军2323223233232323232323332",prescription)
+
           var solution = resp.data.solution // 透析方案
-          // console.log("透析方案22223333333333",solution)
+          console.log("透析方案22223333333333",solution)
           var receiver_treatment_access = resp.data.receiver_treatment_access // 接诊评估
 
           var predialysis_evaluation = resp.data.predialysis_evaluation // 透前评估
-          //  console.log("透器评估",predialysis_evaluation)
+           console.log("透器评估",predialysis_evaluation)
           if (predialysis_evaluation != null) {
             if (predialysis_evaluation.blood_access_part_id == -2) {
               predialysis_evaluation.blood_access_part_id = 0
@@ -1038,7 +1040,12 @@ export default {
           }
           var lastMonitorRecord = resp.data.lastMonitorRecord
           var lastAssessmentAfterDislysis = resp.data.lastAssessmentAfterDislysis
-       
+          // if(lastAssessmentAfterDislysis.hypertenison!=""){
+          //   lastAssessmentAfterDislysis.hypertenison = lastAssessmentAfterDislysis.hypertenison.toString()
+          // }
+          //  if(lastAssessmentAfterDislysis.hypopiesia!=""){
+          //   lastAssessmentAfterDislysis.hypopiesia = lastAssessmentAfterDislysis.hypopiesia.toString()
+          // }
           var lastDialysisPrescribe = resp.data.lastDialysisPrescribe
           var lastDryWeightDislysis = resp.data.lastDryWeightDislysis
 
@@ -1069,6 +1076,8 @@ export default {
           this.headNurses = headNurses
           this.system_prescribe = system_prescribe
 
+
+
           this.niprocart_info = []
           this.jms_info = []
           this.fistula_needle_set_info = []
@@ -1106,7 +1115,7 @@ export default {
 
           this.patient = patient
           this.schedual = schedual == null ? { id: 0 } : schedual
-          
+          this.prescription = prescription == null ? { id: 0 } : prescription
           this.solution = solution == null ? { id: 0 } : solution
           this.receiver_treatment_access =
             receiver_treatment_access == null
@@ -1329,7 +1338,7 @@ export default {
         var resp = rs.data
         if (resp.state == 1) {
           var schedules = resp.data.schedules
-        
+          console.log("当前排班信息4444444444444444",schedules)
           this.zone_schedules = this.processedDialysisSchedules(schedules, this.zone_options)
           const patientArr = JSON.parse(JSON.stringify(this.zone_schedules))
           if (this.activeName == 'first') {