Commit 24f2a0f0babdd55110f30ad8f3c2caf112b04022
1 parent
2b22dbc80e
Exists in
master
and in
1 other branch
code update
Showing 4 changed files with 7 additions and 21 deletions
- platform-dal/src/main/java/com/lyms/platform/pojo/BabyModel.java
- platform-dal/src/main/java/com/lyms/platform/query/BabyModelQuery.java
- platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyBookbuildingFacade.java
- platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyCheckFacade.java
platform-dal/src/main/java/com/lyms/platform/pojo/BabyModel.java
View file @
24f2a0f
1 | 1 | package com.lyms.platform.pojo; |
2 | 2 | |
3 | 3 | import java.util.Date; |
4 | +import java.util.List; | |
4 | 5 | |
5 | 6 | import org.springframework.data.mongodb.core.mapping.Document; |
6 | 7 | import org.springframework.data.mongodb.core.mapping.Field; |
... | ... | @@ -201,7 +202,7 @@ |
201 | 202 | private Integer lastHighRisk; |
202 | 203 | |
203 | 204 | //诊断 |
204 | - private String lastDiagnose; | |
205 | + private List<String> lastDiagnose; | |
205 | 206 | |
206 | 207 | public Integer getBuildType() { |
207 | 208 | return buildType; |
208 | 209 | |
... | ... | @@ -219,11 +220,11 @@ |
219 | 220 | this.lastHighRisk = lastHighRisk; |
220 | 221 | } |
221 | 222 | |
222 | - public String getLastDiagnose() { | |
223 | + public List<String> getLastDiagnose() { | |
223 | 224 | return lastDiagnose; |
224 | 225 | } |
225 | 226 | |
226 | - public void setLastDiagnose(String lastDiagnose) { | |
227 | + public void setLastDiagnose(List<String> lastDiagnose) { | |
227 | 228 | this.lastDiagnose = lastDiagnose; |
228 | 229 | } |
229 | 230 |
platform-dal/src/main/java/com/lyms/platform/query/BabyModelQuery.java
View file @
24f2a0f
... | ... | @@ -175,16 +175,7 @@ |
175 | 175 | //诊断 |
176 | 176 | private String lastDiagnose; |
177 | 177 | |
178 | - private List<String> lastDiagnoses; | |
179 | 178 | |
180 | - public List<String> getLastDiagnoses() { | |
181 | - return lastDiagnoses; | |
182 | - } | |
183 | - | |
184 | - public void setLastDiagnoses(List<String> lastDiagnoses) { | |
185 | - this.lastDiagnoses = lastDiagnoses; | |
186 | - } | |
187 | - | |
188 | 179 | public String getLastDiagnose() { |
189 | 180 | return lastDiagnose; |
190 | 181 | } |
... | ... | @@ -373,12 +364,6 @@ |
373 | 364 | if(!StringUtils.isEmpty(lastDiagnose)){ |
374 | 365 | condition=condition.and("lastDiagnose", lastDiagnose, MongoOper.IN); |
375 | 366 | } |
376 | - | |
377 | - if (null != lastDiagnoses && lastDiagnoses.size() > 0) { | |
378 | - Criteria c = Criteria.where("lastDiagnose").in(lastDiagnoses); | |
379 | - condition.andCondition( new MongoCondition(c)); | |
380 | - } | |
381 | - | |
382 | 367 | |
383 | 368 | if(!StringUtils.isEmpty(phoneId) || !StringUtils.isEmpty(cardId)){ |
384 | 369 | MongoCondition con1 = MongoCondition.newInstance("phoneId", phoneId, MongoOper.LIKE); |
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyBookbuildingFacade.java
View file @
24f2a0f
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyCheckFacade.java
View file @
24f2a0f
... | ... | @@ -91,7 +91,7 @@ |
91 | 91 | diagnoseNames.add(data.getName()); |
92 | 92 | } |
93 | 93 | } |
94 | - bm.setLastDiagnose(JsonUtil.array2JsonString(diagnoseNames)); | |
94 | + bm.setLastDiagnose(diagnoseNames); | |
95 | 95 | } |
96 | 96 | babyBookbuildingService.updateBabyBuild(bm, request.getBuildId()); |
97 | 97 | return new BaseResponse().setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("成功"); |
... | ... | @@ -225,7 +225,7 @@ |
225 | 225 | diagnoseNames.add(data.getName()); |
226 | 226 | } |
227 | 227 | } |
228 | - bm.setLastDiagnose(JsonUtil.array2JsonString(diagnoseNames)); | |
228 | + bm.setLastDiagnose(diagnoseNames); | |
229 | 229 | } |
230 | 230 | |
231 | 231 | babyBookbuildingService.updateBabyBuild(bm, request.getBuildId()); |