Commit 80fd109784f959972a21095bc82b7e779df915fd
1 parent
46e1a01dd3
Exists in
master
and in
1 other branch
修改风险因素
Showing 3 changed files with 16 additions and 16 deletions
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MatDeliverFacade.java
View file @
80fd109
... | ... | @@ -925,9 +925,9 @@ |
925 | 925 | |
926 | 926 | PatientsQuery patientsQuery = new PatientsQuery(); |
927 | 927 | |
928 | - if (StringUtils.isNotEmpty(childbirthManagerRequest.getDate())) { | |
929 | - patientsQuery.setBirthStart(DateUtil.getSNDate(childbirthManagerRequest.getDate())[0]); | |
930 | - patientsQuery.setBirthEnd(DateUtil.getSNDate(childbirthManagerRequest.getDate())[1]); | |
928 | + if (StringUtils.isNotEmpty(childbirthManagerRequest.getBirthDate())) { | |
929 | + patientsQuery.setBirthStart(DateUtil.getSNDate(childbirthManagerRequest.getBirthDate())[0]); | |
930 | + patientsQuery.setBirthEnd(DateUtil.getSNDate(childbirthManagerRequest.getBirthDate())[1]); | |
931 | 931 | } |
932 | 932 | |
933 | 933 | patientsQuery.setName(childbirthManagerRequest.getUserName()); |
... | ... | @@ -1172,9 +1172,9 @@ |
1172 | 1172 | BabyModelQuery babyModelQuery = new BabyModelQuery(); |
1173 | 1173 | babyModelQuery.setYn(YnEnums.YES.getId()); |
1174 | 1174 | babyModelQuery.setQueryNo(newBabyManagerRequest.getQueryNo()); |
1175 | - if (StringUtils.isNotEmpty(newBabyManagerRequest.getDate())) { | |
1176 | - babyModelQuery.setBirthStart(DateUtil.getSNDate(newBabyManagerRequest.getDate())[0]); | |
1177 | - babyModelQuery.setBirthEnd(DateUtil.getSNDate(newBabyManagerRequest.getDate())[1]); | |
1175 | + if (StringUtils.isNotEmpty(newBabyManagerRequest.getBirthDate())) { | |
1176 | + babyModelQuery.setBirthStart(DateUtil.getSNDate(newBabyManagerRequest.getBirthDate())[0]); | |
1177 | + babyModelQuery.setBirthEnd(DateUtil.getSNDate(newBabyManagerRequest.getBirthDate())[1]); | |
1178 | 1178 | } |
1179 | 1179 | babyModelQuery.setDueType(newBabyManagerRequest.getDueType()); |
1180 | 1180 | babyModelQuery.setPage(newBabyManagerRequest.getPage()); |
platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/ChildbirthManagerRequest.java
View file @
80fd109
... | ... | @@ -33,7 +33,7 @@ |
33 | 33 | * @createTime 2016年12月13日 17时13分 |
34 | 34 | * @discription 分娩日期 |
35 | 35 | */ |
36 | - private String date; | |
36 | + private String birthDate; | |
37 | 37 | |
38 | 38 | /** |
39 | 39 | * @auther HuJiaqi |
40 | 40 | |
... | ... | @@ -77,12 +77,12 @@ |
77 | 77 | this.phone = phone; |
78 | 78 | } |
79 | 79 | |
80 | - public String getDate() { | |
81 | - return date; | |
80 | + public String getBirthDate() { | |
81 | + return birthDate; | |
82 | 82 | } |
83 | 83 | |
84 | - public void setDate(String date) { | |
85 | - this.date = date; | |
84 | + public void setBirthDate(String birthDate) { | |
85 | + this.birthDate = birthDate; | |
86 | 86 | } |
87 | 87 | |
88 | 88 | public String getDeliveryMode() { |
platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/NewBabyManagerRequest.java
View file @
80fd109
... | ... | @@ -19,7 +19,7 @@ |
19 | 19 | * @createTime 2016年12月13日 16时54分 |
20 | 20 | * @discription 分娩日期 |
21 | 21 | */ |
22 | - private String date; | |
22 | + private String birthDate; | |
23 | 23 | |
24 | 24 | /** |
25 | 25 | * @auther HuJiaqi |
26 | 26 | |
... | ... | @@ -40,12 +40,12 @@ |
40 | 40 | this.queryNo = queryNo; |
41 | 41 | } |
42 | 42 | |
43 | - public String getDate() { | |
44 | - return date; | |
43 | + public String getBirthDate() { | |
44 | + return birthDate; | |
45 | 45 | } |
46 | 46 | |
47 | - public void setDate(String date) { | |
48 | - this.date = date; | |
47 | + public void setBirthDate(String birthDate) { | |
48 | + this.birthDate = birthDate; | |
49 | 49 | } |
50 | 50 | |
51 | 51 | public String getDueType() { |