|
|
|
@ -337,21 +337,20 @@ public class ApproveController {
|
|
|
|
applyApprove.setApproveState("");
|
|
|
|
applyApprove.setApproveState("");
|
|
|
|
applyApprove.setApproveNotes("");
|
|
|
|
applyApprove.setApproveNotes("");
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
applyApproveService.updateEmrApplyApprove(applyApprove);
|
|
|
|
applyApproveService.updateEmrApplyApprove(applyApprove);
|
|
|
|
}else{
|
|
|
|
}else{
|
|
|
|
boolean flag = FormTokenFlagUtil.isFlag(request);
|
|
|
|
boolean flag = FormTokenFlagUtil.isFlag(request);
|
|
|
|
if (flag) {
|
|
|
|
if (flag) {
|
|
|
|
applyApproveService.addEmrApplyApprove(applyApprove,request);
|
|
|
|
applyApproveService.addEmrApplyApprove(applyApprove,request);
|
|
|
|
|
|
|
|
}else{
|
|
|
|
|
|
|
|
return ResultUtil.error("请不要重复提交!");
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
}
|
|
|
|
//是确认提交情况下发送通知
|
|
|
|
//是确认提交情况下发送通知
|
|
|
|
String applyStateTemp = "2";
|
|
|
|
String applyStateTemp = "2";
|
|
|
|
if(applyApprove.getApplyState().equals(applyStateTemp)){
|
|
|
|
if(applyApprove.getApplyState().equals(applyStateTemp)){
|
|
|
|
sendPowerApproveInterface(applyApprove.getApplyType(),1);
|
|
|
|
sendPowerApproveInterface(applyApprove.getApplyType(),1);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}else{
|
|
|
|
|
|
|
|
return ResultUtil.error("请不要重复提交!");
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
return ResultUtil.ok();
|
|
|
|
return ResultUtil.ok();
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|