Commit 2fadda42042d901f1921d5e89a7ef7dfbfb08b9a
1 parent
f70bf613cf
Exists in
master
and in
1 other branch
修改新电子病历
Showing 1 changed file with 6 additions and 4 deletions
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntenatalExaminationFacade.java
View file @
2fadda4
| ... | ... | @@ -477,9 +477,9 @@ |
| 477 | 477 | List sortList = new ArrayList(); |
| 478 | 478 | String hospital=autoMatchFacade.getHospitalId(userId); |
| 479 | 479 | List<SortIn> listDate = new ArrayList(); |
| 480 | - int index = 0; | |
| 480 | + | |
| 481 | 481 | if (CollectionUtils.isNotEmpty(list)) { |
| 482 | - Patients patients2= findOnePatient(exListQueryRequest.getCardNo(),null,null,hospital,-1,false); | |
| 482 | + Patients patients2= findOnePatient(null,null,null,hospital,-1,false,exListQueryRequest.getPid()); | |
| 483 | 483 | antexListResult.convertToResult(null, patients2, null); |
| 484 | 484 | |
| 485 | 485 | HighScoreResult highScoreResult = findLastRisk(list.get(0).getPid(), false); |
| ... | ... | @@ -994,7 +994,7 @@ |
| 994 | 994 | * @param type 类型 1 孕妇 3 产妇 -1 不区分 |
| 995 | 995 | * @param outHospital 是否需要查外院 |
| 996 | 996 | */ |
| 997 | - public Patients findOnePatient(String cardNo, String vcCardNo, String id, String hospitalId, Integer type, boolean outHospital) { | |
| 997 | + public Patients findOnePatient(String cardNo, String vcCardNo, String id, String hospitalId, Integer type, boolean outHospital,String pid) { | |
| 998 | 998 | PatientsQuery patientsQuery = new PatientsQuery(); |
| 999 | 999 | if (StringUtils.isNotEmpty(cardNo)) { |
| 1000 | 1000 | patientsQuery.setCardNo(cardNo); |
| ... | ... | @@ -1002,6 +1002,8 @@ |
| 1002 | 1002 | patientsQuery.setVcCardNo(vcCardNo); |
| 1003 | 1003 | } else if (StringUtils.isNotEmpty(id)) { |
| 1004 | 1004 | patientsQuery.setId(id); |
| 1005 | + }else if(StringUtils.isNotEmpty(pid)){ | |
| 1006 | + patientsQuery.setPid(pid); | |
| 1005 | 1007 | } |
| 1006 | 1008 | patientsQuery.setType(type); |
| 1007 | 1009 | patientsQuery.setHospitalId(hospitalId); |
| ... | ... | @@ -1074,7 +1076,7 @@ |
| 1074 | 1076 | hospital = list1.get(0) + ""; |
| 1075 | 1077 | } |
| 1076 | 1078 | //查询产妇数据 |
| 1077 | - patients = findOnePatient(queryRequest.getCardNo(), queryRequest.getVcCardNo(), null, hospital, 1, false); | |
| 1079 | + patients = findOnePatient(queryRequest.getCardNo(), queryRequest.getVcCardNo(), null, hospital, 1, false,null); | |
| 1078 | 1080 | } |
| 1079 | 1081 | |
| 1080 | 1082 | if (null == patients) { |