diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/VisitController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/VisitController.java index a2257e2..03512f0 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/VisitController.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/VisitController.java @@ -14,7 +14,7 @@ import com.lyms.platform.common.result.BaseObjectResponse; import com.lyms.platform.common.result.BaseResponse; import com.lyms.platform.operate.web.facade.VisitFacade; import com.lyms.platform.operate.web.request.BabyVisitAddRequest; -import com.lyms.platform.operate.web.request.PuerperaVisitQueryRequest; +import com.lyms.platform.operate.web.request.VisitQueryRequest; import com.lyms.platform.operate.web.request.VisitAddRequest; /** @@ -38,16 +38,16 @@ public class VisitController extends RestController { @RequestMapping(value = "/visitpuerpera", method = RequestMethod.GET) @ResponseBody @TokenRequired - public BaseObjectResponse findOneByCardNo(PuerperaVisitQueryRequest puerperaVisitQueryRequest) { + public BaseObjectResponse findOneByCardNo(VisitQueryRequest puerperaVisitQueryRequest) { // 身份证号不为空的情况 - if (StringUtils.isNotEmpty(puerperaVisitQueryRequest.getCardNo())) { + if (StringUtils.isNotEmpty(puerperaVisitQueryRequest.getPhone())) { // 根据身份证号码去查询 - return visitFacade.findOneByCardNo(puerperaVisitQueryRequest.getCardNo()); + return visitFacade.findOneByCardNo(puerperaVisitQueryRequest.getPhone()); } else if (StringUtils.isNotEmpty(puerperaVisitQueryRequest.getId())) { // 根据产妇的id去查询 return visitFacade.findOneById(puerperaVisitQueryRequest.getId()); } - return new BaseObjectResponse().setErrormsg("参数错误,cardno/id 不能都为空").setErrorcode(ErrorCodeConstants.PARAMETER_ERROR); + return new BaseObjectResponse().setErrormsg("参数错误,phone/id 不能都为空").setErrorcode(ErrorCodeConstants.PARAMETER_ERROR); } /** @@ -90,15 +90,15 @@ public class VisitController extends RestController { @TokenRequired @RequestMapping(value = "/visitbaby", method = RequestMethod.GET) @ResponseBody - public BaseObjectResponse findOneBabyByCardNo(PuerperaVisitQueryRequest puerperaVisitQueryRequest) { + public BaseObjectResponse findOneBabyByCardNo(VisitQueryRequest puerperaVisitQueryRequest) { // 根据产妇的身份证号码查询小孩的记录 - if (StringUtils.isNotEmpty(puerperaVisitQueryRequest.getCardNo())) { - return visitFacade.findBabyVisitByMotherCardNo(puerperaVisitQueryRequest.getCardNo()); + if (StringUtils.isNotEmpty(puerperaVisitQueryRequest.getPhone())) { + return visitFacade.findBabyVisitByMotherCardNo(puerperaVisitQueryRequest.getPhone()); // 根据小孩的id去获取访视记录 } else if (StringUtils.isNotEmpty(puerperaVisitQueryRequest.getId())) { return visitFacade.findBabyVisitByBabyId(puerperaVisitQueryRequest.getId()); } - return new BaseObjectResponse().setErrormsg("参数错误,cardno/id 不能都为空").setErrorcode(ErrorCodeConstants.PARAMETER_ERROR); + return new BaseObjectResponse().setErrormsg("参数错误,phone/id 不能都为空").setErrorcode(ErrorCodeConstants.PARAMETER_ERROR); } /** diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/PuerperaVisitQueryRequest.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/PuerperaVisitQueryRequest.java deleted file mode 100644 index 68a8da0..0000000 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/PuerperaVisitQueryRequest.java +++ /dev/null @@ -1,43 +0,0 @@ -package com.lyms.platform.operate.web.request; - -import com.lyms.platform.common.core.annotation.form.Form; -import com.lyms.platform.common.core.annotation.form.FormParam; - -/** - * 产妇访视查询对象 - *

- * 详细描述 - *

- * 示例代码 - * - *

- * 
- * - * @author In_Home - * @version BME V100R001 2016-3-21 - * @since BME V100R001C40B104 - */ -@Form -public class PuerperaVisitQueryRequest { - - @FormParam("phone") - private String cardNo; - - private String id; - - public String getCardNo() { - return cardNo; - } - - public void setCardNo(String cardNo) { - this.cardNo = cardNo; - } - - public String getId() { - return id; - } - - public void setId(String id) { - this.id = id; - } -} \ No newline at end of file diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/VisitQueryRequest.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/VisitQueryRequest.java new file mode 100644 index 0000000..2c39097 --- /dev/null +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/VisitQueryRequest.java @@ -0,0 +1,43 @@ +package com.lyms.platform.operate.web.request; + +import com.lyms.platform.common.core.annotation.form.Form; +import com.lyms.platform.common.core.annotation.form.FormParam; + +/** + * 产妇访视查询对象 + *

+ * 详细描述 + *

+ * 示例代码 + * + *

+ * 
+ * + * @author In_Home + * @version BME V100R001 2016-3-21 + * @since BME V100R001C40B104 + */ +@Form +public class VisitQueryRequest { + + @FormParam("phone") + private String phone; + @FormParam + private String id; + + public String getPhone() { + return phone; + } + + public void setPhone(String phone) { + this.phone = phone; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } +} \ No newline at end of file