jiangjiazhi / regional-platform

Download as
Browse Code »

Commit b75167d4146f4e33a1defc7b3e7e989fc23c4766

Authored by liquanyu
1 parent 5567a94e00
Exists in master and in 6 other branches autism, dev, fengning, fengning2023-06-06, longhua, luanping

优惠劵查询多产程问题

Showing 2 changed files with 22 additions and 3 deletions

platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntenatalExaminationFacade.java View file @ b75167d
... ... @@ -2746,6 +2746,10 @@
2746 2746 {
2747 2747 antExChuQuery.setParentId(patients.getId());
2748 2748 }
  2749 + else if (StringUtils.isNotEmpty(queryRequest.getCardNo()) && StringUtils.isNotEmpty(queryRequest.getCoupon()))
  2750 + {
  2751 + antExChuQuery.setParentId(patients.getId());
  2752 + }
2749 2753 else
2750 2754 {
2751 2755 antExChuQuery.setPid(patients.getPid());
... ... @@ -2760,7 +2764,6 @@
2760 2764 }
2761 2765 antExChuQuery.setStart(max);
2762 2766  
2763   - // System.out.println("初诊查询："+antExChuQuery.convertToQuery().convertToMongoQuery());
2764 2767 //获取初诊记录
2765 2768 List<AntExChuModel> antExChulist = antenatalExaminationService.queryAntExChu(antExChuQuery);
2766 2769  
... ... @@ -2775,6 +2778,10 @@
2775 2778 {
2776 2779 antExQuery.setParentId(patients.getId());
2777 2780 }
  2781 + else if (StringUtils.isNotEmpty(queryRequest.getCardNo()) && StringUtils.isNotEmpty(queryRequest.getCoupon()))
  2782 + {
  2783 + antExQuery.setParentId(patients.getId());
  2784 + }
2778 2785 else
2779 2786 {
2780 2787 antExQuery.setPid(patients.getPid());
2781 2788  
... ... @@ -2797,11 +2804,14 @@
2797 2804 antExQuery1.setHospitalId(hospitalId);
2798 2805  
2799 2806 //http://jira.healthbaby.com.cn/browse/WEB-2733
2800   -
2801 2807 if (StringUtils.isNotEmpty(queryRequest.getVcCardNo()) && StringUtils.isEmpty(queryRequest.getCardNo()))
2802 2808 {
2803 2809 antExQuery1.setParentId(patients.getId());
2804 2810 }
  2811 + else if (StringUtils.isNotEmpty(queryRequest.getCardNo()) && StringUtils.isNotEmpty(queryRequest.getCoupon()))
  2812 + {
  2813 + antExQuery1.setParentId(patients.getId());
  2814 + }
2805 2815 else
2806 2816 {
2807 2817 antExQuery1.setPid(patients.getPid());
... ... @@ -2810,7 +2820,6 @@
2810 2820  
2811 2821 antExQuery1.setYn(YnEnums.YES.getId());
2812 2822 antExQuery1.setStart(max);
2813   - // System.out.println("复诊查询："+antExQuery1.convertToQuery().convertToMongoQuery());
2814 2823 List<AntenatalExaminationModel> examinationModelList = antenatalExaminationService.queryAntenatalExamination(antExQuery1.convertToQuery().addOrder(Sort.Direction.DESC, "created"));
2815 2824  
2816 2825 String lastTime = "";
platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/AntenatalExaminationQueryRequest.java View file @ b75167d
... ... @@ -25,6 +25,16 @@
25 25  
26 26 private String barCode;
27 27  
  28 + private String coupon;
  29 +
  30 + public String getCoupon() {
  31 + return coupon;
  32 + }
  33 +
  34 + public void setCoupon(String coupon) {
  35 + this.coupon = coupon;
  36 + }
  37 +
28 38 public String getBarCode() {
29 39 return barCode;
30 40 }