fangcheng / regional-platform

Download as
Browse Code ยป

Commit 199f71a72d502dc9bf0ee974ef5ffc2cab7e2a3e

Authored by rui.zhang
2 parents 77c36f521e ee08036b81
Exists in master and in 1 other branch nobuildprocess

Merge remote-tracking branch 'origin/master'

Showing 2 changed files

platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BabyVisitResult.java View file @ 199f71a
... ... @@ -786,6 +786,11 @@
786 786 setmCardNo(destModel.getCardNo());
787 787 setmName(destModel.getUsername());
788 788 setAddress(address);
  789 + if(null!=destModel.getDueDate()){
  790 + setBirth(DateUtil.getyyyy_MM_dd(destModel.getDueDate()));
  791 + }
  792 + setMphone(destModel.getPhone());
  793 + setOrg(destModel.getDeliverOrg());
789 794 return this;
790 795 }
791 796  
platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/VisitResult.java View file @ 199f71a
... ... @@ -137,9 +137,10 @@
137 137 } catch (Exception e) {
138 138 }
139 139 try {
140   - setAge(DateUtil.getyyyy_MM_dd(model.getBirth()));
  140 + setAge(DateUtil.getyyyy_MM_dd(model.getMbirth()));
141 141 }catch (Exception e){
142 142 }
  143 + setDeliverOrg(model.getOrg());
143 144 setPhone(model.getMphone());
144 145 // setId(model.getId());
145 146 setCardNo(null==model.getCardNo()?"":model.getCardNo());