jiangjiazhi / regional-platform

Download as
Browse Code »

Commit f6fb1b12221e257e03bd5ad71dd63ab8ebbe03b3

Authored by jiangjiazhi
2 parents 2b12f88063 8badb0b6bf
Exists in master and in 7 other branches 0116, autism, dev, fengning, fengning2023-06-06, longhua, luanping

Merge remote-tracking branch 'origin/master'

Showing 1 changed file

platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MatDeliverFacade.java View file @ f6fb1b1
... ... @@ -284,19 +284,47 @@
284 284 //获取到小孩信息
285 285 List<MatDeliverAddRequest.Baby> list = deliverAddRequest.getBabies();
286 286 //修改小孩信息
  287 + // if (CollectionUtils.isNotEmpty(list)) {
  288 + // for (MatDeliverAddRequest.Baby baby : list) {
  289 + // MaternalDeliverModel.Baby babyModel = baby.convertToDataModel();
  290 + // //判断妊娠结局是活产才添加数据
  291 + // BabyModel babyModel1=new BabyModel();
  292 + // MatDeliverQuery query=new MatDeliverQuery();
  293 + // query.setParentId(deliverAddRequest.getParentId());
  294 + // babyModel1.setParentId(deliverAddRequest.getParentId());
  295 + // if ((RenShenJieJuEnums.O.getId() + "").equals(baby.getPregnancyOut())) {
  296 + // babyModel1.setYn(YnEnums.YES.getId());
  297 + // }else{
  298 + // babyModel1.setYn(YnEnums.NO.getId());
  299 + // }
  300 + // babyService.findAndModify(query.convertToQuery(), babyModel1);
  301 + // babyList.add(babyModel);
  302 + // }
  303 + // maternalDeliverModel.setBaby(babyList);
  304 + // }
287 305 if (CollectionUtils.isNotEmpty(list)) {
288 306 for (MatDeliverAddRequest.Baby baby : list) {
289 307 MaternalDeliverModel.Baby babyModel = baby.convertToDataModel();
290 308 //判断妊娠结局是活产才添加数据
291 309 BabyModel babyModel1=new BabyModel();
292 310 MatDeliverQuery query=new MatDeliverQuery();
293   - query.setParentId(deliverAddRequest.getParentId());
  311 + query.setId(deliverAddRequest.getId());
294 312 babyModel1.setParentId(deliverAddRequest.getParentId());
295 313 if ((RenShenJieJuEnums.O.getId() + "").equals(baby.getPregnancyOut())) {
296 314 babyModel1.setYn(YnEnums.YES.getId());
297 315 }else{
298 316 babyModel1.setYn(YnEnums.NO.getId());
299 317 }
  318 + babyModel1.setBirth(DateUtil.parseYMD(baby.getDueTime()));
  319 + babyModel1.setSex(Integer.valueOf(baby.getBabyGender()));
  320 + Map map = deliverAddRequest.getDeliveryMode();
  321 + String fmfs = null;
  322 + if (!map.isEmpty()) {
  323 + fmfs = map.get("fmfs").toString();
  324 + }
  325 + babyModel1.setDueType(fmfs);
  326 + babyModel1.setBabyHeight(baby.getBabyHeight());
  327 + babyModel1.setBabyWeight(baby.getBabyWeight());
300 328 babyService.findAndModify(query.convertToQuery(), babyModel1);
301 329 babyList.add(babyModel);
302 330 }