jiangjiazhi / regional-platform

Authored by yangfei over 8 years ago

Exists in master and in 6 other branches

Showing 3 changed files with 17 additions and 17 deletions

...	...	@@ -29,17 +29,17 @@
29	29	//大于修改时间
30	30	private Date gteModified;
31	31	private Date gteCreated;
32		- private List<String> pids;
	32	+ private List<String> parentIds;
33	33	private String pid;
34	34	private Date checkTimeStart;
35	35	private Date checkTimeEnd;
36	36
37		- public List<String> getPids() {
38		- return pids;
	37	+ public List<String> getParentIds() {
	38	+ return parentIds;
39	39	}
40	40
41		- public void setPids(List<String> pids) {
42		- this.pids = pids;
	41	+ public void setParentIds(List<String> parentIds) {
	42	+ this.parentIds = parentIds;
43	43	}
44	44
45	45	public Date getCheckTimeStart() {
...	...	@@ -171,8 +171,8 @@
171	171	if (null != pid) {
172	172	condition = condition.and("pid", pid, MongoOper.IS);
173	173	}
174		- if(CollectionUtils.isNotEmpty(pids)){
175		- condition = condition.and("pid", pids, MongoOper.IN);
	174	+ if(CollectionUtils.isNotEmpty(parentIds)){
	175	+ condition = condition.and("parentId", parentIds, MongoOper.IN);
176	176	}
177	177	if(CollectionUtils.isNotEmpty(hospitalList)){
178	178	condition = condition.and("hospitalId", hospitalList, MongoOper.IN);

...	...	@@ -21,7 +21,7 @@
21	21	private Integer yn;
22	22	private String id;
23	23	private String pid;
24		- private List<String> pids;
	24	+ private List<String> parentIds;
25	25	//创建时间
26	26	private Date start;
27	27
28	28
...	...	@@ -36,12 +36,12 @@
36	36
37	37	private Date gteCreated;
38	38
39		- public List<String> getPids() {
40		- return pids;
	39	+ public List<String> getParentIds() {
	40	+ return parentIds;
41	41	}
42	42
43		- public void setPids(List<String> pids) {
44		- this.pids = pids;
	43	+ public void setParentIds(List<String> parentIds) {
	44	+ this.parentIds = parentIds;
45	45	}
46	46
47	47	public Date getGteCreated() {
...	...	@@ -120,8 +120,8 @@
120	120	if(null!=pid){
121	121	condition= condition.and("pid",pid, MongoOper.IS);
122	122	}
123		- if(CollectionUtils.isNotEmpty(pids)){
124		- condition = condition.and("pid", pids, MongoOper.IN);
	123	+ if(CollectionUtils.isNotEmpty(parentIds)){
	124	+ condition = condition.and("parentId", parentIds, MongoOper.IN);
125	125	}
126	126	if(null!=yn){
127	127	condition= condition.and("yn",yn, MongoOper.IS);

...	...	@@ -91,14 +91,14 @@
91	91	//根据patientId集合查询产检表、产检复查表，获取医生id、patientId列表
92	92	AntExChuQuery antExChuQuery = new AntExChuQuery();
93	93	//患者集合
94		- antExChuQuery.setPids(pIds);
	94	+ antExChuQuery.setParentIds(pIds);
95	95	antExChuQuery.setYn(1);
96	96	antExChuQuery.setHospitalId(hospital);
97	97	//初诊集合列表
98	98	List<AntExChuModel> antExChuModels = antExService.queryAntExChu(antExChuQuery);
99	99	AntExQuery antExQuery = new AntExQuery();
100	100	antExQuery.setHospitalId(hospital);
101		- antExQuery.setPids(pIds);
	101	+ antExQuery.setParentIds(pIds);
102	102	antExQuery.setYn(1);
103	103	//复诊集合列表
104	104	List<AntenatalExaminationModel> antenatalExaminationModels = antExService.queryAntenatalExamination(antExQuery.convertToQuery());
...	...	@@ -217,7 +217,7 @@
217	217	doctorMap.put("data", doctorList);
218	218	doctorInfo.add(doctorMap);
219	219
220		- System.out.println(ar.toString());
	220	+ // System.out.println(ar.toString());
221	221	}
222	222
223	223	DecimalFormat df = new DecimalFormat("0.0");//格式化小数，不足的补0