Commit 37eb90b70e6d1eca760ff2aaed872b54cdef9dc2
1 parent
e53211a33a
Exists in
master
and in
6 other branches
lis
Showing 1 changed file with 15 additions and 4 deletions
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/LisFacade.java
View file @
37eb90b
| ... | ... | @@ -361,9 +361,10 @@ |
| 361 | 361 | |
| 362 | 362 | /** |
| 363 | 363 | * 历史检验检查的查看页面 |
| 364 | - * | |
| 365 | - * @param vcCardNo | |
| 366 | - * @param phone | |
| 364 | + * @param vcCardNo 就诊卡 | |
| 365 | + * @param phone 手机号码 | |
| 366 | + * @param cardNo 身份证 | |
| 367 | + * @param perType | |
| 367 | 368 | * @param model |
| 368 | 369 | * @return |
| 369 | 370 | */ |
| ... | ... | @@ -371,7 +372,7 @@ |
| 371 | 372 | |
| 372 | 373 | List<LisReportModel> reportModelList = new ArrayList<>(); |
| 373 | 374 | //通过就诊卡号和医院id查询到医院下面的lis记录 |
| 374 | - if (StringUtils.isNotEmpty(vcCardNo)) { | |
| 375 | + if (StringUtils.isNotEmpty(vcCardNo) || StringUtils.isNotEmpty(cardNo)) { | |
| 375 | 376 | //德州市妇幼 |
| 376 | 377 | if ("1000000114".equals(model.getHospitalId())) { |
| 377 | 378 | model.setVcCardNos(dzfyHisService.getDzVcCardNos(vcCardNo)); |
| ... | ... | @@ -402,6 +403,10 @@ |
| 402 | 403 | else if("2100001097".equals(model.getHospitalId())){ |
| 403 | 404 | model.setVcCardNo(gryyHisService.getIdByVcCardNo(vcCardNo)); |
| 404 | 405 | } |
| 406 | + //隆化县妇幼保健院 lis数据的就诊卡字段保存的病人的身份证号值 | |
| 407 | + else if("2100001605".equals(model.getHospitalId())){ | |
| 408 | + model.setVcCardNo(cardNo); | |
| 409 | + } | |
| 405 | 410 | else { |
| 406 | 411 | model.setVcCardNo(vcCardNo); |
| 407 | 412 | } |
| ... | ... | @@ -542,6 +547,12 @@ |
| 542 | 547 | } |
| 543 | 548 | //仪陇县人民医院 就诊卡号字段存的身份证号码 |
| 544 | 549 | else if ("2100001718".equals(pat.getHospitalId())) { |
| 550 | + vcCardNos.add(pat.getCardNo()); | |
| 551 | + | |
| 552 | + } | |
| 553 | + //隆化县妇幼保健院 lis数据的就诊卡字段保存的病人的身份证号值 | |
| 554 | + else if("2100001605".equals(pat.getHospitalId())) | |
| 555 | + { | |
| 545 | 556 | vcCardNos.add(pat.getCardNo()); |
| 546 | 557 | }else { |
| 547 | 558 | vcCardNos.add(pat.getVcCardNo()); |