20210604v1.5

wisdomcar/src/main/java/com/ccsens/wisdomcar/service/ProjectService.java

@@ -68,14 +68,17 @@ public class ProjectService implements IProjectService {
     @Override
     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()) {
 
+            // 修改平车结束时间点
             boolean needModifyEndTime = bindCar != null && (bindCar.getEndTime() == null || bindCar.getEndTime() == 0);
             if (needModifyEndTime) {
                 log.info("出现异常，未找到绑定平车：{}", stepTask.getTaskSubId());
@@ -112,9 +115,7 @@ public class ProjectService implements IProjectService {
         } else {
             data.setWisdomCarRecordId(operationId);
         }
-        if(ObjectUtil.isNotNull(bindCar)) {
-            data.setPatientCarId(bindCar.getId());
-        }
+        data.setPatientCarId(patientCarId);
         data.setTaskSubId(stepTask.getTaskSubId());
         data.setStepId(stepTask.getStepId());
         data.setPushStatus(Constant.PUSH_STATUS_NO);