diff --git a/platform-dal/src/main/java/com/lyms/platform/pojo/BabyModel.java b/platform-dal/src/main/java/com/lyms/platform/pojo/BabyModel.java index 2b6e6a1..0522d8e 100644 --- a/platform-dal/src/main/java/com/lyms/platform/pojo/BabyModel.java +++ b/platform-dal/src/main/java/com/lyms/platform/pojo/BabyModel.java @@ -1,6 +1,7 @@ package com.lyms.platform.pojo; import java.util.Date; +import java.util.List; import org.springframework.data.mongodb.core.mapping.Document; import org.springframework.data.mongodb.core.mapping.Field; @@ -201,7 +202,7 @@ public class BabyModel extends BaseModel { private Integer lastHighRisk; //诊断 - private String lastDiagnose; + private List lastDiagnose; public Integer getBuildType() { return buildType; @@ -219,11 +220,11 @@ public class BabyModel extends BaseModel { this.lastHighRisk = lastHighRisk; } - public String getLastDiagnose() { + public List getLastDiagnose() { return lastDiagnose; } - public void setLastDiagnose(String lastDiagnose) { + public void setLastDiagnose(List lastDiagnose) { this.lastDiagnose = lastDiagnose; } diff --git a/platform-dal/src/main/java/com/lyms/platform/query/BabyModelQuery.java b/platform-dal/src/main/java/com/lyms/platform/query/BabyModelQuery.java index 5af678d..81ae3e5 100644 --- a/platform-dal/src/main/java/com/lyms/platform/query/BabyModelQuery.java +++ b/platform-dal/src/main/java/com/lyms/platform/query/BabyModelQuery.java @@ -175,15 +175,6 @@ public class BabyModelQuery extends BaseQuery implements IConvertToNativeQuery { //诊断 private String lastDiagnose; - private List lastDiagnoses; - - public List getLastDiagnoses() { - return lastDiagnoses; - } - - public void setLastDiagnoses(List lastDiagnoses) { - this.lastDiagnoses = lastDiagnoses; - } public String getLastDiagnose() { return lastDiagnose; @@ -374,12 +365,6 @@ public class BabyModelQuery extends BaseQuery implements IConvertToNativeQuery { condition=condition.and("lastDiagnose", lastDiagnose, MongoOper.IN); } - if (null != lastDiagnoses && lastDiagnoses.size() > 0) { - Criteria c = Criteria.where("lastDiagnose").in(lastDiagnoses); - condition.andCondition( new MongoCondition(c)); - } - - if(!StringUtils.isEmpty(phoneId) || !StringUtils.isEmpty(cardId)){ MongoCondition con1 = MongoCondition.newInstance("phoneId", phoneId, MongoOper.LIKE); MongoCondition con = MongoCondition.newInstance("cardId", cardId, MongoOper.LIKE); diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyBookbuildingFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyBookbuildingFacade.java index 4c21b02..6456861 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyBookbuildingFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyBookbuildingFacade.java @@ -816,7 +816,7 @@ public class BabyBookbuildingFacade { diagnoseNames.add(data.getName()); } } - bm.setLastDiagnose(JsonUtil.array2JsonString(diagnoseNames)); + bm.setLastDiagnose(diagnoseNames); } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyCheckFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyCheckFacade.java index 1a3aa5f..5b39ec2 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyCheckFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyCheckFacade.java @@ -91,7 +91,7 @@ public class BabyCheckFacade { diagnoseNames.add(data.getName()); } } - bm.setLastDiagnose(JsonUtil.array2JsonString(diagnoseNames)); + bm.setLastDiagnose(diagnoseNames); } babyBookbuildingService.updateBabyBuild(bm, request.getBuildId()); return new BaseResponse().setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("成功"); @@ -225,7 +225,7 @@ public class BabyCheckFacade { diagnoseNames.add(data.getName()); } } - bm.setLastDiagnose(JsonUtil.array2JsonString(diagnoseNames)); + bm.setLastDiagnose(diagnoseNames); } babyBookbuildingService.updateBabyBuild(bm, request.getBuildId());