Commit 31a998f6dc93ecfaf9d3568c28adef0bf7675a80

Authored by wtt
1 parent 2dce2bcef5
Exists in master and in 1 other branch dev

update

Showing 3 changed files with 23 additions and 0 deletions

platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyEarFacade.java View file @ 31a998f
... ... @@ -1516,6 +1516,7 @@
1516 1516 babyEarBaseView.setSex(SexEnum.getTextById(babyEarBase.getSex()));
1517 1517 }
1518 1518 babyEarBaseView.setCardNo(babyEarBase.getCardNo());
  1519 + babyEarBaseView.setEncoded(babyEarBase.getEncoded());
1519 1520 if (babyEarBase.getNation() != null) {
1520 1521 babyEarBaseView.setNation(mongoUtil.findName(babyEarBase.getNation()));
1521 1522 }
platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/BabyEarBase.java View file @ 31a998f
... ... @@ -34,6 +34,9 @@
34 34 private Integer sex;
35 35 //儿童身份证号
36 36 private String cardNo;
  37 +
  38 + // 编码唯一,通过编码获取档案信息,编码格式20200721001
  39 + private String encoded;
37 40 //儿童生日
38 41 private String birth;
39 42 //民族
40 43  
... ... @@ -151,12 +154,21 @@
151 154 this.dataStatus = dataStatus;
152 155 }
153 156  
  157 + public String getEncoded() {
  158 + return encoded;
  159 + }
  160 +
  161 + public void setEncoded(String encoded) {
  162 + this.encoded = encoded;
  163 + }
  164 +
154 165 public BabyEarBase(BabyModel babyModel) {
155 166 setFileCode(babyModel.getFileCode());
156 167 setBabyId(babyModel.getId());
157 168 setPid(babyModel.getPid());
158 169 setName(babyModel.getName());
159 170 setCardNo(babyModel.getCardNo());
  171 + setEncoded(babyModel.getEncoded());
160 172 setBirth(DateUtil.getyyyy_MM_dd(babyModel.getBirth()));
161 173 setMonthAge(DateUtil.getBabyMonthAge(babyModel.getBirth(), new Date()));
162 174 setProvinceId(babyModel.getProvinceId());
platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BabyEarBaseView.java View file @ 31a998f
... ... @@ -8,6 +8,8 @@
8 8 * @discription
9 9 */
10 10 public class BabyEarBaseView {
  11 + // 编码唯一,通过编码获取档案信息,编码格式20200721001
  12 + private String encoded;
11 13 private String id;
12 14 private String babyId;
13 15 //儿童名字
... ... @@ -120,6 +122,14 @@
120 122  
121 123 public void setPatientSerResults(List<PatientSerResult> patientSerResults) {
122 124 this.patientSerResults = patientSerResults;
  125 + }
  126 +
  127 + public String getEncoded() {
  128 + return encoded;
  129 + }
  130 +
  131 + public void setEncoded(String encoded) {
  132 + this.encoded = encoded;
123 133 }
124 134  
125 135 public String getDeliverOrg() {