Commit 98dcb0ed242f9e70cb443afe2a46cedac443889b
1 parent
f0158b7903
Exists in
master
and in
1 other branch
孕妇分娩后 变成产妇
Showing 2 changed files with 11 additions and 1 deletions
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntenatalExaminationFacade.java
View file @
98dcb0e
| ... | ... | @@ -431,7 +431,6 @@ |
| 431 | 431 | List<Patients> list = patientsService.queryPatient(patientsQuery); |
| 432 | 432 | if (CollectionUtils.isNotEmpty(list)) { |
| 433 | 433 | patients = list.get(0); |
| 434 | - patients1 = patients; | |
| 435 | 434 | } |
| 436 | 435 | } else { |
| 437 | 436 | List<Integer> list1 = autoMatchFacade.matchOrgId(userId); |
platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/AntexListResult.java
View file @
98dcb0e
| ... | ... | @@ -38,6 +38,8 @@ |
| 38 | 38 | private String remarks; |
| 39 | 39 | //末次月经 |
| 40 | 40 | private String lastMenses; |
| 41 | + //建档时间 | |
| 42 | + private String buildTime; | |
| 41 | 43 | |
| 42 | 44 | private String cardNo; |
| 43 | 45 | private String vcCardNo; |
| ... | ... | @@ -45,6 +47,14 @@ |
| 45 | 47 | //<!---------基本信息-----------> |
| 46 | 48 | |
| 47 | 49 | |
| 50 | + public String getBuildTime() { | |
| 51 | + return buildTime; | |
| 52 | + } | |
| 53 | + | |
| 54 | + public void setBuildTime(String buildTime) { | |
| 55 | + this.buildTime = buildTime; | |
| 56 | + } | |
| 57 | + | |
| 48 | 58 | public String getIsSieve() { |
| 49 | 59 | return isSieve; |
| 50 | 60 | } |
| ... | ... | @@ -156,6 +166,7 @@ |
| 156 | 166 | if(null!=patients.getDueDate()){ |
| 157 | 167 | setyChanQi(DateUtil.getyyyy_MM_dd(patients.getDueDate())); |
| 158 | 168 | } |
| 169 | + setBuildTime(DateUtil.getyyyy_MM_dd(patients.getCreated())); | |
| 159 | 170 | setName(patients.getUsername()); |
| 160 | 171 | setPhone(patients.getPhone()); |
| 161 | 172 | setRemarks(patients.getMremark()); |