Commit a6c048ff309c15d11f128eacd9485c6919701629
1 parent
0dc2d78675
Exists in
dev
#fix:出生证明新增字段
Showing 2 changed files with 38 additions and 0 deletions
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientServiceFacade.java
View file @
a6c048f
| ... | ... | @@ -1962,6 +1962,14 @@ |
| 1962 | 1962 | for (Patients patients:list){ |
| 1963 | 1963 | BirthResult birthResult=new BirthResult(); |
| 1964 | 1964 | BeanUtils.copy(patients, birthResult); |
| 1965 | + String dueWeek = ""; | |
| 1966 | + if (patients.getFmWeek()!=null){ | |
| 1967 | + String week = (patients.getFmWeek() / 7) + ""; | |
| 1968 | + int day = (patients.getFmWeek() % 7); | |
| 1969 | + dueWeek = "孕" + week + "周" + (day > 0 ? "+" + day + "天" : ""); | |
| 1970 | + } | |
| 1971 | + birthResult.setDueWeek(dueWeek); | |
| 1972 | + | |
| 1965 | 1973 | birthResult.setParentId(patients.getId()); |
| 1966 | 1974 | babyQuery.setParentId(patients.getId()); |
| 1967 | 1975 | List<BabyModel> babyModels= babyService.queryBabyWithQuery(babyQuery); |
platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BirthResult.java
View file @
a6c048f
| 1 | 1 | package com.lyms.platform.operate.web.result; |
| 2 | 2 | |
| 3 | 3 | |
| 4 | +import java.util.Date; | |
| 5 | + | |
| 4 | 6 | public class BirthResult { |
| 5 | 7 | private String parentId; |
| 6 | 8 | private String pId; |
| 7 | 9 | private String username; |
| 8 | 10 | private String vcCardNo; |
| 9 | 11 | private String cardNo; |
| 12 | + private String phone; | |
| 13 | + // 分娩孕周 | |
| 14 | + private String dueWeek; | |
| 15 | + private Date fmDate; | |
| 10 | 16 | /** |
| 11 | 17 | * @auther HuJiaqi |
| 12 | 18 | * @createTime 2016年12月20日 14时42分 |
| ... | ... | @@ -89,6 +95,30 @@ |
| 89 | 95 | |
| 90 | 96 | public String getBabyId() { |
| 91 | 97 | return babyId; |
| 98 | + } | |
| 99 | + | |
| 100 | + public String getPhone() { | |
| 101 | + return phone; | |
| 102 | + } | |
| 103 | + | |
| 104 | + public void setPhone(String phone) { | |
| 105 | + this.phone = phone; | |
| 106 | + } | |
| 107 | + | |
| 108 | + public String getDueWeek() { | |
| 109 | + return dueWeek; | |
| 110 | + } | |
| 111 | + | |
| 112 | + public void setDueWeek(String dueWeek) { | |
| 113 | + this.dueWeek = dueWeek; | |
| 114 | + } | |
| 115 | + | |
| 116 | + public Date getFmDate() { | |
| 117 | + return fmDate; | |
| 118 | + } | |
| 119 | + | |
| 120 | + public void setFmDate(Date fmDate) { | |
| 121 | + this.fmDate = fmDate; | |
| 92 | 122 | } |
| 93 | 123 | |
| 94 | 124 | public void setBabyId(String babyId) { |