Commit 958757105d1c27e54bcebd044ec2e8c740fc5301
1 parent
f4fadcfc64
Exists in
master
and in
6 other branches
威海产后观察
Showing 1 changed file with 12 additions and 3 deletions
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PostpartumRecordsFacade.java
View file @
9587571
| ... | ... | @@ -87,9 +87,18 @@ |
| 87 | 87 | else if(StringUtils.isNotEmpty(prQueryRequest.getVcCardNo())){ |
| 88 | 88 | patientsQuery.setVcCardNo(prQueryRequest.getVcCardNo()); |
| 89 | 89 | }else if(StringUtils.isNotEmpty(prQueryRequest.getId())){ |
| 90 | - prQuery.setId(prQueryRequest.getId()); | |
| 90 | + MatDeliverQuery matDeliverQuery1 = new MatDeliverQuery(); | |
| 91 | + matDeliverQuery1.setId(prQueryRequest.getId()); | |
| 92 | + matDeliverQuery1.setYn(YnEnums.YES.getId()); | |
| 93 | + List<MaternalDeliverModel> mdList1 = matDeliverService.query(matDeliverQuery1); | |
| 94 | + if(CollectionUtils.isNotEmpty(mdList1)){ | |
| 95 | + patientsQuery.setId(mdList1.get(0).getParentId()); | |
| 96 | + } | |
| 97 | + /*prQuery.setId(prQueryRequest.getId()); | |
| 91 | 98 | prQuery.setIsDelete("1"); |
| 92 | - prList = postpartumRecordsService.getPostpartumRecordsQuery(prQuery); | |
| 99 | + prList = postpartumRecordsService.getPostpartumRecordsQuery(prQuery);*/ | |
| 100 | + }else{ | |
| 101 | + return new BaseObjectResponse().setErrormsg("参数传入错误！").setErrorcode(ErrorCodeConstants.PARAMETER_ERROR); | |
| 93 | 102 | } |
| 94 | 103 | //patientsQuery.setHospitalId(hospital); |
| 95 | 104 | //查询孕妇 |
| ... | ... | @@ -107,7 +116,7 @@ |
| 107 | 116 | prQuery.setParentId(parentId); |
| 108 | 117 | prQuery.setIsDelete("1"); |
| 109 | 118 | prQuery.setId(null); |
| 110 | - //prQuery.setHospitalId(hospital); | |
| 119 | + prQuery.setHospitalId(hospital); | |
| 111 | 120 | if(CollectionUtils.isEmpty(prList)){ |
| 112 | 121 | prList = postpartumRecordsService.getPostpartumRecordsQuery(prQuery); |
| 113 | 122 | } |