Commit e373d80ab050ac39d11b4d5c67af0672d027c00b
1 parent
df5ce08339
Exists in
master
and in
1 other branch
修改新电子病历
Showing 1 changed file with 19 additions and 5 deletions
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntenatalExaminationFacade.java
View file @
e373d80
| ... | ... | @@ -388,7 +388,7 @@ |
| 388 | 388 | patientsQuery.setPid(exListQueryRequest.getPid()); |
| 389 | 389 | //获取所有的建档记录 |
| 390 | 390 | List<Patients> list = patientsService.queryPatient(patientsQuery); |
| 391 | - | |
| 391 | + AntexListResult antexListResult = new AntexListResult(); | |
| 392 | 392 | Map map = new HashMap(); |
| 393 | 393 | |
| 394 | 394 | List sortList = new ArrayList(); |
| 395 | 395 | |
| ... | ... | @@ -396,7 +396,12 @@ |
| 396 | 396 | List<SortIn> listDate = new ArrayList(); |
| 397 | 397 | int index = 0; |
| 398 | 398 | if (CollectionUtils.isNotEmpty(list)) { |
| 399 | + antexListResult.convertToResult(null, list.get(0), null); | |
| 399 | 400 | |
| 401 | + HighScoreResult highScoreResult = findLastRisk(list.get(0).getPid(), false); | |
| 402 | + antexListResult.setRiskFactor(highScoreResult.getHighRisk()); | |
| 403 | + antexListResult.setRiskScore(highScoreResult.getScoreStr()); | |
| 404 | + | |
| 400 | 405 | MatDeliverQuery matDeliverQuery = new MatDeliverQuery(); |
| 401 | 406 | matDeliverQuery.setPid(list.get(0).getPid()); |
| 402 | 407 | matDeliverQuery.setYn(YnEnums.YES.getId()); |
| ... | ... | @@ -508,7 +513,9 @@ |
| 508 | 513 | } |
| 509 | 514 | } |
| 510 | 515 | } |
| 511 | - sortList.add(listData); | |
| 516 | + if(!listData.isEmpty()){ | |
| 517 | + sortList.add(listData); | |
| 518 | + } | |
| 512 | 519 | } |
| 513 | 520 | PatientsQuery patientsQuery1=new PatientsQuery(); |
| 514 | 521 | patientsQuery1.setYn(YnEnums.YES.getId()); |
| 515 | 522 | |
| 516 | 523 | |
| ... | ... | @@ -517,13 +524,20 @@ |
| 517 | 524 | patientsQuery1.setType(1); |
| 518 | 525 | List<Patients> patientsList = patientsService.queryPatient(patientsQuery1); |
| 519 | 526 | List list1=new ArrayList(); |
| 520 | - sortList.add(buildPatientList(dueDate, patientsList, list1)); | |
| 527 | + List l= buildPatientList(dueDate, patientsList, list1); | |
| 528 | + if(!l.isEmpty()){ | |
| 529 | + sortList.add(l); | |
| 530 | + } | |
| 521 | 531 | }else{ |
| 522 | 532 | List list1=new ArrayList(); |
| 523 | - sortList.add(buildPatientList(dueDate, list,list1)); | |
| 533 | + List l=buildPatientList(dueDate, list, list1); | |
| 534 | + if(!l.isEmpty()){ | |
| 535 | + sortList.add(l); | |
| 536 | + } | |
| 524 | 537 | } |
| 525 | 538 | } |
| 526 | - return new BaseListResponse().setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("成功").setData(sortList); | |
| 539 | + antexListResult.setData(sortList); | |
| 540 | + return new BaseObjectResponse().setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("成功").setData(antexListResult); | |
| 527 | 541 | } |
| 528 | 542 | |
| 529 | 543 |