jiangjiazhi / regional-platform | GitLab

Commit ac77491b8517ac97bdb66f515f13d90d913271c4

Authored by shiyang over 3 years ago

1 parent 99fdf1d2f9

Exists in master and in 6 other branches

update

Showing 3 changed files with 2 additions and 3 deletions

platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/CervixVisitService.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/CancerScreeningFacade.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/CervicalCancerServiceImpl.java

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

...	...	@@ -772,7 +772,7 @@
772	772	yqsj=DateUtil.getDays(model.getNextAfterVisitTime(),new Date());
773	773	}
774	774	}
775		- map.put("yqsj",yqsj);
	775	+ map.put("yqsj",yqsj==0?"-":yqsj);
776	776	map.put("afterVisitTime", DateUtil.getyyyy_MM_dd(model.getAfterVisitTime()));//随访时间
777	777	map.put("nextAfterVisitTime", DateUtil.getyyyy_MM_dd(model.getNextAfterVisitTime()));//下次预约时间
778	778	map.put("checkDate", DateUtil.getyyyy_MM_dd(model.getCheckDate()));//检査日期

...	...	@@ -1255,7 +1255,7 @@
1255	1255	yqsj=DateUtil.getDays(model.getNextAfterVisitTime(),new Date());
1256	1256	}
1257	1257	}
1258		- map.put("yqsj",yqsj);
	1258	+ map.put("yqsj",yqsj==0?"-":yqsj);
1259	1259	map.put("ruleRecommend", model.getRuleRecommend());
1260	1260	map.put("afterVisitTime", DateUtil.getyyyy_MM_dd(model.getAfterVisitTime()));//随访时间
1261	1261	map.put("nextAfterVisitTime", DateUtil.getyyyy_MM_dd(model.getNextAfterVisitTime()));//下次预约时间