jiangjiazhi / regional-platform

Authored by liquanyu over 5 years ago

Exists in master and in 6 other branches

Showing 3 changed files with 18 additions and 2 deletions

...	...	@@ -47,7 +47,9 @@
47	47	private Date lastMensesStart;
48	48	private Date lastMensesEnd;
49	49
	50	+ private Integer result;
50	51
	52	+
51	53	@Override
52	54	public MongoQuery convertToQuery() {
53	55	MongoCondition condition = MongoCondition.newInstance();
...	...	@@ -68,6 +70,10 @@
68	70	condition = condition.and("pid", pid, MongoOper.IS);
69	71	}
70	72
	73	+ if (null != result) {
	74	+ condition = condition.and("result", result, MongoOper.IS);
	75	+ }
	76	+
71	77	if (CollectionUtils.isNotEmpty(patientIds)) {
72	78	condition = condition.and("patientId", patientIds, MongoOper.IN);
73	79	}
...	...	@@ -100,6 +106,14 @@
100	106	condition = condition.andCondition(new MongoCondition(c));
101	107	}
102	108	return condition.toMongoQuery();
	109	+ }
	110	+
	111	+ public Integer getResult() {
	112	+ return result;
	113	+ }
	114	+
	115	+ public void setResult(Integer result) {
	116	+ this.result = result;
103	117	}
104	118
105	119	public Date getLastMensesEnd() {

...	...	@@ -74,11 +74,12 @@
74	74	@RequestParam(required = false) Integer end,
75	75	@RequestParam(required = false) Integer age,
76	76	@RequestParam(required = false) Integer type,
	77	+ @RequestParam(required = false) Integer result,
77	78	@RequestParam(required = true) Integer page,
78	79	@RequestParam(required = true) Integer limit,
79	80	@RequestParam(required = false) String vcCardNo) {
80	81
81		- return BoneFacade.queryBoneList(queryNo, start, end, age, vcCardNo, type, page, limit, getUserId(request));
	82	+ return BoneFacade.queryBoneList(queryNo, start, end, age, vcCardNo, type, result,page, limit, getUserId(request));
82	83
83	84	}
84	85	}

...	...	@@ -56,12 +56,13 @@
56	56	@Autowired
57	57	private MongoTemplate mongoTemplate;
58	58
59		- public BaseResponse queryBoneList(String queryNo, Integer start, Integer end, Integer age, String vcCardNo,Integer type ,Integer page, Integer limit, Integer userId) {
	59	+ public BaseResponse queryBoneList(String queryNo, Integer start, Integer end, Integer age, String vcCardNo,Integer type ,Integer result,Integer page, Integer limit, Integer userId) {
60	60
61	61
62	62	List dataList = new ArrayList();
63	63	String hospitalId = autoMatchFacade.getHospitalId(userId);
64	64	BoneQuery query = new BoneQuery();
	65	+ query.setResult(result);
65	66	//孕妇骨密度
66	67	if (type == 0)
67	68	{