|
|
@ -290,7 +290,7 @@ public class WisdomCarService implements IWisdomCarService { |
|
|
|
} |
|
|
|
//开始时间不能大于当前时间,结束时间不能小于开始时间
|
|
|
|
//System.out.println(System.currentTimeMillis());
|
|
|
|
if (param.getEndTime() < param.getStartTime() || param.getStartTime() > System.currentTimeMillis()){ |
|
|
|
if (param.getEndTime()!= 0 && param.getEndTime() != null && param.getEndTime() < param.getStartTime()){ |
|
|
|
throw new BaseException(CodeEnum.PARAM_ERROR); |
|
|
|
} |
|
|
|
// 判断平车是否在运行中
|
|
|
@ -368,5 +368,27 @@ public class WisdomCarService implements IWisdomCarService { |
|
|
|
return bindingCarList; |
|
|
|
} |
|
|
|
|
|
|
|
@Override |
|
|
|
public List<WisdomCarVo.queryBindingCarRun> queryBindingCarRun(WisdomCarDto.queryBindingCarRun param) { |
|
|
|
List<WisdomCarVo.queryBindingCarRun> queryBindingCarRunList = patientWisdomCarDao.queryBindingCarIsRun(param.getCarId()); |
|
|
|
if(CollectionUtil.isEmpty(queryBindingCarRunList)){ |
|
|
|
log.info("未找到对应的平车在运行"); |
|
|
|
throw new BaseException(CodeEnum.PARAM_ERROR); |
|
|
|
} |
|
|
|
for (WisdomCarVo.queryBindingCarRun queryBindingCarRun : queryBindingCarRunList) { |
|
|
|
//拿到患者id把 患者的信息存入
|
|
|
|
PatientProject patientProject = patientProjectDao.selectByPrimaryKey(queryBindingCarRun.getPatientId()); |
|
|
|
if(ObjectUtil.isNotNull(patientProject)){ |
|
|
|
queryBindingCarRun.setMedicalRecordNum(patientProject.getMedicalRecordNum()); |
|
|
|
queryBindingCarRun.setName(patientProject.getName()); |
|
|
|
queryBindingCarRun.setSex(patientProject.getSex()); |
|
|
|
queryBindingCarRun.setAge(patientProject.getAge()); |
|
|
|
queryBindingCarRun.setIdCard(patientProject.getIdCard()); |
|
|
|
queryBindingCarRun.setPhone(patientProject.getPhone()); |
|
|
|
} |
|
|
|
} |
|
|
|
return queryBindingCarRunList; |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
} |
|
|
|