jiangjiazhi / regional-platform

Commit b31bd109b24019e617eaa92a1cd08fb1caf7778a

Authored by liquanyu over 4 years ago

Exists in master and in 6 other branches

update

Showing 2 changed files with 160 additions and 53 deletions

platform-dal/src/main/java/com/lyms/platform/pojo/PostkfModel.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PostkfFaccade.java

...	...	@@ -22,39 +22,39 @@
22	22	private String pid;
23	23	private String patientId;
24	24	//重症急救
25		- private Map zzjj;
	25	+ private Map<String,Object> zzjj;
26	26	//疾病治疗
27		- private Map jbzl;
	27	+ private Map<String,Object> jbzl;
28	28	//损伤康复
29		- private Map sskf;
	29	+ private Map<String,Object> sskf;
30	30	//胃肠功能减退
31		- private Map wcgnjt;
	31	+ private Map<String,Object> wcgnjt;
32	32	//尿失禁
33		- private Map nsj;
	33	+ private Map<String,Object> nsj;
34	34	//尿潴留
35		- private Map ndl;
	35	+ private Map<String,Object> ndl;
36	36	//乳房（无奶乳汁不足、涨奶）
37		- private Map rf;
	37	+ private Map<String,Object> rf;
38	38	//恶露异常
39		- private Map elyc;
	39	+ private Map<String,Object> elyc;
40	40	//乳腺炎
41		- private Map rxy;
	41	+ private Map<String,Object> rxy;
42	42	//盆底肌受损
43		- private Map pdjss;
	43	+ private Map<String,Object> pdjss;
44	44	//腹直肌受损
45		- private Map fzjss;
	45	+ private Map<String,Object> fzjss;
46	46
47	47	//肥胖
48		- private Map fp;
	48	+ private Map<String,Object> fp;
49	49
50	50	//耻骨联合分离
51		- private Map cglhfl;
	51	+ private Map<String,Object> cglhfl;
52	52
53	53	//保健预防
54		- private Map bjyf;
	54	+ private Map<String,Object> bjyf;
55	55
56	56	//评估建议和 “下次电话评估时间：”“下次回院评估时间”
57		- private Map pgjy;
	57	+ private Map<String,Object> pgjy;
