See999 3 years ago
parent
commit
481d48ee31
2 changed files with 39 additions and 9 deletions
  1. 1 1
      src/xt_pages/dialysis/PatientBox.vue
  2. 38 8
      src/xt_pages/dialysis/details/index.vue

+ 1 - 1
src/xt_pages/dialysis/PatientBox.vue View File

@@ -45,7 +45,7 @@
45 45
               <p :class="stateColor(schedule)">{{ stateText(schedule) }}</p>
46 46
             </div>
47 47
           </div>
48
-          <div style="margin-top:13px;font-size:12px;color:#a8b3ba;margin-right: 5px;" v-if="schedule.assessment_before_dislysis && patientStateVal == 1">签到时间:{{ getTime(schedule.assessment_before_dislysis.created_time) }}</div>
48
+          <div style="margin-top:13px;font-size:12px;color:#34495e;margin-right: 5px;" v-if="schedule.assessment_before_dislysis && patientStateVal == 1">签到时间:{{ getTime(schedule.assessment_before_dislysis.created_time) }}</div>
49 49
         </div>
50 50
       </div>
51 51
       <div class="function" :class="functionColor(schedule)">

+ 38 - 8
src/xt_pages/dialysis/details/index.vue View File

@@ -188,8 +188,8 @@
188 188
     <div style="width:75%">
189 189
       <div style="margin-left:60px;color:#34495e">
190 190
         <span>{{ patient.name }}({{ patient.dialysis_no }})</span>
191
-        <span v-if="newTime">&nbsp;&nbsp;|&nbsp;&nbsp;</span>
192
-        <span v-if="newTime">签到时间:{{ newTime }}</span> 
191
+        <span v-if="newTime != ''">&nbsp;&nbsp;|&nbsp;&nbsp;</span>
192
+        <span v-if="newTime != ''">签到时间:{{ newTime }}</span> 
193 193
       </div>
194 194
       <nav-igation
195 195
         ref="nav"
@@ -1011,6 +1011,10 @@ export default {
1011 1011
         if (this.solution != null) {
1012 1012
           delete this.solution.target_ultrafiltration
1013 1013
         }
1014
+        if(this.predialysis_evaluation.id > 0){
1015
+          this.newTime = parseTime(this.predialysis_evaluation.created_time, '{h}:{i}')
1016
+        }
1017
+        
1014 1018
         this.loading = false
1015 1019
       })
1016 1020
     },
@@ -1298,9 +1302,9 @@ export default {
1298 1302
         const name = this.$route.query.patient_name
1299 1303
         this.tableData.map((item, index) => {
1300 1304
           if (name == item.patient.name) {
1301
-            if (item.assessment_before_dislysis != null) {
1302
-              this.newTime = parseTime(item.assessment_before_dislysis.created_time, '{h}:{i}')
1303
-            }
1305
+            // if (item.assessment_before_dislysis != null) {
1306
+            //   this.newTime = parseTime(item.assessment_before_dislysis.created_time, '{h}:{i}')
1307
+            // }
1304 1308
 
1305 1309
             setTimeout(() => {
1306 1310
               this.$refs.tab.setCurrentRow(this.tableData[index])
@@ -1322,6 +1326,32 @@ export default {
1322 1326
         // let patientArr =
1323 1327
         if (this.patientStateVal == 0) {
1324 1328
           arr1 = patientArr
1329
+        } else if (this.patientStateVal == 1) {
1330
+          let arr = []
1331
+          arr = patientArr
1332
+          for (let i = 0; i < arr.length; i++) {
1333
+            for (let j = 0; j < arr[i].schedules.length; j++) {
1334
+              if (arr[i].schedules.length > 0 && (arr[i].schedules[j].assessment_before_dislysis == null || (arr[i].schedules[j].assessment_before_dislysis.weight_before == '' && arr[i].schedules[j].assessment_before_dislysis.diastolic_blood_pressure == '' && arr[i].schedules[j].assessment_before_dislysis.systolic_blood_pressure == ''))) {
1335
+                // 删除元素后改变i的值
1336
+                arr[i].schedules.splice(j--, 1)
1337
+              }
1338
+            }
1339
+          }
1340
+          console.log('执行1', arr)
1341
+          arr1 = arr
1342
+        } else if (this.patientStateVal == 2) {
1343
+          let arr = []
1344
+          arr = patientArr
1345
+          for (let i = 0; i < arr.length; i++) {
1346
+            for (let j = 0; j < arr[i].schedules.length; j++) {
1347
+              if (arr[i].schedules.length > 0 && (arr[i].schedules[j].assessment_before_dislysis != null && (arr[i].schedules[j].assessment_before_dislysis.weight_before != 0 || arr[i].schedules[j].assessment_before_dislysis.diastolic_blood_pressure != 0 || arr[i].schedules[j].assessment_before_dislysis.systolic_blood_pressure != 0))) {
1348
+                // 删除元素后改变i的值
1349
+                arr[i].schedules.splice(j--, 1)
1350
+              }
1351
+            }
1352
+          }
1353
+          console.log('执行2', arr)
1354
+          arr1 = arr
1325 1355
         } else if (this.patientStateVal == 3) {
1326 1356
           let arr = []
1327 1357
           arr = patientArr
@@ -1406,9 +1436,9 @@ export default {
1406 1436
         const name = this.$route.query.patient_name
1407 1437
         this.tableData1.map((item, index) => {
1408 1438
           if (name == item.patient.name) {
1409
-            if (item.assessment_before_dislysis != null) {
1410
-              this.newTime = parseTime(item.assessment_before_dislysis.created_time, '{h}:{i}')
1411
-            }
1439
+            // if (item.assessment_before_dislysis != null) {
1440
+            //   this.newTime = parseTime(item.assessment_before_dislysis.created_time, '{h}:{i}')
1441
+            // }
1412 1442
 
1413 1443
             setTimeout(() => {
1414 1444
               this.$refs.tab1.setCurrentRow(this.tableData1[index])