From 65d82da7afa7667c4b86d801f830515310ef2cfd Mon Sep 17 00:00:00 2001
From: zhizhi wu <2377881365@qq.com>
Date: Fri, 4 Jun 2021 20:36:46 +0800
Subject: [PATCH] patientCarId

---
 .../java/com/ccsens/wisdomcar/service/ProjectService.java | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/wisdomcar/src/main/java/com/ccsens/wisdomcar/service/ProjectService.java b/wisdomcar/src/main/java/com/ccsens/wisdomcar/service/ProjectService.java
index 1d436860..ce922aa8 100644
--- a/wisdomcar/src/main/java/com/ccsens/wisdomcar/service/ProjectService.java
+++ b/wisdomcar/src/main/java/com/ccsens/wisdomcar/service/ProjectService.java
@@ -69,15 +69,15 @@ public class ProjectService implements IProjectService {
     public void saveData(Long startTime, StepTask stepTask, Long operationId, byte operation) {
         //患者平车id
         Long patientCarId = null;
+        ProjectVo.BindCar bindCar = stepTaskDao.getBindCarTaskId(stepTask.getTaskSubId());
+        if(ObjectUtil.isNotNull(bindCar)){
+            patientCarId = bindCar.getCarId();
+        }
         // 判断是否为结束结点
         Step step = stepDao.selectByPrimaryKey(stepTask.getStepId());
         Integer max = stepDao.getMaxSequence(Constant.STEP_TYPE_REAL);
         if (step != null && max != null && step.getSequence() != null && step.getSequence().intValue() == max.intValue()) {
             // 修改平车结束时间点
-            ProjectVo.BindCar bindCar = stepTaskDao.getBindCarTaskId(stepTask.getTaskSubId());
-            if(ObjectUtil.isNotNull(bindCar)){
-                patientCarId = bindCar.getCarId();
-            }
             boolean needModifyEndTime = bindCar != null && (bindCar.getEndTime() == null || bindCar.getEndTime() == 0);
             if (needModifyEndTime) {
                 log.info("出现异常，未找到绑定平车：{}", stepTask.getTaskSubId());