58	58
59	59	private String hospitalId;
60	60
61	61
...	...	@@ -62,21 +62,12 @@
62	62
63	63	private List<Integer> status;
64	64
65		-
66	65	private Date created;
67	66
68	67	private Date modified;
69	68
70	69	private String operaterId;
71	70
72		- public Map getPgjy() {
73		- return pgjy;
74		- }
75		-
76		- public void setPgjy(Map pgjy) {
77		- this.pgjy = pgjy;
78		- }
79		-
80	71	public String getId() {
81	72	return id;
82	73	}
83	74
84	75
85	76
86	77
87	78
88	79
89	80
90	81
91	82
92	83
93	84
94	85
95	86
96	87
97	88
98	89
99	90
100	91
101	92
102	93
103	94
104	95
105	96
106	97
107	98
108	99
109	100
110	101
...	...	@@ -109,116 +100,124 @@
109	100	this.patientId = patientId;
110	101	}
111	102
112		- public Map getZzjj() {
	103	+ public Map<String, Object> getZzjj() {
113	104	return zzjj;
114	105	}
115	106
116		- public void setZzjj(Map zzjj) {
	107	+ public void setZzjj(Map<String, Object> zzjj) {
117	108	this.zzjj = zzjj;
118	109	}
119	110
120		- public Map getJbzl() {
	111	+ public Map<String, Object> getJbzl() {
121	112	return jbzl;
122	113	}
123	114
124		- public void setJbzl(Map jbzl) {
	115	+ public void setJbzl(Map<String, Object> jbzl) {
125	116	this.jbzl = jbzl;
126	117	}
127	118
128		- public Map getSskf() {
	119	+ public Map<String, Object> getSskf() {
129	120	return sskf;
130	121	}
131	122
132		- public void setSskf(Map sskf) {
	123	+ public void setSskf(Map<String, Object> sskf) {
133	124	this.sskf = sskf;
134	125	}
135	126
136		- public Map getWcgnjt() {
	127	+ public Map<String, Object> getWcgnjt() {
137	128	return wcgnjt;
138	129	}
139	130
140		- public void setWcgnjt(Map wcgnjt) {
	131	+ public void setWcgnjt(Map<String, Object> wcgnjt) {
141	132	this.wcgnjt = wcgnjt;
142	133	}
143	134
144		- public Map getNsj() {
	135	+ public Map<String, Object> getNsj() {
145	136	return nsj;
146	137	}
147	138
148		- public void setNsj(Map nsj) {
	139	+ public void setNsj(Map<String, Object> nsj) {
149	140	this.nsj = nsj;
150	141	}
151	142
152		- public Map getNdl() {
	143	+ public Map<String, Object> getNdl() {
153	144	return ndl;
154	145	}
155	146
156		- public void setNdl(Map ndl) {
	147	+ public void setNdl(Map<String, Object> ndl) {
157	148	this.ndl = ndl;
158	149	}
159	150
160		- public Map getRf() {
	151	+ public Map<String, Object> getRf() {
161	152	return rf;
162	153	}
163	154
164		- public void setRf(Map rf) {
	155	+ public void setRf(Map<String, Object> rf) {
165	156	this.rf = rf;
166	157	}
167	158
168		- public Map getElyc() {
	159	+ public Map<String, Object> getElyc() {
169	160	return elyc;
170	161	}
171	162
172		- public void setElyc(Map elyc) {
	163	+ public void setElyc(Map<String, Object> elyc) {
173	164	this.elyc = elyc;
174	165	}
175	166
176		- public Map getRxy() {
	167	+ public Map<String, Object> getRxy() {
177	168	return rxy;
178	169	}
179	170
180		- public void setRxy(Map rxy) {
	171	+ public void setRxy(Map<String, Object> rxy) {
181	172	this.rxy = rxy;
182	173	}
183	174
184		- public Map getPdjss() {
	175	+ public Map<String, Object> getPdjss() {
185	176	return pdjss;
186	177	}
187	178
188		- public void setPdjss(Map pdjss) {
	179	+ public void setPdjss(Map<String, Object> pdjss) {
189	180	this.pdjss = pdjss;
190	181	}
191	182
192		- public Map getFzjss() {
	183	+ public Map<String, Object> getFzjss() {
193	184	return fzjss;
194	185	}
195	186
196		- public void setFzjss(Map fzjss) {
	187	+ public void setFzjss(Map<String, Object> fzjss) {
197	188	this.fzjss = fzjss;
198	189	}
199	190
200		- public Map getFp() {
	191	+ public Map<String, Object> getFp() {
201	192	return fp;
202	193	}
203	194
204		- public void setFp(Map fp) {
	195	+ public void setFp(Map<String, Object> fp) {
205	196	this.fp = fp;
206	197	}
207	198
208		- public Map getCglhfl() {
	199	+ public Map<String, Object> getCglhfl() {
209	200	return cglhfl;
210	201	}
211	202
212		- public void setCglhfl(Map cglhfl) {
	203	+ public void setCglhfl(Map<String, Object> cglhfl) {
213	204	this.cglhfl = cglhfl;
214	205	}
215	206
216		- public Map getBjyf() {
	207	+ public Map<String, Object> getBjyf() {
217	208	return bjyf;
218	209	}
219	210
220		- public void setBjyf(Map bjyf) {
	211	+ public void setBjyf(Map<String, Object> bjyf) {
221	212	this.bjyf = bjyf;
	213	+ }
	214	+
	215	+ public Map<String, Object> getPgjy() {
	216	+ return pgjy;
	217	+ }
	218	+
	219	+ public void setPgjy(Map<String, Object> pgjy) {
	220	+ this.pgjy = pgjy;
222	221	}
223	222
224	223	public String getHospitalId() {

...	...	@@ -5,6 +5,8 @@
5	5	import com.lyms.platform.biz.service.PatientsService;
6	6	import com.lyms.platform.common.constants.ErrorCodeConstants;
7	7	import com.lyms.platform.common.dao.BaseQuery;
	8	+import com.lyms.platform.common.dao.operator.MongoCondition;
	9	+import com.lyms.platform.common.dao.operator.MongoOper;
8	10	import com.lyms.platform.common.enums.CfEnums;
9	11	import com.lyms.platform.common.enums.FmTypeEnums;
10	12	import com.lyms.platform.common.enums.RenShenJieJuEnums;
...	...	@@ -254,6 +256,7 @@
254	256
255	257
256	258	String hospitalId = autoMatchFacade.getHospitalId(userId);
	259	+
257	260	Query query = new Query();
258	261	Integer status = postKfRequest.getStatus();
259	262	if (status != null) {
260	263
...	...	@@ -267,7 +270,112 @@
267	270	query.addCriteria(Criteria.where(postKfRequest.getItem()+"."+postKfRequest.getType()+"doctor").is(postKfRequest.getDoctorName()));
268	271	}
269	272	}
	273	+ else if (StringUtils.isNotEmpty(postKfRequest.getDoctorName()))
	274	+ {
270	275
	276	+ query.addCriteria(new Criteria().orOperator(
	277	+
	278	+ Criteria.where("zzjj.cyqpgdoctor").is(postKfRequest.getDoctorName()),
	279	+ Criteria.where("zzjj.ch7tdoctor").is(postKfRequest.getDoctorName()),
	280	+ Criteria.where("zzjj.ch14tdoctor").is(postKfRequest.getDoctorName()),
	281	+ Criteria.where("zzjj.ch28tdoctor").is(postKfRequest.getDoctorName()),
	282	+ Criteria.where("zzjj.ch24tdoctor").is(postKfRequest.getDoctorName()),
	283	+
	284	+ Criteria.where("zzjj.cyqpgdoctor").is(postKfRequest.getDoctorName()),
	285	+ Criteria.where("zzjj.ch7tdoctor").is(postKfRequest.getDoctorName()),
	286	+ Criteria.where("zzjj.ch14tdoctor").is(postKfRequest.getDoctorName()),
	287	+ Criteria.where("zzjj.ch28tdoctor").is(postKfRequest.getDoctorName()),
	288	+ Criteria.where("zzjj.ch24tdoctor").is(postKfRequest.getDoctorName()),
	289	+
	290	+ Criteria.where("jbzl.cyqpgdoctor").is(postKfRequest.getDoctorName()),
	291	+ Criteria.where("jbzl.ch7tdoctor").is(postKfRequest.getDoctorName()),
	292	+ Criteria.where("jbzl.ch14tdoctor").is(postKfRequest.getDoctorName()),
	293	+ Criteria.where("jbzl.ch28tdoctor").is(postKfRequest.getDoctorName()),
	294	+ Criteria.where("jbzl.ch24tdoctor").is(postKfRequest.getDoctorName()),
	295	+
	296	+ Criteria.where("sskf.cyqpgdoctor").is(postKfRequest.getDoctorName()),
	297	+ Criteria.where("sskf.ch7tdoctor").is(postKfRequest.getDoctorName()),
	298	+ Criteria.where("sskf.ch14tdoctor").is(postKfRequest.getDoctorName()),
	299	+ Criteria.where("sskf.ch28tdoctor").is(postKfRequest.getDoctorName()),
	300	+ Criteria.where("sskf.ch24tdoctor").is(postKfRequest.getDoctorName()),
	301	+
	302	+ Criteria.where("wcgnjt.cyqpgdoctor").is(postKfRequest.getDoctorName()),
	303	+ Criteria.where("wcgnjt.ch7tdoctor").is(postKfRequest.getDoctorName()),
	304	+ Criteria.where("wcgnjt.ch14tdoctor").is(postKfRequest.getDoctorName()),
	305	+ Criteria.where("wcgnjt.ch28tdoctor").is(postKfRequest.getDoctorName()),
	306	+ Criteria.where("wcgnjt.ch24tdoctor").is(postKfRequest.getDoctorName()),
	307	+
	308	+
	309	+ Criteria.where("nsj.cyqpgdoctor").is(postKfRequest.getDoctorName()),
	310	+ Criteria.where("nsj.ch7tdoctor").is(postKfRequest.getDoctorName()),
	311	+ Criteria.where("nsj.ch14tdoctor").is(postKfRequest.getDoctorName()),
	312	+ Criteria.where("nsj.ch28tdoctor").is(postKfRequest.getDoctorName()),
	313	+ Criteria.where("nsj.ch24tdoctor").is(postKfRequest.getDoctorName()),
	314	+
	315	+ Criteria.where("ndl.cyqpgdoctor").is(postKfRequest.getDoctorName()),
	316	+ Criteria.where("ndl.ch7tdoctor").is(postKfRequest.getDoctorName()),
	317	+ Criteria.where("ndl.ch14tdoctor").is(postKfRequest.getDoctorName()),
	318	+ Criteria.where("ndl.ch28tdoctor").is(postKfRequest.getDoctorName()),
	319	+ Criteria.where("ndl.ch24tdoctor").is(postKfRequest.getDoctorName()),
	320	+
	321	+
	322	+ Criteria.where("rf.cyqpgdoctor").is(postKfRequest.getDoctorName()),
	323	+ Criteria.where("rf.ch7tdoctor").is(postKfRequest.getDoctorName()),
	324	+ Criteria.where("rf.ch14tdoctor").is(postKfRequest.getDoctorName()),
	325	+ Criteria.where("rf.ch28tdoctor").is(postKfRequest.getDoctorName()),
	326	+ Criteria.where("rf.ch24tdoctor").is(postKfRequest.getDoctorName()),
	327	+
	328	+ Criteria.where("elyc.cyqpgdoctor").is(postKfRequest.getDoctorName()),
	329	+ Criteria.where("elyc.ch7tdoctor").is(postKfRequest.getDoctorName()),
	330	+ Criteria.where("elyc.ch14tdoctor").is(postKfRequest.getDoctorName()),
	331	+ Criteria.where("elyc.ch28tdoctor").is(postKfRequest.getDoctorName()),
	332	+ Criteria.where("elyc.ch24tdoctor").is(postKfRequest.getDoctorName()),
	333	+
	334	+
	335	+ Criteria.where("rxy.cyqpgdoctor").is(postKfRequest.getDoctorName()),
	336	+ Criteria.where("rxy.ch7tdoctor").is(postKfRequest.getDoctorName()),
	337	+ Criteria.where("rxy.ch14tdoctor").is(postKfRequest.getDoctorName()),
	338	+ Criteria.where("rxy.ch28tdoctor").is(postKfRequest.getDoctorName()),
	339	+ Criteria.where("rxy.ch24tdoctor").is(postKfRequest.getDoctorName()),
	340	+
	341	+
	342	+ Criteria.where("pdjss.cyqpgdoctor").is(postKfRequest.getDoctorName()),
	343	+ Criteria.where("pdjss.ch7tdoctor").is(postKfRequest.getDoctorName()),
	344	+ Criteria.where("pdjss.ch14tdoctor").is(postKfRequest.getDoctorName()),
	345	+ Criteria.where("pdjss.ch28tdoctor").is(postKfRequest.getDoctorName()),
	346	+ Criteria.where("pdjss.ch24tdoctor").is(postKfRequest.getDoctorName()),
	347	+
	348	+
	349	+ Criteria.where("fzjss.cyqpgdoctor").is(postKfRequest.getDoctorName()),
	350	+ Criteria.where("fzjss.ch7tdoctor").is(postKfRequest.getDoctorName()),
	351	+ Criteria.where("fzjss.ch14tdoctor").is(postKfRequest.getDoctorName()),
	352	+ Criteria.where("fzjss.ch28tdoctor").is(postKfRequest.getDoctorName()),
	353	+ Criteria.where("fzjss.ch24tdoctor").is(postKfRequest.getDoctorName()),
	354	+
	355	+ Criteria.where("fp.cyqpgdoctor").is(postKfRequest.getDoctorName()),
	356	+ Criteria.where("fp.ch7tdoctor").is(postKfRequest.getDoctorName()),
	357	+ Criteria.where("fp.ch14tdoctor").is(postKfRequest.getDoctorName()),
	358	+ Criteria.where("fp.ch28tdoctor").is(postKfRequest.getDoctorName()),
	359	+ Criteria.where("fp.ch24tdoctor").is(postKfRequest.getDoctorName()),
	360	+
	361	+
	362	+ Criteria.where("cglhfl.cyqpgdoctor").is(postKfRequest.getDoctorName()),
	363	+ Criteria.where("cglhfl.ch7tdoctor").is(postKfRequest.getDoctorName()),
	364	+ Criteria.where("cglhfl.ch14tdoctor").is(postKfRequest.getDoctorName()),
	365	+ Criteria.where("cglhfl.ch28tdoctor").is(postKfRequest.getDoctorName()),
	366	+ Criteria.where("cglhfl.ch24tdoctor").is(postKfRequest.getDoctorName()),
	367	+
	368	+
	369	+ Criteria.where("bjyf.cyqpgdoctor").is(postKfRequest.getDoctorName()),
	370	+ Criteria.where("bjyf.ch7tdoctor").is(postKfRequest.getDoctorName()),
	371	+ Criteria.where("bjyf.ch14tdoctor").is(postKfRequest.getDoctorName()),
	372	+ Criteria.where("bjyf.ch28tdoctor").is(postKfRequest.getDoctorName()),
	373	+ Criteria.where("bjyf.ch24tdoctor").is(postKfRequest.getDoctorName())
	374	+ )
	375	+
	376	+ );
	377	+ }
	378	+
271	379	if (StringUtils.isNotEmpty(postKfRequest.getQueryNo()))
272	380	{
273	381	PatientsQuery query1 = new PatientsQuery();
...	...	@@ -287,7 +395,7 @@
287	395	query.addCriteria(Criteria.where("hospitalId").is(hospitalId));
288	396
289	397	query.with(new Sort(Sort.Direction.DESC, "created"));
290		- long count = mongoTemplate.count(query, DefectiveChildModel.class);
	398	+ long count = mongoTemplate.count(query,"lyms_postkf");
291	399	postKfRequest.mysqlBuild((int) count);
292	400	query.skip(postKfRequest.getOffset()).limit(postKfRequest.getLimit());
293	401	List<ChildbirthManagerQueryModel> datas = new LinkedList<>();