diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/RemoteController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/RemoteController.java index 482bb2d..ef6dcaa 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/RemoteController.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/RemoteController.java @@ -107,18 +107,29 @@ public class RemoteController extends BaseController { @RequestMapping(value = "/bookArchive/history",method = RequestMethod.GET) @TokenRequired public void getBookArchive(HttpServletResponse response, String idCard,String cardNum,String phone, HttpServletRequest request){ - LoginContext loginState = (LoginContext) request.getAttribute("loginContext"); - ArchiveDataQuery query = new ArchiveDataQuery(); - query.setIdCard(idCard); - query.setCardNum(cardNum); - query.setPhone(phone); - if (StringUtils.isEmpty(idCard) && StringUtils.isEmpty(cardNum) && StringUtils.isEmpty(phone)) { writeJson(response,"{\"errormsg\": \"参数为空\",\"errorcode\": 4097}"); return; } + LoginContext loginState = (LoginContext) request.getAttribute("loginContext"); + ArchiveDataQuery query = new ArchiveDataQuery(); + //目前phone参数没有传 + if(StringUtils.isNotEmpty(idCard)){ + if(idCard.length() == 11 && idCard.startsWith("1")){ + query.setPhone(idCard); + }else{ + query.setIdCard(idCard); + } + } + //如果phone传了 + if(StringUtils.isNotEmpty(phone)){ + query.setPhone(phone); + } + query.setCardNum(cardNum); + + List list = archiveDataServicer.query(query.convertToQuery()); if (CollectionUtils.isEmpty(list) && StringUtils.isNotEmpty(cardNum)) @@ -286,6 +297,13 @@ public class RemoteController extends BaseController { writeString(response,"success"); } + /** + * 小程序预约直接建档 + * @param response + * @param archiveUser + * @param healthResort + * @param archiveHistoryDTO + */ @RequestMapping(value = "/confirmArchive",method = RequestMethod.POST) public void confirmArchive(HttpServletResponse response, String archiveUser,