Commit c312897fa79687676b0f5833180018686c34624c
1 parent
61fbe24168
Exists in
master
and in
1 other branch
lis报告
Showing 3 changed files with 24 additions and 13 deletions
platform-dal/src/main/java/com/lyms/platform/query/PatientsQuery.java
View file @
c312897
| ... | ... | @@ -1215,12 +1215,14 @@ |
| 1215 | 1215 | } |
| 1216 | 1216 | else |
| 1217 | 1217 | { |
| 1218 | - if (StringUtils.isNotEmpty(pv[0])) { | |
| 1219 | - condition = condition.and("phone", pv[0], MongoOper.IS); | |
| 1220 | - } | |
| 1221 | - | |
| 1222 | 1218 | if (StringUtils.isNotEmpty(pv[1])) { |
| 1223 | 1219 | condition = condition.and("vcCardNo", pv[1], MongoOper.IS); |
| 1220 | + } | |
| 1221 | + else if (StringUtils.isNotEmpty(pv[2])) { | |
| 1222 | + condition = condition.and("cardNo", pv[2], MongoOper.IS); | |
| 1223 | + } | |
| 1224 | + else if (StringUtils.isNotEmpty(pv[0])) { | |
| 1225 | + condition = condition.and("phone", pv[0], MongoOper.IS); | |
| 1224 | 1226 | } |
| 1225 | 1227 | } |
| 1226 | 1228 | } |
platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/LisController.java
View file @
c312897
| ... | ... | @@ -122,6 +122,8 @@ |
| 122 | 122 | * 包含这个孕妇在整个区域的lis、ris数据 |
| 123 | 123 | * @param vcCardNo 就诊卡号 |
| 124 | 124 | * @param sortType 排序类型(1,根据日期分类;2,根据检查项目分类) |
| 125 | + * @param phone 手机号码 | |
| 126 | + * @param cardNo 身份证号码 | |
| 125 | 127 | * @return |
| 126 | 128 | */ |
| 127 | 129 | @RequestMapping(method = RequestMethod.GET, value = "/getLisAndRisData") |
| 128 | 130 | |
| ... | ... | @@ -130,9 +132,10 @@ |
| 130 | 132 | public BaseResponse getLisAndRisData(@RequestParam(required = false) String vcCardNo, |
| 131 | 133 | @RequestParam("sortType") Integer sortType, |
| 132 | 134 | @RequestParam(required = false) String phone, |
| 135 | + @RequestParam(required = false) String cardNo, | |
| 133 | 136 | HttpServletRequest request) { |
| 134 | 137 | LoginContext loginState = (LoginContext) request.getAttribute("loginContext"); |
| 135 | - return lisFacade.getLisAndRisData(vcCardNo, phone, sortType, loginState.getId()); | |
| 138 | + return lisFacade.getLisAndRisData(vcCardNo, phone,cardNo, sortType, loginState.getId()); | |
| 136 | 139 | } |
| 137 | 140 | |
| 138 | 141 |
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/LisFacade.java
View file @
c312897
| ... | ... | @@ -86,13 +86,13 @@ |
| 86 | 86 | * @param sortType 排序类型(1,根据日期分类;2,根据检查项目分类) |
| 87 | 87 | * @return |
| 88 | 88 | */ |
| 89 | - public BaseResponse getLisAndRisData(String vcCardNo,String phone,Integer sortType,Integer userId) { | |
| 89 | + public BaseResponse getLisAndRisData(String vcCardNo,String phone,String cardNo,Integer sortType,Integer userId) { | |
| 90 | 90 | |
| 91 | 91 | List<CheckByDate> checkByDate=new ArrayList<CheckByDate>(); |
| 92 | 92 | //根据用户id获取医院ID |
| 93 | 93 | String hospitalId = autoMatchFacade.getHospitalId(userId); |
| 94 | 94 | |
| 95 | - List<CheckResponse> result = queryLisCheckList(vcCardNo,phone,hospitalId); | |
| 95 | + List<CheckResponse> result = queryLisCheckList(vcCardNo,phone,hospitalId,cardNo); | |
| 96 | 96 | |
| 97 | 97 | //排序检查大项 |
| 98 | 98 | sortLis(result); |
| 99 | 99 | |
| ... | ... | @@ -231,10 +231,11 @@ |
| 231 | 231 | * 4、封装lis数据 |
| 232 | 232 | * @param vcCardNo 就诊卡号 |
| 233 | 233 | * @param phone 手机号码 |
| 234 | - * @param userId 用户ID | |
| 234 | + * @param hospitalId 用户ID | |
| 235 | + * @param cardNo 身份证号码 | |
| 235 | 236 | * @return |
| 236 | 237 | */ |
| 237 | - public List<CheckResponse> queryLisCheckList(String vcCardNo,String phone,String hospitalId) { | |
| 238 | + public List<CheckResponse> queryLisCheckList(String vcCardNo,String phone,String hospitalId,String cardNo) { | |
| 238 | 239 | |
| 239 | 240 | //保存这个人在所有医院的lis记录 |
| 240 | 241 | List<CheckResponse> result = new ArrayList<>(); |
| ... | ... | @@ -248,7 +249,7 @@ |
| 248 | 249 | organizationQuery.setYn(YnEnums.YES.getId()); |
| 249 | 250 | |
| 250 | 251 | PatientsQuery patientsQuery=new PatientsQuery(); |
| 251 | - String[] strs = new String[]{phone, vcCardNo}; | |
| 252 | + String[] strs = new String[]{phone, vcCardNo,cardNo}; | |
| 252 | 253 | patientsQuery.setPv(strs); |
| 253 | 254 | patientsQuery.setHospitalId(hospitalId); |
| 254 | 255 | patientsQuery.setYn(YnEnums.YES.getId()); |
| ... | ... | @@ -270,7 +271,7 @@ |
| 270 | 271 | if (pat != null && StringUtils.isNotEmpty(pat.getHospitalId())) |
| 271 | 272 | { |
| 272 | 273 | |
| 273 | - if (StringUtils.isEmpty(pat.getVcCardNo()) && StringUtils.isEmpty(pat.getPhone())) | |
| 274 | + if (StringUtils.isEmpty(pat.getVcCardNo()) && StringUtils.isEmpty(pat.getPhone()) && StringUtils.isEmpty(pat.getCardNo())) | |
| 274 | 275 | { |
| 275 | 276 | continue; |
| 276 | 277 | } |
| ... | ... | @@ -290,7 +291,7 @@ |
| 290 | 291 | LisReportQuery model = new LisReportQuery(); |
| 291 | 292 | model.setHospitalId(pat.getHospitalId()); |
| 292 | 293 | //通过就诊卡号和医院id查询到医院下面的lis记录 |
| 293 | - List<LisReportModel> lises = queryLisData(pat.getVcCardNo(), pat.getPhone(), model); | |
| 294 | + List<LisReportModel> lises = queryLisData(pat.getVcCardNo(), pat.getPhone(),pat.getCardNo(), model); | |
| 294 | 295 | if (CollectionUtils.isNotEmpty(lises)) |
| 295 | 296 | { |
| 296 | 297 | for (LisReportModel lis : lises) |
| ... | ... | @@ -372,7 +373,7 @@ |
| 372 | 373 | * @param model |
| 373 | 374 | * @return |
| 374 | 375 | */ |
| 375 | - private List<LisReportModel> queryLisData(String vcCardNo, String phone,LisReportQuery model) { | |
| 376 | + private List<LisReportModel> queryLisData(String vcCardNo, String phone,String cardNo,LisReportQuery model) { | |
| 376 | 377 | |
| 377 | 378 | |
| 378 | 379 | List<LisReportModel> reportModelList = new ArrayList<>(); |
| ... | ... | @@ -399,6 +400,11 @@ |
| 399 | 400 | { |
| 400 | 401 | //model.setVcCardNo(getZcVcardNo(vcCardNo)); |
| 401 | 402 | model.setVcCardNos(zcfyHisService.getZcVcCardNos(vcCardNo)); |
| 403 | + } | |
| 404 | + //威海市妇幼 因为威海市妇幼有些孕妇没有就诊卡直接用身份证，lis把身份证号码存在就诊卡号字段的 | |
| 405 | + else if ("22".equals(HIS_VERSION)) | |
| 406 | + { | |
| 407 | + model.setVcCardNo(cardNo); | |
| 402 | 408 | } |
| 403 | 409 | else |
| 404 | 410 | { |