liquanyu / regional-platform

Download as
Browse Code »

Commit efe3843a40aa5253d82cb1c7eb91c028e3a65ee5

Authored by liquanyu
1 parent 7842bba523
Exists in master and in 1 other branch dev

补录产检

Showing 2 changed files with 33 additions and 7 deletions

platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntenatalExaminationFacade.java View file @ efe3843
... ... @@ -2660,17 +2660,33 @@
2660 2660 // patients = findOnePatient(queryRequest.getCardNo(), queryRequest.getVcCardNo(), null, hospitalId, 1, false, null, false);
2661 2661 }
2662 2662  
2663   - if (null == patients) {
2664   - if (StringUtils.isNotEmpty(queryRequest.getCardNo()) && StringUtils.isNotEmpty(queryRequest.getVcCardNo())) {
2665   - patients = findOnePatient(queryRequest.getCardNo(), queryRequest.getVcCardNo(), null, currentGroupHospital, 3, false, null, og.getbStatus() == 1);
  2663 + if (StringUtils.isNotEmpty(queryRequest.getSupplement()))
  2664 + {
  2665 + if (null == patients) {
  2666 + if (StringUtils.isNotEmpty(queryRequest.getCardNo()) || StringUtils.isNotEmpty(queryRequest.getVcCardNo())) {
  2667 + patients = findOnePatient(queryRequest.getCardNo(), queryRequest.getVcCardNo(), null, currentGroupHospital, 3, false, null, og.getbStatus() == 1);
  2668 + }
  2669 +
  2670 + if (null == patients) {
  2671 + return new BaseResponse().setErrorcode(ErrorCodeConstants.NO_DATA).setErrormsg("该孕妇在系统中没有档案，请新建档");
  2672 + }
2666 2673 }
  2674 + }
  2675 + else
  2676 + {
  2677 + if (null == patients) {
  2678 + if (StringUtils.isNotEmpty(queryRequest.getCardNo()) && StringUtils.isNotEmpty(queryRequest.getVcCardNo())) {
  2679 + patients = findOnePatient(queryRequest.getCardNo(), queryRequest.getVcCardNo(), null, currentGroupHospital, 3, false, null, og.getbStatus() == 1);
  2680 + }
2667 2681  
2668   - //原来单机
2669   - if (null != patients) {
2670   - return new BaseResponse().setErrorcode(ErrorCodeConstants.BUSINESS_ERROR).setErrormsg("该孕妇在系统中已分娩/已终止妊娠不能再进行产检，请重新建档");
  2682 + //原来单机
  2683 + if (null != patients) {
  2684 + return new BaseResponse().setErrorcode(ErrorCodeConstants.BUSINESS_ERROR).setErrormsg("该孕妇在系统中已分娩/已终止妊娠不能再进行产检，请重新建档");
  2685 + }
  2686 + return new BaseResponse().setErrorcode(ErrorCodeConstants.BUSINESS_ERROR).setErrormsg("该孕妇还未在本院建档不能进行产检");
2671 2687 }
2672   - return new BaseResponse().setErrorcode(ErrorCodeConstants.BUSINESS_ERROR).setErrormsg("该孕妇还未在本院建档不能进行产检");
2673 2688 }
  2689 +
2674 2690  
2675 2691  
2676 2692 MatDeliverQuery matDeliverQuery = new MatDeliverQuery();
platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/AntenatalExaminationQueryRequest.java View file @ efe3843
... ... @@ -27,6 +27,16 @@
27 27  
28 28 private String coupon;
29 29  
  30 + private String supplement;
  31 +
  32 + public String getSupplement() {
  33 + return supplement;
  34 + }
  35 +
  36 + public void setSupplement(String supplement) {
  37 + this.supplement = supplement;
  38 + }
  39 +
30 40 public String getCoupon() {
31 41 return coupon;
32 42 }