diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BookbuildingFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BookbuildingFacade.java index d2c4ed0..4b26902 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BookbuildingFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BookbuildingFacade.java @@ -487,6 +487,7 @@ public class BookbuildingFacade { //查询主档案 patientsQuery.setExtEnable(false); + //如果身份证号码不为空就以身份证号码查询 if (!StringUtils.isEmpty(bookbuildingQueryRequest.getCardNo())) { patientsQuery.setCardNo(bookbuildingQueryRequest.getCardNo()); @@ -510,7 +511,6 @@ public class BookbuildingFacade { patientsQuery.setCardNo(patientsVc.get(0).getCardNo()); patients = yunBookbuildingService.queryPregnantWithQuery(patientsQuery, "bookbuildingDate", Sort.Direction.DESC); } - } // 如果为空,初次建档,根据就诊卡号从HIS库取患者信息 else { @@ -527,6 +527,23 @@ public class BookbuildingFacade { }else if(!StringUtils.isEmpty(bookbuildingQueryRequest.getId())){ // id,HuJiaqi添加,为了建档管理里面的查看单条使用 patients.add(yunBookbuildingService.findOneById(bookbuildingQueryRequest.getId())); + }else if(StringUtils.isNotEmpty(bookbuildingQueryRequest.getPid())){ + patientsQuery.setPid(bookbuildingQueryRequest.getPid()); + + //区域模式 + patientsQuery.setHospitalList(groupsFacade.findGroupHospital(userId,false)); + + List patientsVc = yunBookbuildingService.queryPregnantWithQuery(patientsQuery); + if (CollectionUtils.isNotEmpty(patientsVc)) { + if (patientsVc.get(0) == null || StringUtils.isEmpty(patientsVc.get(0).getCardNo())) { + patients = patientsVc; + } else { + patientsQuery.setHospitalId(null); + patientsQuery.setVcCardNo(null); + patientsQuery.setCardNo(patientsVc.get(0).getCardNo()); + patients = yunBookbuildingService.queryPregnantWithQuery(patientsQuery, "bookbuildingDate", Sort.Direction.DESC); + } + } } //历史建档记录 diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/BookbuildingQueryRequest.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/BookbuildingQueryRequest.java index 37957bc..ff2c19f 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/BookbuildingQueryRequest.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/BookbuildingQueryRequest.java @@ -16,6 +16,16 @@ public class BookbuildingQueryRequest { //建档类型 private String bookbuildingType; + private String pid; + + public String getPid() { + return pid; + } + + public void setPid(String pid) { + this.pid = pid; + } + //医院ID private String hospitalId;