Commit 2950f6910243941d6ece536cd5406e8c1ececfd4
1 parent
bfce6acbd3
Exists in
master
and in
1 other branch
增加设置parentid
Showing 1 changed file with 21 additions and 12 deletions
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MatDeliverFacade.java
View file @
2950f69
| ... | ... | @@ -106,10 +106,10 @@ |
| 106 | 106 | List<BabyModel> babyModels = babyService.queryBabyWithQuery(babyModelQuery); |
| 107 | 107 | if (CollectionUtils.isEmpty(babyModels)) { |
| 108 | 108 | handBaby(deliverAddRequest, babyList, maternalDeliverModel, list, babyIds, parentId, userName, patients1); |
| 109 | - }else{ | |
| 110 | - List<MaternalDeliverModel.Baby> babies=new ArrayList<>(); | |
| 111 | - for(BabyModel babyModel:babyModels){ | |
| 112 | - MaternalDeliverModel.Baby baby1 = new MaternalDeliverModel.Baby(babyModel); | |
| 109 | + } else { | |
| 110 | + List<MaternalDeliverModel.Baby> babies = new ArrayList<>(); | |
| 111 | + for (BabyModel babyModel : babyModels) { | |
| 112 | + MaternalDeliverModel.Baby baby1 = new MaternalDeliverModel.Baby(babyModel); | |
| 113 | 113 | babies.add(baby1); |
| 114 | 114 | } |
| 115 | 115 | maternalDeliverModel.setBaby(babies); |
| 116 | 116 | |
| 117 | 117 | |
| ... | ... | @@ -281,13 +281,26 @@ |
| 281 | 281 | if (null == patients) { |
| 282 | 282 | return new BaseResponse().setErrormsg("没有相关的产妇记录").setErrorcode(ErrorCodeConstants.BUSINESS_ERROR); |
| 283 | 283 | }*/ |
| 284 | + //外院的孕妇 | |
| 285 | + Patients patients1 = antenatalExaminationFacade.findOnePatient(deliverQueryRequest.getCardNo(), deliverQueryRequest.getVcCardNo(), null, null, 1); | |
| 286 | + //外院的产妇 | |
| 287 | +// Patients patients2 = antenatalExaminationFacade.findOnePatient(deliverQueryRequest.getCardNo(), deliverQueryRequest.getVcCardNo(), null, null, 3); | |
| 288 | + | |
| 284 | 289 | //http://jira.healthbaby.com.cn/browse/WEB-204 修改bug |
| 285 | - Patients patients = antenatalExaminationFacade.findOnePatient(deliverQueryRequest.getCardNo(), deliverQueryRequest.getVcCardNo(), null, hospital, 1); | |
| 286 | - if(null==patients){ | |
| 287 | - return new BaseResponse().setErrormsg("该孕妇还未在本院建档不能进行产分娩").setErrorcode(ErrorCodeConstants.NO_DATA); | |
| 290 | + //本院的孕妇 | |
| 291 | + Patients patients = antenatalExaminationFacade.findOnePatient(deliverQueryRequest.getCardNo(), deliverQueryRequest.getVcCardNo(), null, hospital, 1); | |
| 292 | + //本院产妇 | |
| 293 | + Patients patients3 = antenatalExaminationFacade.findOnePatient(deliverQueryRequest.getCardNo(), deliverQueryRequest.getVcCardNo(), null, hospital, 3); | |
| 294 | + //本院产妇，并且本院没建档需要提醒补录记录 | |
| 295 | + if(null!=patients3 && null==patients){ | |
| 296 | + patients=patients3; | |
| 297 | + //外院的孕妇在本院没有建档需要提醒建档 | |
| 298 | + }else if (null != patients1 && null == patients) { | |
| 299 | + return new BaseResponse().setErrormsg("该孕妇还未在本院建档不能进行分娩").setErrorcode(ErrorCodeConstants.NO_DATA); | |
| 288 | 300 | } |
| 289 | 301 | |
| 290 | 302 | |
| 303 | + | |
| 291 | 304 | MatDeliverQuery matDeliverQuery = new MatDeliverQuery(); |
| 292 | 305 | matDeliverQuery.setPid(patients.getPid()); |
| 293 | 306 | matDeliverQuery.setYn(YnEnums.YES.getId()); |
| 294 | 307 | |
| ... | ... | @@ -298,15 +311,13 @@ |
| 298 | 311 | antExQuery.setParentId(patients.getId()); |
| 299 | 312 | antExQuery.setYn(YnEnums.YES.getId()); |
| 300 | 313 | List<AntenatalExaminationModel> examinationModel = antenatalExaminationService.queryAntenatalExamination(antExQuery.convertToQuery()); |
| 301 | - HighScoreResult highScoreResult = antenatalExaminationFacade.findLastRisk(patients.getId(),false); | |
| 314 | + HighScoreResult highScoreResult = antenatalExaminationFacade.findLastRisk(patients.getId(), false); | |
| 302 | 315 | try { |
| 303 | 316 | String tTireNumber = ""; |
| 304 | 317 | |
| 305 | 318 | if (CollectionUtils.isNotEmpty(examinationModel)) { |
| 306 | 319 | if (null != examinationModel && StringUtils.isNotEmpty(examinationModel.get(0).getRiskFactor())) { |
| 307 | 320 | tTireNumber = examinationModel.get(0).getTireNumber(); |
| 308 | - /* List l = JsonUtil.toList(examinationModel.get(0).getRiskFactor(), List.class); | |
| 309 | - findBasicConfig(l,data);*/ | |
| 310 | 321 | } |
| 311 | 322 | } else { |
| 312 | 323 | AntExChuQuery antExChuQuery = new AntExChuQuery(); |
| ... | ... | @@ -315,8 +326,6 @@ |
| 315 | 326 | List<AntExChuModel> antExChuModels = antenatalExaminationService.queryAntExChu(antExChuQuery); |
| 316 | 327 | if (CollectionUtils.isNotEmpty(antExChuModels)) { |
| 317 | 328 | tTireNumber = antExChuModels.get(0).getTireNumber(); |
| 318 | - /* List l = JsonUtil.toList(antExChuModels.get(0).getHighrisk(), List.class); | |
| 319 | - findBasicConfig(l,data);*/ | |
| 320 | 329 | } |
| 321 | 330 | } |
| 322 | 331 |