diff --git a/platform-dal/src/main/java/com/lyms/platform/query/PatientsQuery.java b/platform-dal/src/main/java/com/lyms/platform/query/PatientsQuery.java index 730b871..017c6aa 100644 --- a/platform-dal/src/main/java/com/lyms/platform/query/PatientsQuery.java +++ b/platform-dal/src/main/java/com/lyms/platform/query/PatientsQuery.java @@ -825,9 +825,17 @@ public class PatientsQuery extends BaseQuery implements IConvertToNativeQuery { condition=condition.and("firstCheckId",null,MongoOper.IS); } } - //筛选乳房列表是否做过检查0,1 + //筛选乳房列表是否做过检查0,1。false为了查出数据中没有该字段的。 + Criteria c2=MongoCondition.newInstance().getCriteria(); if(StringUtils.isNotEmpty(breastType)){ - condition = condition.and("breastType", breastType, MongoOper.IS); + if("0".equals(breastType)){ + MongoCondition con =MongoCondition.newInstance(); + MongoCondition con1 = MongoCondition.newInstance("breastType", "0", MongoOper.IS); + MongoCondition con2 = MongoCondition.newInstance("breastType", false, MongoOper.EXISTS); + c2 = con.orCondition(new MongoCondition[]{con1, con2}).getCriteria(); + }else { + condition = condition.and("breastType", breastType, MongoOper.IS); + } } Criteria c1 = null; @@ -1368,11 +1376,9 @@ public class PatientsQuery extends BaseQuery implements IConvertToNativeQuery { } if (null != c1) { - condition = condition.andCondition(new MongoCondition(c1)); - + return new MongoCondition(c1.andOperator(condition.getCriteria(),c2)).toMongoQuery(); } - - return condition.toMongoQuery(); + return new MongoCondition(c1.andOperator(condition.getCriteria(),c2)).toMongoQuery(); } public boolean isExistRiskLevel() { diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/BreastController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/BreastController.java index 6b4fc12..2b9c89b 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/BreastController.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/BreastController.java @@ -190,7 +190,7 @@ public class BreastController extends BaseController { @RequestMapping(value = "/updateBreastType", method = RequestMethod.POST) @ResponseBody @TokenRequired - public BaseResponse updateBreastType(Patients patients, HttpServletRequest request) { + public BaseResponse updateBreastType(@RequestBody Patients patients, HttpServletRequest request) { BaseResponse baseResponse = breastFacade.updateBreastType(patients); return baseResponse; }