diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntenatalExaminationFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntenatalExaminationFacade.java index 2f9c2e7..b93e964 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntenatalExaminationFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntenatalExaminationFacade.java @@ -2746,6 +2746,10 @@ public class AntenatalExaminationFacade { { antExChuQuery.setParentId(patients.getId()); } + else if (StringUtils.isNotEmpty(queryRequest.getCardNo()) && StringUtils.isNotEmpty(queryRequest.getCoupon())) + { + antExChuQuery.setParentId(patients.getId()); + } else { antExChuQuery.setPid(patients.getPid()); @@ -2760,7 +2764,6 @@ public class AntenatalExaminationFacade { } antExChuQuery.setStart(max); - // System.out.println("初诊查询:"+antExChuQuery.convertToQuery().convertToMongoQuery()); //获取初诊记录 List antExChulist = antenatalExaminationService.queryAntExChu(antExChuQuery); @@ -2775,6 +2778,10 @@ public class AntenatalExaminationFacade { { antExQuery.setParentId(patients.getId()); } + else if (StringUtils.isNotEmpty(queryRequest.getCardNo()) && StringUtils.isNotEmpty(queryRequest.getCoupon())) + { + antExQuery.setParentId(patients.getId()); + } else { antExQuery.setPid(patients.getPid()); @@ -2797,11 +2804,14 @@ public class AntenatalExaminationFacade { antExQuery1.setHospitalId(hospitalId); //http://jira.healthbaby.com.cn/browse/WEB-2733 - if (StringUtils.isNotEmpty(queryRequest.getVcCardNo()) && StringUtils.isEmpty(queryRequest.getCardNo())) { antExQuery1.setParentId(patients.getId()); } + else if (StringUtils.isNotEmpty(queryRequest.getCardNo()) && StringUtils.isNotEmpty(queryRequest.getCoupon())) + { + antExQuery1.setParentId(patients.getId()); + } else { antExQuery1.setPid(patients.getPid()); @@ -2810,7 +2820,6 @@ public class AntenatalExaminationFacade { antExQuery1.setYn(YnEnums.YES.getId()); antExQuery1.setStart(max); - // System.out.println("复诊查询:"+antExQuery1.convertToQuery().convertToMongoQuery()); List examinationModelList = antenatalExaminationService.queryAntenatalExamination(antExQuery1.convertToQuery().addOrder(Sort.Direction.DESC, "created")); String lastTime = ""; diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/AntenatalExaminationQueryRequest.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/AntenatalExaminationQueryRequest.java index 6081a97..fc8fccf 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/AntenatalExaminationQueryRequest.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/AntenatalExaminationQueryRequest.java @@ -25,6 +25,16 @@ public class AntenatalExaminationQueryRequest { private String barCode; + private String coupon; + + public String getCoupon() { + return coupon; + } + + public void setCoupon(String coupon) { + this.coupon = coupon; + } + public String getBarCode() { return barCode; }