Commit ddd2c4ba951efe32dd7d86b206ebedd644f0ee04
1 parent
47a225ca41
Exists in
master
and in
1 other branch
产妇增加字段
Showing 1 changed file with 13 additions and 2 deletions
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntenatalExaminationFacade.java
View file @
ddd2c4b
| ... | ... | @@ -77,7 +77,7 @@ |
| 77 | 77 | public BaseResponse addOneAnetExChu(AntExcAddRequest excAddRequest){ |
| 78 | 78 | AntExChuModel antExChuModel = excAddRequest.convertToDataModel(); |
| 79 | 79 | if(StringUtils.isNotEmpty(antExChuModel.getId()) &&StringUtils.isNotEmpty(antExChuModel.getParentId())){ |
| 80 | - antenatalExaminationService.updateAntExChu(antExChuModel,antExChuModel.getId()); | |
| 80 | + antenatalExaminationService.updateAntExChu(antExChuModel, antExChuModel.getId()); | |
| 81 | 81 | }else{ |
| 82 | 82 | antExChuModel.setYn(YnEnums.YES.getId()); |
| 83 | 83 | antenatalExaminationService.addOneAntEx(antExChuModel); |
| ... | ... | @@ -146,7 +146,9 @@ |
| 146 | 146 | public BaseResponse queryAntenatalExamination(AntenatalExaminationQueryRequest queryRequest){ |
| 147 | 147 | //查询产妇数据 |
| 148 | 148 | Patients patients = findOnePatient(queryRequest.getCardNo(),queryRequest.getVcCardNo()); |
| 149 | - | |
| 149 | + if(null==patients){ | |
| 150 | + return new BaseResponse().setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("没有产妇信息"); | |
| 151 | + } | |
| 150 | 152 | AntexListResult antexListResult = new AntexListResult(); |
| 151 | 153 | AntExChuQuery antExChuQuery=new AntExChuQuery(); |
| 152 | 154 | antExChuQuery.setParentId(patients.getId()); |
| ... | ... | @@ -184,6 +186,15 @@ |
| 184 | 186 | }else{ |
| 185 | 187 | //查询初诊数据 |
| 186 | 188 | AntexChuResult antexChuResult= new AntexChuResult(); |
| 189 | + AntExChuQuery antExChuQuery=new AntExChuQuery(); | |
| 190 | + antExChuQuery.setYn(YnEnums.YES.getId()); | |
| 191 | + antExChuQuery.setId(antExQueryRequest.getId()); | |
| 192 | + List<AntExChuModel> antExChuModels = antenatalExaminationService.queryAntExChu(antExChuQuery); | |
| 193 | + AntExChuModel antExChuModel=null; | |
| 194 | + if(CollectionUtils.isNotEmpty(antExChuModels)){ | |
| 195 | + antExChuModels.get(0); | |
| 196 | + } | |
| 197 | + antexChuResult.convertToResult(antExChuModel); | |
| 187 | 198 | object=antexChuResult; |
| 188 | 199 | } |
| 189 | 200 |