jiangjiazhi / regional-platform

Download as
Browse Code »

Commit a40e62f76f3ed32244064cf894053cd581b5a61f

Authored by shiyang
1 parent 464126f3d9
Exists in master and in 6 other branches autism, dev, fengning, fengning2023-06-06, longhua, luanping

儿保预建档增加小程序建档状态

Showing 3 changed files with 11 additions and 5 deletions

platform-dal/src/main/java/com/lyms/platform/pojo/BabyModel.java View file @ a40e62f
... ... @@ -263,7 +263,7 @@
263 263 */
264 264 private Integer yn;
265 265 /**
266   - * 数据状态 1-孕妇分娩自动建档、更新为正式数据时修改为0
  266 + * 数据状态 1-孕妇分娩自动建档、更新为正式数据时修改为0，2：小程序建档
267 267 */
268 268 private Integer dataStatus;
269 269 //预产期
platform-dal/src/main/java/com/lyms/platform/query/BabyModelQuery.java View file @ a40e62f
... ... @@ -2223,7 +2223,7 @@
2223 2223 condition = condition.and("dataStatus", 1, MongoOper.NE);
2224 2224 } else {
2225 2225 List<MongoCondition> mongoCondits = new ArrayList<>();
2226   - mongoCondits.add(new MongoCondition("yn", 1, MongoOper.IS));
  2226 + mongoCondits.add(new MongoCondition("yn", 1, MongoOper.IS).andCondition(new MongoCondition("dataStatus", 2, MongoOper.IS)));
2227 2227 mongoCondits.add(new MongoCondition("dataStatus", 1, MongoOper.IS).andCondition(new MongoCondition("yn", 0, MongoOper.IS)));
2228 2228 condition.orCondition(mongoCondits.toArray(new MongoCondition[mongoCondits.size()]));
2229 2229 }
... ... @@ -2231,8 +2231,14 @@
2231 2231 }
2232 2232  
2233 2233 if (fmDataStatu != null && fmDataStatu == true) {
2234   - condition = condition.and("dataStatus", 1, MongoOper.IS);
2235   - condition = condition.and("yn", 0, MongoOper.IS);
  2234 +// condition = condition.and("dataStatus", 1, MongoOper.IS);
  2235 +// condition = condition.and("yn", 0, MongoOper.IS);
  2236 + List<MongoCondition> mongoCondits = new ArrayList<>();
  2237 + mongoCondits.add(new MongoCondition("dataStatus", 1, MongoOper.IS));
  2238 + mongoCondits.add(new MongoCondition("yn", 0, MongoOper.IS).andCondition(new MongoCondition("dataStatus", 2, MongoOper.IS)));
  2239 +
  2240 + condition.orCondition(mongoCondits.toArray(new MongoCondition[mongoCondits.size()]));
  2241 +
2236 2242 }
2237 2243  
2238 2244 if (null != babyWeightStart) {
platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/BabyManageRequest.java View file @ a40e62f
... ... @@ -19,7 +19,7 @@
19 19 private Integer serviceType;
20 20 //妈咪身份证号
21 21 private String mcardNo;
22   - //儿童管理类型 0 非高危 1 高危 2/空 全部 5：早产儿（秦皇岛定制）
  22 + //儿童管理类型 0 非高危 1 高危 2/空 全部 5：早产儿（秦皇岛定制） 4：分娩自动建档到儿童预建档
23 23 private Integer highRiskType;
24 24 //儿童身份证
25 25 private String bcardNo;