diff --git a/platform-dal/src/main/java/com/lyms/platform/query/BoneQuery.java b/platform-dal/src/main/java/com/lyms/platform/query/BoneQuery.java index d0682bb..c111f74 100644 --- a/platform-dal/src/main/java/com/lyms/platform/query/BoneQuery.java +++ b/platform-dal/src/main/java/com/lyms/platform/query/BoneQuery.java @@ -47,6 +47,8 @@ public class BoneQuery extends BaseQuery implements IConvertToNativeQuery { private Date lastMensesStart; private Date lastMensesEnd; + private Integer result; + @Override public MongoQuery convertToQuery() { @@ -68,6 +70,10 @@ public class BoneQuery extends BaseQuery implements IConvertToNativeQuery { condition = condition.and("pid", pid, MongoOper.IS); } + if (null != result) { + condition = condition.and("result", result, MongoOper.IS); + } + if (CollectionUtils.isNotEmpty(patientIds)) { condition = condition.and("patientId", patientIds, MongoOper.IN); } @@ -102,6 +108,14 @@ public class BoneQuery extends BaseQuery implements IConvertToNativeQuery { return condition.toMongoQuery(); } + public Integer getResult() { + return result; + } + + public void setResult(Integer result) { + this.result = result; + } + public Date getLastMensesEnd() { return lastMensesEnd; } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/BoneController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/BoneController.java index 55b0526..5d64b79 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/BoneController.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/BoneController.java @@ -74,11 +74,12 @@ public class BoneController extends BaseController { @RequestParam(required = false) Integer end, @RequestParam(required = false) Integer age, @RequestParam(required = false) Integer type, + @RequestParam(required = false) Integer result, @RequestParam(required = true) Integer page, @RequestParam(required = true) Integer limit, @RequestParam(required = false) String vcCardNo) { - return BoneFacade.queryBoneList(queryNo, start, end, age, vcCardNo, type, page, limit, getUserId(request)); + return BoneFacade.queryBoneList(queryNo, start, end, age, vcCardNo, type, result,page, limit, getUserId(request)); } } \ No newline at end of file diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BoneFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BoneFacade.java index d683d18..cd44ba5 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BoneFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BoneFacade.java @@ -56,12 +56,13 @@ public class BoneFacade { @Autowired private MongoTemplate mongoTemplate; - public BaseResponse queryBoneList(String queryNo, Integer start, Integer end, Integer age, String vcCardNo,Integer type ,Integer page, Integer limit, Integer userId) { + public BaseResponse queryBoneList(String queryNo, Integer start, Integer end, Integer age, String vcCardNo,Integer type ,Integer result,Integer page, Integer limit, Integer userId) { List dataList = new ArrayList(); String hospitalId = autoMatchFacade.getHospitalId(userId); BoneQuery query = new BoneQuery(); + query.setResult(result); //孕妇骨密度 if (type == 0) {