diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/SieveController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/SieveController.java index 6feb12c..7431974 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/SieveController.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/SieveController.java @@ -92,6 +92,8 @@ public class SieveController extends BaseController { /** * 查看申请单 + * + * type 1 查看 2 修改 3 结果看 * @param parentId * @param request * @return @@ -99,7 +101,7 @@ public class SieveController extends BaseController { @ResponseBody @TokenRequired @RequestMapping(value = "/getSieveApplyInfo",method = RequestMethod.GET) - public BaseResponse getSieveApplyInfo(@RequestParam("parentId")String parentId,HttpServletRequest request) { + public BaseResponse getSieveApplyInfo(@RequestParam("parentId")String parentId,@RequestParam("type")String type,HttpServletRequest request) { LoginContext loginState = (LoginContext) request.getAttribute("loginContext"); return sieveFacade.getSieveApplyInfo(parentId, loginState.getId()); } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ApplyOrderFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ApplyOrderFacade.java index ac2fc93..4aed219 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ApplyOrderFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ApplyOrderFacade.java @@ -422,7 +422,7 @@ public class ApplyOrderFacade { List modelList = sieveService.queryList(sieveQuery); if (CollectionUtils.isEmpty(modelList)) { SieveModel sieveModel = patientsService.convertToModel(patients); - sieveModel.setReviceStatus(sieveApplyOrderAddRequest.getReviceStatus()); + sieveModel.setReviceStatus(1); sieveModel.setFrom("2"); sieveModel.setHospitalId(orderModel.getHospitalId()); SieveService.handOrder(sieveModel); @@ -455,7 +455,7 @@ public class ApplyOrderFacade { { SieveModel sieveModel = sieveModels.get(0); - sieveModel.setReviceStatus(sieveApplyOrderAddRequest.getReviceStatus()); + sieveModel.setReviceStatus(1); sieveModel.setApplyTime(sieveApplyOrderModel.getApplyTime()); sieveModel.setStatus(2); diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/SieveFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/SieveFacade.java index 4347611..fc3d9df 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/SieveFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/SieveFacade.java @@ -722,7 +722,7 @@ public class SieveFacade { result.put("sendDoctor",sieveApply.getSendDoctor()); result.put("sendTime",DateUtil.getyyyy_MM_dd(sieveApply.getSendTime())); - result.put("sieveApplyInfo",result); + map.put("sieveApplyInfo",result); } return new BaseObjectResponse().setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("成功").setData(map);