diff --git a/platform-dal/src/main/java/com/lyms/platform/query/BabyModelQuery.java b/platform-dal/src/main/java/com/lyms/platform/query/BabyModelQuery.java index 5b6a859..f8abaed 100644 --- a/platform-dal/src/main/java/com/lyms/platform/query/BabyModelQuery.java +++ b/platform-dal/src/main/java/com/lyms/platform/query/BabyModelQuery.java @@ -676,6 +676,18 @@ public class BabyModelQuery extends BaseQuery implements IConvertToNativeQuery { //隆化-儿童建档-自动结案时间 private Date settleTimeStart; private Date settleTimeEnd; + /** + * 隆化-儿童预约建档号(根据最新一条儿童档案的就诊号数字段+1生成) + */ + private String vcCardNoArticle; + + public String getVcCardNoArticle() { + return vcCardNoArticle; + } + + public void setVcCardNoArticle(String vcCardNoArticle) { + this.vcCardNoArticle = vcCardNoArticle; + } public Integer getSettleType() { return settleType; @@ -2180,7 +2192,9 @@ public class BabyModelQuery extends BaseQuery implements IConvertToNativeQuery { if (StringUtils.isNotEmpty(babyAddress)) { condition = condition.and("babyAddress", babyAddress, MongoOper.IN); } - + if (StringUtils.isNotEmpty(vcCardNoArticle)) { + condition = condition.and("vcCardNoArticle", vcCardNoArticle, MongoOper.IS); + } Criteria c = null; if (null != birthStart) { c = Criteria.where("birth").gte(birthStart); diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/BabyBuildController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/BabyBuildController.java index f78c177..8accf3f 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/BabyBuildController.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/BabyBuildController.java @@ -1111,9 +1111,9 @@ public class BabyBuildController extends BaseController { @ResponseBody @TokenRequired public BaseResponse babyBuildVcardNew(HttpServletRequest httpServletRequest, - @RequestParam(value = "vcard", required = false) String vcard) { + @RequestParam(value = "vcCardNoArticle", required = false) String vcCardNoArticle) { LoginContext loginState = (LoginContext) httpServletRequest.getAttribute("loginContext"); - return babyBookbuildingFacade.babyBuildVcardNew(vcard,loginState.getId()); + return babyBookbuildingFacade.babyBuildVcardNew(vcCardNoArticle,loginState.getId()); } /** * 儿童建档 根据id查询预建档信息 diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyBookbuildingFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyBookbuildingFacade.java index 753e220..6d812e9 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyBookbuildingFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyBookbuildingFacade.java @@ -6391,7 +6391,6 @@ public class BabyBookbuildingFacade { //查询是否存在 BabyModelQuery babyModelQuery=new BabyModelQuery(); babyModelQuery.setHospitalId(request.getHospitalId()); - babyModelQuery.setMcertNo(request.getMommyCardNo()); Map map=new HashMap<>(); map.put("mcertNo", request.getMommyCardNo()); map.put("mphone", request.getPhone()); @@ -6443,7 +6442,7 @@ public class BabyBookbuildingFacade { return new BaseObjectResponse().setErrormsg("成功").setErrorcode(ErrorCodeConstants.SUCCESS); } - public BaseResponse babyBuildVcardNew(String vcard,Integer userId) { + public BaseResponse babyBuildVcardNew(String vcCardNoArticle,Integer userId) { String hospitalId = autoMatchFacade.getHospitalId(userId); BaseResponse baseResponse=new BaseResponse(); baseResponse.setErrormsg("成功").setErrorcode(ErrorCodeConstants.SUCCESS); @@ -6453,12 +6452,12 @@ public class BabyBookbuildingFacade { babyModelQuery.setNeed("y"); babyModelQuery.setPage(1); babyModelQuery.setLimit(10); - //判断是否重复 - if(StringUtils.isNotEmpty(vcard)){ - babyModelQuery.setVcCardNo(vcard); + //判断预建档号是否重复 + if(StringUtils.isNotEmpty(vcCardNoArticle)){ + babyModelQuery.setVcCardNoArticle(vcCardNoArticle); List models = babyBookbuildingService.queryBabyBuildByCond(babyModelQuery); if(CollectionUtils.isNotEmpty(models)){ - return baseResponse.setErrormsg("就诊卡号:"+vcard+"已存在请刷新页面重新获取").setErrorcode(ErrorCodeConstants.DATA_EXIST); + return baseResponse.setErrormsg("就诊卡号:"+vcCardNoArticle+"已存在请刷新页面重新获取").setErrorcode(ErrorCodeConstants.DATA_EXIST); } } //新就诊卡号