jiangjiazhi / regional-platform

Download as
Browse Code »

Commit 2e23790de7d9580957920c0cfab1820ebcbec438

Authored by jiangjiazhi
1 parent 88306e5ada
Exists in master and in 6 other branches autism, dev, fengning, fengning2023-06-06, longhua, luanping

增加指导意见按胎数

Showing 4 changed files with 43 additions and 0 deletions

platform-dal/src/main/java/com/lyms/platform/pojo/Guidelines.java View file @ 2e23790
... ... @@ -25,10 +25,22 @@
25 25 /* 孕期：周；产后：天；儿童：月 */
26 26 private Integer start;
27 27 private Integer end;
  28 + /**
  29 + * 胎数 双胎以上按双胎处理
  30 + */
  31 + private Integer number;
28 32  
29 33 private String category;
30 34 private String content;
31 35 private Integer yn;
  36 +
  37 + public Integer getNumber() {
  38 + return number;
  39 + }
  40 +
  41 + public void setNumber(Integer number) {
  42 + this.number = number;
  43 + }
32 44  
33 45 public String getDeliveryType() {
34 46 return deliveryType;
platform-dal/src/main/java/com/lyms/platform/query/GuidelinesQuery.java View file @ 2e23790
... ... @@ -36,8 +36,23 @@
36 36 if (null != minEnd) {
37 37 condition = condition.and("end", minEnd, MongoOper.GTE);
38 38 }
  39 + if (null != number) {
  40 + condition = condition.and("number", number, MongoOper.IS);
  41 + }else{
  42 + condition = condition.and("number", false, MongoOper.EXISTS);
  43 + }
39 44 return condition.toMongoQuery();
40 45 }
  46 +
  47 + public Integer getNumber() {
  48 + return number;
  49 + }
  50 +
  51 + public void setNumber(Integer number) {
  52 + this.number = number;
  53 + }
  54 +
  55 + private Integer number;
41 56  
42 57 private String id;
43 58 /* 1:孕期,2:产后,3:儿童 */
platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/GuideLineController.java View file @ 2e23790
... ... @@ -32,6 +32,8 @@
32 32 guidelinesQuery.setType(guideQuery.getType());
33 33 guidelinesQuery.setMaxStart(guideQuery.getNum());
34 34 guidelinesQuery.setMinEnd(guideQuery.getNum());
  35 + guidelinesQuery.setNumber(guideQuery.getTnum());
  36 +
35 37 List<Guidelines> list = guidelinesService.queryGuidelines(guidelinesQuery);
36 38 StringBuilder stringBuilder=new StringBuilder(128);
37 39 if(CollectionUtils.isNotEmpty(list)){
platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/GuideQuery.java View file @ 2e23790
... ... @@ -6,6 +6,20 @@
6 6 public class GuideQuery {
7 7 private Integer type;
8 8 private Integer num;
  9 + //胎数
  10 + private Integer tnum;
  11 +
  12 + public Integer getTnum() {
  13 + //多胎的时候按双胎处理
  14 + if(tnum!=null &&tnum>2){
  15 + return 2;
  16 + }
  17 + return tnum;
  18 + }
  19 +
  20 + public void setTnum(Integer tnum) {
  21 + this.tnum = tnum;
  22 + }
9 23  
10 24 public Integer getNum() {
11 25 return num;