jiangjiazhi / regional-platform | GitLab

Commit 52eeaebfcb758e0b8cf95bd61700728ff48e05ca

Authored by shiyang over 3 years ago

1 parent c483fd82fb

Exists in master and in 6 other branches

update

Showing 2 changed files with 10 additions and 2 deletions

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

...	...	@@ -68,7 +68,6 @@
68	68	*/
69	69	public List<BreastAfterVisitModel> queryBreastAfterVisitList(BreastAfterVisitQuery breastAfterVisitQuery) {
70	70	MongoQuery query = breastAfterVisitQuery.convertToQuery();
71		- System.out.println(query.convertToMongoQuery().getQueryObject().toString());
72	71	if (StringUtils.isNotEmpty(breastAfterVisitQuery.getNeed())) {
73	72	breastAfterVisitQuery.mysqlBuild(iBreastAfterVisitDao.count(breastAfterVisitQuery.convertToQuery()));
74	73	query.start(breastAfterVisitQuery.getOffset()).end(breastAfterVisitQuery.getLimit());

...	...	@@ -423,7 +423,16 @@
423	423	cancerScr.setIsSync(1);
424	424	cancerScreenService.addOneCancerScreen(cancerScr);
425	425	//添加乳腺癌追访
426		- BreastAfterVisitAdd(cancerScr,1);
	426	+ BreastAfterVisitQuery breastAfterVisitQuery=new BreastAfterVisitQuery();
	427	+ breastAfterVisitQuery.setQueryNo(cancerScr.getCertificateNum());
	428	+ List<BreastAfterVisitModel> breastAfterVisitModels = breastAfterVisitService.queryBreastAfterVisitList(breastAfterVisitQuery);
	429	+ if(CollectionUtils.isNotEmpty(breastAfterVisitModels)){
	430	+ //如果多次检查不需要新增追访信息，更新之前信息
	431	+ cancerScr.setId(breastAfterVisitModels.get(0).getParentId());
	432	+ BreastAfterVisitAdd(cancerScr,2);
	433	+ }else {
	434	+ BreastAfterVisitAdd(cancerScr,1);
	435	+ }
427	436	return new BaseResponse("成功", ErrorCodeConstants.SUCCESS);
428	437	} else {
429	438	return new BaseResponse("未传入的妇女建档id", ErrorCodeConstants.SUCCESS);