|
|
@ -171,11 +171,11 @@ public class TaskServiceImpl implements TaskService {
|
|
|
|
try {
|
|
|
|
try {
|
|
|
|
//根据患者masterId,collectId删除
|
|
|
|
//根据患者masterId,collectId删除
|
|
|
|
boolean stactic = archiveDetailMapper.delFileBySource(masterId, collectId);
|
|
|
|
boolean stactic = archiveDetailMapper.delFileBySource(masterId, collectId);
|
|
|
|
log.info("删除接口调用");
|
|
|
|
|
|
|
|
if (stactic) {
|
|
|
|
if (stactic) {
|
|
|
|
return CommonResult.success("删除成功,masterId:" + masterId+"删除分类:"+collectId);
|
|
|
|
return CommonResult.success("删除成功,masterId:" + masterId+"删除分类:"+collectId);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
} catch (Exception e) {
|
|
|
|
} catch (Exception e) {
|
|
|
|
|
|
|
|
log.error("删除接口失败:"+e.getMessage(),e);
|
|
|
|
return CommonResult.failed("删除失败,masterId:" + masterId+"删除分类:"+collectId);
|
|
|
|
return CommonResult.failed("删除失败,masterId:" + masterId+"删除分类:"+collectId);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
return CommonResult.failed("删除失败,masterId:" + masterId+"删除分类:"+collectId);
|
|
|
|
return CommonResult.failed("删除失败,masterId:" + masterId+"删除分类:"+collectId);
|
|
|
@ -183,40 +183,44 @@ public class TaskServiceImpl implements TaskService {
|
|
|
|
|
|
|
|
|
|
|
|
@Override
|
|
|
|
@Override
|
|
|
|
public CommonResult updateTask(updateTaskDto dto) {
|
|
|
|
public CommonResult updateTask(updateTaskDto dto) {
|
|
|
|
SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
|
|
|
|
try {
|
|
|
|
String format = dateFormat.format(new Date());
|
|
|
|
SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
|
|
|
|
log.info(format + "本次维护任务表传输参数为:" + JSONObject.toJSONString(dto));
|
|
|
|
String format = dateFormat.format(new Date());
|
|
|
|
if (StringUtils.isBlank(dto.getMid())) {
|
|
|
|
log.info(format + "本次维护任务表传输参数为:" + JSONObject.toJSONString(dto));
|
|
|
|
log.info(format + "Mid不能为空!");
|
|
|
|
if (StringUtils.isBlank(dto.getMid())) {
|
|
|
|
log.info(dto.getMid());
|
|
|
|
log.info(format + "Mid不能为空!");
|
|
|
|
return CommonResult.failed("Mid名不能为空");
|
|
|
|
log.info(dto.getMid());
|
|
|
|
}
|
|
|
|
return CommonResult.failed("Mid名不能为空");
|
|
|
|
if (StringUtils.isBlank(dto.getStartTime())) {
|
|
|
|
}
|
|
|
|
log.info(format + "开始时间不能为空!");
|
|
|
|
if (StringUtils.isBlank(dto.getStartTime())) {
|
|
|
|
return CommonResult.failed("开始时间不能为空");
|
|
|
|
log.info(format + "开始时间不能为空!");
|
|
|
|
}
|
|
|
|
return CommonResult.failed("开始时间不能为空");
|
|
|
|
if (StringUtils.isBlank(dto.getEndTime())) {
|
|
|
|
}
|
|
|
|
log.info(format + "结束时间不能为空!");
|
|
|
|
if (StringUtils.isBlank(dto.getEndTime())) {
|
|
|
|
return CommonResult.failed("结束时间不能为空");
|
|
|
|
log.info(format + "结束时间不能为空!");
|
|
|
|
}
|
|
|
|
return CommonResult.failed("结束时间不能为空");
|
|
|
|
if (StringUtils.isBlank(String.valueOf(dto.getStatusFlag()))) {
|
|
|
|
}
|
|
|
|
log.info(format + "任务状态不能为空!");
|
|
|
|
if (StringUtils.isBlank(String.valueOf(dto.getStatusFlag()))) {
|
|
|
|
return CommonResult.failed("任务状态不能为空");
|
|
|
|
log.info(format + "任务状态不能为空!");
|
|
|
|
}
|
|
|
|
return CommonResult.failed("任务状态不能为空");
|
|
|
|
if (StringUtils.isBlank(dto.getSycObj())) {
|
|
|
|
}
|
|
|
|
log.info(format + "SycObj患者信息不能为空!");
|
|
|
|
if (StringUtils.isBlank(dto.getSycObj())) {
|
|
|
|
return CommonResult.failed("SycObj患者信息不能为空");
|
|
|
|
log.info(format + "SycObj患者信息不能为空!");
|
|
|
|
}
|
|
|
|
return CommonResult.failed("SycObj患者信息不能为空");
|
|
|
|
if (StringUtils.isBlank(dto.getPinResult())) {
|
|
|
|
}
|
|
|
|
log.info(format + "备注信息不能为空!");
|
|
|
|
if (StringUtils.isBlank(dto.getPinResult())) {
|
|
|
|
return CommonResult.failed("备注信息不能为空");
|
|
|
|
log.info(format + "备注信息不能为空!");
|
|
|
|
}
|
|
|
|
return CommonResult.failed("备注信息不能为空");
|
|
|
|
if (StringUtils.isBlank(String.valueOf(dto.getSysFlag()))) {
|
|
|
|
}
|
|
|
|
log.info(format + "任务分类不能为空!");
|
|
|
|
if (StringUtils.isBlank(String.valueOf(dto.getSysFlag()))) {
|
|
|
|
return CommonResult.failed("任务分类不能为空");
|
|
|
|
log.info(format + "任务分类不能为空!");
|
|
|
|
}
|
|
|
|
return CommonResult.failed("任务分类不能为空");
|
|
|
|
if (archiveOtherExtMapper.updateByMid(dto)) {
|
|
|
|
}
|
|
|
|
return CommonResult.success("id为:" + dto.getMid() + "任务表维护成功");
|
|
|
|
if (archiveOtherExtMapper.updateByMid(dto)) {
|
|
|
|
|
|
|
|
return CommonResult.success("id为:" + dto.getMid() + "任务表维护成功");
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
} catch (Exception e) {
|
|
|
|
|
|
|
|
log.error("维护任务表失败:"+dto.getMid()+"异常处理"+e.getMessage(),e);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
return CommonResult.success("id为:" + dto.getMid() + "任务表维护失败");
|
|
|
|
return CommonResult.success("id为:" + dto.getMid() + "任务表维护失败");
|
|
|
|
}
|
|
|
|
}
|
|
|
|