Commit a7d320a638c97cbd80b13fc57726e85b1946710c
1 parent
41f925bc62
Exists in
master
and in
6 other branches
产检
Showing 1 changed file with 32 additions and 28 deletions
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntenatalExaminationFacade.java
View file @
a7d320a
| ... | ... | @@ -2502,32 +2502,12 @@ |
| 2502 | 2502 | } |
| 2503 | 2503 | |
| 2504 | 2504 | if (StringUtils.isNotEmpty(vcCardNo)) { |
| 2505 | - | |
| 2506 | - PatientsQuery pquery = new PatientsQuery(); | |
| 2507 | - | |
| 2508 | 2505 | //德州市妇幼保健院医院通过（就诊卡号、银行卡号，社保卡号） 查询出对应的用过的卡号 add lqy |
| 2509 | 2506 | if ("1000000114".equals(hospitalIds)) { |
| 2510 | - pquery.setVcCardNos(dzfyHisService.getDzVcCardNos(vcCardNo)); | |
| 2507 | + patientsQuery.setVcCardNos(dzfyHisService.getDzVcCardNos(vcCardNo)); | |
| 2511 | 2508 | } else { |
| 2512 | - pquery.setVcCardNo(vcCardNo); | |
| 2509 | + patientsQuery.setVcCardNo(vcCardNo); | |
| 2513 | 2510 | } |
| 2514 | - | |
| 2515 | - pquery.setHospitalList(hospitalIds); | |
| 2516 | - pquery.setYn(YnEnums.YES.getId()); | |
| 2517 | - pquery.setBuildType(1); | |
| 2518 | - if (isEnable) { | |
| 2519 | - pquery.setEnable("2"); | |
| 2520 | - } | |
| 2521 | - | |
| 2522 | - List<Patients> list = patientsService.queryPatient1(pquery,"created"); | |
| 2523 | - if (CollectionUtils.isNotEmpty(list)) { | |
| 2524 | - patientsQuery.setCardNo(list.get(0).getCardNo()); | |
| 2525 | - } | |
| 2526 | - else | |
| 2527 | - { | |
| 2528 | - return null; | |
| 2529 | - } | |
| 2530 | - | |
| 2531 | 2511 | } |
| 2532 | 2512 | |
| 2533 | 2513 | patientsQuery.setType(type); |
| ... | ... | @@ -2748,8 +2728,16 @@ |
| 2748 | 2728 | AntExChuQuery antExChuQuery = new AntExChuQuery(); |
| 2749 | 2729 | |
| 2750 | 2730 | //http://jira.healthbaby.com.cn/browse/WEB-2733 |
| 2751 | - antExChuQuery.setPid(patients.getPid()); | |
| 2752 | - //antExChuQuery.setParentId(patients.getId()); | |
| 2731 | + if (StringUtils.isNotEmpty(queryRequest.getVcCardNo())) | |
| 2732 | + { | |
| 2733 | + antExChuQuery.setParentId(patients.getId()); | |
| 2734 | + } | |
| 2735 | + else | |
| 2736 | + { | |
| 2737 | + antExChuQuery.setPid(patients.getPid()); | |
| 2738 | + } | |
| 2739 | + | |
| 2740 | + | |
| 2753 | 2741 | antExChuQuery.setYn(YnEnums.YES.getId()); |
| 2754 | 2742 | Date max = null; |
| 2755 | 2743 | if (!sortList.isEmpty()) { |
| 2756 | 2744 | |
| 2757 | 2745 | |
| ... | ... | @@ -2768,10 +2756,18 @@ |
| 2768 | 2756 | antExQuery.setYn(YnEnums.YES.getId()); |
| 2769 | 2757 | |
| 2770 | 2758 | //http://jira.healthbaby.com.cn/browse/WEB-2733 |
| 2771 | - antExQuery.setPid(patients.getPid()); | |
| 2772 | - //antExQuery.setParentId(patients.getId()); | |
| 2773 | 2759 | |
| 2760 | + if (StringUtils.isNotEmpty(queryRequest.getVcCardNo())) | |
| 2761 | + { | |
| 2762 | + antExQuery.setParentId(patients.getId()); | |
| 2763 | + } | |
| 2764 | + else | |
| 2765 | + { | |
| 2766 | + antExQuery.setPid(patients.getPid()); | |
| 2767 | + } | |
| 2774 | 2768 | |
| 2769 | + | |
| 2770 | + | |
| 2775 | 2771 | antExQuery.setStart(max); |
| 2776 | 2772 | //查询复诊记录 |
| 2777 | 2773 | List<AntenatalExaminationModel> list = antenatalExaminationService.queryAntenatalExamination(antExQuery.convertToQuery()); |
| ... | ... | @@ -2787,8 +2783,16 @@ |
| 2787 | 2783 | antExQuery1.setHospitalId(hospitalId); |
| 2788 | 2784 | |
| 2789 | 2785 | //http://jira.healthbaby.com.cn/browse/WEB-2733 |
| 2790 | - antExQuery1.setPid(patients.getPid()); | |
| 2791 | - //antExQuery1.setParentId(patients.getId()); | |
| 2786 | + | |
| 2787 | + if (StringUtils.isNotEmpty(queryRequest.getVcCardNo())) | |
| 2788 | + { | |
| 2789 | + antExQuery1.setParentId(patients.getId()); | |
| 2790 | + } | |
| 2791 | + else | |
| 2792 | + { | |
| 2793 | + antExQuery1.setPid(patients.getPid()); | |
| 2794 | + } | |
| 2795 | + | |
| 2792 | 2796 | |
| 2793 | 2797 | antExQuery1.setYn(YnEnums.YES.getId()); |
| 2794 | 2798 | antExQuery1.setStart(max); |