Commit bef581c34814499b0a9397708802aaf272bb813b
1 parent
2afdc18ce2
Exists in
master
and in
3 other branches
orgType
Showing 2 changed files with 12 additions and 1 deletions
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntenatalExaminationFacade.java
View file @
bef581c
... | ... | @@ -2403,7 +2403,9 @@ |
2403 | 2403 | |
2404 | 2404 | //当主档案的医院不在group组里需要显示本来的隐藏档案 |
2405 | 2405 | if (!"2".equals(patients.getEnable())) { |
2406 | - listData.add(new AntData(patients, null != organization ? organization.getName() : "")); | |
2406 | + AntData antData = new AntData(patients, null != organization ? organization.getName() : ""); | |
2407 | + antData.setOrgType(organization.getType()); | |
2408 | + listData.add(antData); | |
2407 | 2409 | } |
2408 | 2410 | |
2409 | 2411 | PatientsQuery patientsQuery = new PatientsQuery(); |
platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/AntData.java
View file @
bef581c
... | ... | @@ -11,6 +11,7 @@ |
11 | 11 | import java.util.Map; |
12 | 12 | |
13 | 13 | public class AntData extends BaseModel{ |
14 | + private Integer orgType; | |
14 | 15 | private String dueWeek; |
15 | 16 | //分娩时间 |
16 | 17 | private String dueDate; |
... | ... | @@ -30,6 +31,14 @@ |
30 | 31 | private List<Map<String, Object>> risks; |
31 | 32 | //医生团队id |
32 | 33 | private String TeamId; |
34 | + | |
35 | + public Integer getOrgType() { | |
36 | + return orgType; | |
37 | + } | |
38 | + | |
39 | + public void setOrgType(Integer orgType) { | |
40 | + this.orgType = orgType; | |
41 | + } | |
33 | 42 | |
34 | 43 | public String getTeamId() { |
35 | 44 | return TeamId; |