Commit 32e86897f0a048911b25f6b31a0c5ade29245d6b

Authored by liquanyu

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 @ 32e8689
... ... @@ -207,6 +207,19 @@
207 207 babyModel.setParentId(parentId);
208 208 babyModel.setName(userName + (babyModel.getSex() == 1 ? "之子" : "之女"));
209 209 babyModel.setYn(YnEnums.NO.getId());
  210 +
  211 + if (com.lyms.platform.common.utils.StringUtils.isNotEmpty(babyModel.getMcertNo())) {
  212 +
  213 + String cardId = babyModel.getMcertNo() +
  214 + DateUtil.getYmd(DateUtil.parseYMD(deliverAddRequest.getDueDate()));
  215 + babyModel.setCardId(cardId + babyModel.getName());
  216 + }
  217 + if (com.lyms.platform.common.utils.StringUtils.isNotEmpty(babyModel.getMphone()))
  218 + {
  219 + String phoneId = babyModel.getMphone() +
  220 + DateUtil.getYmd(DateUtil.parseYMD(deliverAddRequest.getDueDate()));
  221 + babyModel.setPhoneId(phoneId + babyModel.getName());
  222 + }
210 223 //判断妊娠结局是活产才添加数据
211 224 if ((RenShenJieJuEnums.O.getId() + "").equals(baby.getPregnancyOut())) {
212 225 babyModel.setYn(YnEnums.YES.getId());