Commit 1237124b45abe640c54862c42e285364b740ae8b

Authored by jiangjiazhi
1 parent 70460b829a

修改新电子病历

Showing 1 changed file with 4 additions and 3 deletions

platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntenatalExaminationFacade.java View file @ 1237124
... ... @@ -463,7 +463,7 @@
463 463 * @param exListQueryRequest
464 464 * @return
465 465 */
466   - public BaseResponse findAntExListTwo(AntExListQueryRequest exListQueryRequest) {
  466 + public BaseResponse findAntExListTwo(AntExListQueryRequest exListQueryRequest,Integer userId) {
467 467 PatientsQuery patientsQuery = new PatientsQuery();
468 468 patientsQuery.setCardNo(exListQueryRequest.getCardNo());
469 469 patientsQuery.setYn(YnEnums.YES.getId());
470 470  
... ... @@ -475,11 +475,12 @@
475 475 Map map = new HashMap();
476 476  
477 477 List sortList = new ArrayList();
478   -
  478 + String hospital=autoMatchFacade.getHospitalId(userId);
479 479 List<SortIn> listDate = new ArrayList();
480 480 int index = 0;
481 481 if (CollectionUtils.isNotEmpty(list)) {
482   - antexListResult.convertToResult(null, list.get(0), null);
  482 + Patients patients2= findOnePatient(exListQueryRequest.getCardNo(),null,null,hospital,-1,false);
  483 + antexListResult.convertToResult(null, patients2, null);
483 484  
484 485 HighScoreResult highScoreResult = findLastRisk(list.get(0).getPid(), false);
485 486 antexListResult.setRiskFactor(highScoreResult.getHighRisk());