Commit 11b92076bdf5289cb7f9b9daaeab3451abb6bc0d
1 parent
f0eff90703
Exists in
master
and in
8 other branches
update
Showing 2 changed files with 74 additions and 0 deletions
platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/ResidentsArchiveController.java
View file @
11b9207
| ... | ... | @@ -59,6 +59,28 @@ |
| 59 | 59 | } |
| 60 | 60 | |
| 61 | 61 | /** |
| 62 | + * 通过证件号,就诊卡号查询居民建档信息,优先返回本院 | |
| 63 | + * @param vcCardNo | |
| 64 | + * @param cardNo | |
| 65 | + * @param request | |
| 66 | + * @return | |
| 67 | + */ | |
| 68 | + @RequestMapping(value = "/findResidentInformation", method = RequestMethod.GET) | |
| 69 | + @ResponseBody | |
| 70 | + @TokenRequired | |
| 71 | + public BaseObjectResponse findResidentInformation(@RequestParam(value = "vcCardNo",required = false) String vcCardNo, | |
| 72 | + @RequestParam(value = "cardNo",required = false) String cardNo, | |
| 73 | + HttpServletRequest request) { | |
| 74 | + ResidentsArchiveQueryRequest queryRequest = new ResidentsArchiveQueryRequest(); | |
| 75 | + queryRequest.setCardNo(cardNo); | |
| 76 | + queryRequest.setVcCardNo(vcCardNo); | |
| 77 | + //获取当前登录用户ID | |
| 78 | + LoginContext loginState = (LoginContext) request.getAttribute("loginContext"); | |
| 79 | + return residentsArchiveFacade.findResidentsArchive(queryRequest,loginState.getId()); | |
| 80 | + } | |
| 81 | + | |
| 82 | + | |
| 83 | + /** | |
| 62 | 84 | * 居民建档接口(新增或修改) |
| 63 | 85 | * @param addRequest |
| 64 | 86 | * @param request |
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ResidentsArchiveFacade.java
View file @
11b9207
| ... | ... | @@ -64,6 +64,58 @@ |
| 64 | 64 | @Autowired |
| 65 | 65 | private SyncDataService syncDataService; |
| 66 | 66 | |
| 67 | + public BaseObjectResponse findResidentsArchive(ResidentsArchiveQueryRequest queryRequest,Integer userId){ | |
| 68 | + | |
| 69 | + List<ResidentsArchiveModel> residents = new ArrayList<>(); | |
| 70 | + | |
| 71 | + String hospitalId = autoMatchFacade.getHospitalId(userId); | |
| 72 | + | |
| 73 | + ResidentsArchiveQuery archiveQuery = new ResidentsArchiveQuery(); | |
| 74 | + archiveQuery.setYn(YnEnums.YES.getId()); | |
| 75 | + if (StringUtils.isNotEmpty(queryRequest.getCardNo())){ | |
| 76 | + archiveQuery.setCertificateNum(queryRequest.getCardNo()); | |
| 77 | + residents = residentsArchiveService.queryResident(archiveQuery); | |
| 78 | + }else if (StringUtils.isNotEmpty(queryRequest.getVcCardNo())){ | |
| 79 | + //通过用户ID查询医院ID | |
| 80 | + | |
| 81 | + archiveQuery.setVcCardNo(queryRequest.getVcCardNo()); | |
| 82 | + archiveQuery.setHospitalId(hospitalId); | |
| 83 | + List<ResidentsArchiveModel> archiveModelList = residentsArchiveService.queryResident(archiveQuery); | |
| 84 | + if (CollectionUtils.isNotEmpty(archiveModelList)){ | |
| 85 | + //判断身份证号是否为null | |
| 86 | + if (StringUtils.isEmpty(archiveModelList.get(0).getCertificateNum())){ | |
| 87 | + residents = archiveModelList; | |
| 88 | + }else { | |
| 89 | + archiveQuery.setHospitalId(null); | |
| 90 | + archiveQuery.setVcCardNo(null); | |
| 91 | + archiveQuery.setCertificateNum(archiveModelList.get(0).getCertificateNum()); | |
| 92 | + residents = residentsArchiveService.queryResident(archiveQuery); | |
| 93 | + } | |
| 94 | + } | |
| 95 | + } | |
| 96 | + | |
| 97 | + ResidentsArchiveModel archiveModel = null; | |
| 98 | + | |
| 99 | + if (residents.size()!=0){ | |
| 100 | + for (ResidentsArchiveModel model : residents){ | |
| 101 | + if (model.getHospitalId().equals(hospitalId)){ | |
| 102 | + archiveModel = model; | |
| 103 | + } | |
| 104 | + } | |
| 105 | + } | |
| 106 | + | |
| 107 | + if (archiveModel==null && residents.size()!=0){ | |
| 108 | + archiveModel = residents.get(0); | |
| 109 | + } | |
| 110 | + return new BaseObjectResponse().setData(archiveModel).setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("成功"); | |
| 111 | + } | |
| 112 | + | |
| 113 | + | |
| 114 | + | |
| 115 | + | |
| 116 | + | |
| 117 | + | |
| 118 | + | |
| 67 | 119 | /** |
| 68 | 120 | * 查询居民健康记录,获取基础数据 |
| 69 | 121 | * @param residentsArchiveQueryRequest |