jiangjiazhi / regional-platform

Commit 99fdf1d2f977c1b806bfd1a5e367846afd752767

Authored by shiyang over 3 years ago

Exists in master and in 6 other branches

update

Showing 3 changed files with 26 additions and 27 deletions

platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/CervixVisitService.java
platform-dal/src/main/java/com/lyms/platform/query/CervixVisitQuery.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/CervicalCancerServiceImpl.java

...	...	@@ -63,6 +63,7 @@
63	63	*/
64	64	public List<CervixVisitModel> queryCervixVisitList(CervixVisitQuery cervixVisitQuery) {
65	65	MongoQuery query = cervixVisitQuery.convertToQuery();
	66	+ System.out.println(query.convertToMongoQuery().toString());
66	67	if (StringUtils.isNotEmpty(cervixVisitQuery.getNeed())) {
67	68	cervixVisitQuery.mysqlBuild(iCervixVisitDao.count(cervixVisitQuery.convertToQuery()));
68	69	query.start(cervixVisitQuery.getOffset()).end(cervixVisitQuery.getLimit());

...	...	@@ -320,42 +320,35 @@
320	320	c = Criteria.where("nextAfterVisitTime").gte(overdueStart);
321	321	}
322	322	}
323		- if (null != nextAfterVisitTime) {
324		- if (null != c) {
325		- if(null!=overdueEnd){
326		- if (c.getCriteriaObject().containsField("nextAfterVisitTime")){
327		- c = c.lte(overdueEnd);
328		- }else {
329		- c = c.and("nextAfterVisitTime").lte(overdueEnd);
330		- }
	323	+ if (null != overdueEnd) {
	324	+ if (c != null) {
	325	+ if(c.getCriteriaObject().containsField("nextAfterVisitTime")){
	326	+ c=c.lte(overdueEnd);
331	327	}else {
332		- if (c.getCriteriaObject().containsField("nextAfterVisitTime")){
333		- c = c.lte(nextAfterVisitTime);
334		- }else {
335		- c = c.and("nextAfterVisitTime").lte(nextAfterVisitTime);
336		- }
	328	+ c = c.and("nextAfterVisitTime").lte(overdueEnd);
337	329	}
338	330	} else {
339		- if(null!=overdueEnd){
340		- c = Criteria.where("nextAfterVisitTime").lte(overdueEnd);
341		- }else {
342		- c = Criteria.where("nextAfterVisitTime").lte(nextAfterVisitTime);
343		- }
	331	+ c = Criteria.where("nextAfterVisitTime").lte(overdueEnd);
344	332	}
345	333	}
	334	+
346	335	Criteria c2=MongoCondition.newInstance().getCriteria();
	336	+ if (null != nextAfterVisitTime) {
	337	+ MongoCondition con = MongoCondition.newInstance();
	338	+ MongoCondition con1 = MongoCondition.newInstance("nextAfterVisitTime", nextAfterVisitTime, MongoOper.LTE);
	339	+ MongoCondition con2 = MongoCondition.newInstance("nextAfterVisitTime", false, MongoOper.EXISTS);
	340	+ c2 = c2.orOperator(con.orCondition(new MongoCondition[]{con1, con2}).getCriteria());
	341	+ }
	342	+
	343	+ Criteria c3=MongoCondition.newInstance().getCriteria();
347	344	if (null != nextAfterVisitTimeStart &&null!= nextAfterVisitTimeEnd) {
348		- if (null != c2) {
349		- c2 = c2.where("nextAfterVisitTime").gte(nextAfterVisitTimeStart).lte(nextAfterVisitTimeEnd);
350		- } else {
351		- c2 = Criteria.where("nextAfterVisitTime").gte(nextAfterVisitTimeStart).lte(nextAfterVisitTimeEnd);
352		- }
	345	+ c3 = c3.where("nextAfterVisitTime").gte(nextAfterVisitTimeStart).lte(nextAfterVisitTimeEnd);
353	346	}
354	347
355	348	if (null != c) {
356		- return new MongoCondition(c.andOperator(condition.getCriteria(),c2)).toMongoQuery();
	349	+ return new MongoCondition(c.andOperator(condition.getCriteria(),c2,c3)).toMongoQuery();
357	350	}
358		- return new MongoCondition(c2.andOperator(condition.getCriteria())).toMongoQuery();
	351	+ return new MongoCondition(c2.andOperator(condition.getCriteria(),c3)).toMongoQuery();
359	352	}
360	353
361	354	}

...	...	@@ -1111,7 +1111,7 @@
1111	1111	break;
1112	1112	}
1113	1113	}
1114		- if(cin23==2){
	1114	+ if(cin23==2){//cin23值
1115	1115	if(xshpv==1){//现实HPV
1116	1116	if(Arrays.asList(2,3,4,8).contains(xsxbx)){
1117	1117	cervixVisitModel.setRuleRecommend(1);
...	...	@@ -1130,6 +1130,9 @@
1130	1130	}
1131	1131	}
1132	1132	}
	1133	+ if(cin23==2&&hpv==2&&xbx==1){
	1134	+ cervixVisitModel.setRuleRecommend(1);
	1135	+ }
1133	1136
1134	1137	if(type==1) {
1135	1138	cervixVisitModel.setParentId(cervicalCancerRequest.getId());
...	...	@@ -1181,6 +1184,8 @@
1181	1184	if (hospitalId != null) {
1182	1185	query.setHospitalId(hospitalId);
1183	1186	}
	1187	+ //列表只展示小于当前时间的
	1188	+ query.setNextAfterVisitTime(new Date());
1184	1189	//检查日期筛选
1185	1190	if (StringUtils.isNotEmpty(queryRequest.getCheckDate())) {
1186	1191	String[] arrs = queryRequest.getCheckDate().split(" - ");
1187	1192
...	...	@@ -1231,8 +1236,8 @@
1231	1236	query.setRuleRecommend(queryRequest.getRuleRecommend());
1232	1237	//追访状态
1233	1238	query.setType(queryRequest.getType());
1234		- List list = new ArrayList();
1235	1239	List <CervixVisitModel> modelList = cervixVisitService.queryCervixVisitList(query);
	1240	+ List list = new ArrayList();
1236	1241	if (CollectionUtils.isNotEmpty(modelList)) {
1237	1242	for (CervixVisitModel model : modelList) {
1238	1243	Map <String, Object> map = new HashMap <>();