Commit 5621ac44771a9a641fbaa8ebccef3219c5b61ba8
1 parent
1d370ce10d
Exists in
master
and in
6 other branches
update
Showing 3 changed files with 22 additions and 9 deletions
platform-dal/src/main/java/com/lyms/platform/query/BabyModelQuery.java
View file @
5621ac4
| ... | ... | @@ -676,7 +676,19 @@ |
| 676 | 676 | //隆化-儿童建档-自动结案时间 |
| 677 | 677 | private Date settleTimeStart; |
| 678 | 678 | private Date settleTimeEnd; |
| 679 | + /** | |
| 680 | + * 隆化-儿童预约建档号（根据最新一条儿童档案的就诊号数字段+1生成） | |
| 681 | + */ | |
| 682 | + private String vcCardNoArticle; | |
| 679 | 683 | |
| 684 | + public String getVcCardNoArticle() { | |
| 685 | + return vcCardNoArticle; | |
| 686 | + } | |
| 687 | + | |
| 688 | + public void setVcCardNoArticle(String vcCardNoArticle) { | |
| 689 | + this.vcCardNoArticle = vcCardNoArticle; | |
| 690 | + } | |
| 691 | + | |
| 680 | 692 | public Integer getSettleType() { |
| 681 | 693 | return settleType; |
| 682 | 694 | } |
| ... | ... | @@ -2180,7 +2192,9 @@ |
| 2180 | 2192 | if (StringUtils.isNotEmpty(babyAddress)) { |
| 2181 | 2193 | condition = condition.and("babyAddress", babyAddress, MongoOper.IN); |
| 2182 | 2194 | } |
| 2183 | - | |
| 2195 | + if (StringUtils.isNotEmpty(vcCardNoArticle)) { | |
| 2196 | + condition = condition.and("vcCardNoArticle", vcCardNoArticle, MongoOper.IS); | |
| 2197 | + } | |
| 2184 | 2198 | Criteria c = null; |
| 2185 | 2199 | if (null != birthStart) { |
| 2186 | 2200 | c = Criteria.where("birth").gte(birthStart); |
platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/BabyBuildController.java
View file @
5621ac4
| ... | ... | @@ -1111,9 +1111,9 @@ |
| 1111 | 1111 | @ResponseBody |
| 1112 | 1112 | @TokenRequired |
| 1113 | 1113 | public BaseResponse babyBuildVcardNew(HttpServletRequest httpServletRequest, |
| 1114 | - @RequestParam(value = "vcard", required = false) String vcard) { | |
| 1114 | + @RequestParam(value = "vcCardNoArticle", required = false) String vcCardNoArticle) { | |
| 1115 | 1115 | LoginContext loginState = (LoginContext) httpServletRequest.getAttribute("loginContext"); |
| 1116 | - return babyBookbuildingFacade.babyBuildVcardNew(vcard,loginState.getId()); | |
| 1116 | + return babyBookbuildingFacade.babyBuildVcardNew(vcCardNoArticle,loginState.getId()); | |
| 1117 | 1117 | } |
| 1118 | 1118 | /** |
| 1119 | 1119 | * 儿童建档 根据id查询预建档信息 |
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyBookbuildingFacade.java
View file @
5621ac4
| ... | ... | @@ -6391,7 +6391,6 @@ |
| 6391 | 6391 | //查询是否存在 |
| 6392 | 6392 | BabyModelQuery babyModelQuery=new BabyModelQuery(); |
| 6393 | 6393 | babyModelQuery.setHospitalId(request.getHospitalId()); |
| 6394 | - babyModelQuery.setMcertNo(request.getMommyCardNo()); | |
| 6395 | 6394 | Map<String,Object> map=new HashMap<>(); |
| 6396 | 6395 | map.put("mcertNo", request.getMommyCardNo()); |
| 6397 | 6396 | map.put("mphone", request.getPhone()); |
| ... | ... | @@ -6443,7 +6442,7 @@ |
| 6443 | 6442 | return new BaseObjectResponse().setErrormsg("成功").setErrorcode(ErrorCodeConstants.SUCCESS); |
| 6444 | 6443 | } |
| 6445 | 6444 | |
| 6446 | - public BaseResponse babyBuildVcardNew(String vcard,Integer userId) { | |
| 6445 | + public BaseResponse babyBuildVcardNew(String vcCardNoArticle,Integer userId) { | |
| 6447 | 6446 | String hospitalId = autoMatchFacade.getHospitalId(userId); |
| 6448 | 6447 | BaseResponse baseResponse=new BaseResponse(); |
| 6449 | 6448 | baseResponse.setErrormsg("成功").setErrorcode(ErrorCodeConstants.SUCCESS); |
| 6450 | 6449 | |
| ... | ... | @@ -6453,12 +6452,12 @@ |
| 6453 | 6452 | babyModelQuery.setNeed("y"); |
| 6454 | 6453 | babyModelQuery.setPage(1); |
| 6455 | 6454 | babyModelQuery.setLimit(10); |
| 6456 | - //判断是否重复 | |
| 6457 | - if(StringUtils.isNotEmpty(vcard)){ | |
| 6458 | - babyModelQuery.setVcCardNo(vcard); | |
| 6455 | + //判断预建档号是否重复 | |
| 6456 | + if(StringUtils.isNotEmpty(vcCardNoArticle)){ | |
| 6457 | + babyModelQuery.setVcCardNoArticle(vcCardNoArticle); | |
| 6459 | 6458 | List<BabyModel> models = babyBookbuildingService.queryBabyBuildByCond(babyModelQuery); |
| 6460 | 6459 | if(CollectionUtils.isNotEmpty(models)){ |
| 6461 | - return baseResponse.setErrormsg("就诊卡号:"+vcard+"已存在请刷新页面重新获取").setErrorcode(ErrorCodeConstants.DATA_EXIST); | |
| 6460 | + return baseResponse.setErrormsg("就诊卡号:"+vcCardNoArticle+"已存在请刷新页面重新获取").setErrorcode(ErrorCodeConstants.DATA_EXIST); | |
| 6462 | 6461 | } |
| 6463 | 6462 | } |
| 6464 | 6463 | //新就诊卡号 |