jiangjiazhi / regional-platform | GitLab

Commit bccf8215aa898f91f4cce173fdcf175ecfaea122

Authored by shiyang over 3 years ago

1 parent 3265c38c8d

Exists in master and in 6 other branches

秦皇岛-高危儿专科-档案列表查询bug改正

Showing 2 changed files with 2 additions and 5 deletions

platform-dal/src/main/java/com/lyms/platform/query/BabyHighRiskBabyModelQuery.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyHighRiskBabyFacade.java

...	...	@@ -504,10 +504,7 @@
504	504	MongoCondition con2 = MongoCondition.newInstance("cyzdList.cyzd", cyzd, MongoOper.IN);
505	505	cor=con.orCondition(new MongoCondition[]{con1, con2}).getCriteria();
506	506	}else {
507		- MongoCondition con = MongoCondition.newInstance();
508		- MongoCondition con1 = MongoCondition.newInstance("cyzd", cyzd, MongoOper.NIN);
509		- MongoCondition con2 = MongoCondition.newInstance("cyzdList.cyzd", cyzd, MongoOper.NIN);
510		- cor=con.orCondition(new MongoCondition[]{con1, con2}).getCriteria();
	507	+ condition = condition.and("cyzd",cyzd,MongoOper.NIN).and("cyzdList.cyzd",cyzd,MongoOper.NIN);
511	508	}
512	509	}
513	510

...	...	@@ -731,7 +731,7 @@
731	731	if(null!=babyQuery.getClassify()){
732	732	babyQuery.setCzOrfzProject("cz");
733	733	List<Object> list = new ArrayList<>();
734		- List<QhdDischargedDiagnose> list2=mongoTemplate.findAll(QhdDischargedDiagnose.class);
	734	+ List<QhdDischargedDiagnose> list2=mongoTemplate.find(new Query().addCriteria(Criteria.where("yn").is(1)),QhdDischargedDiagnose.class);
735	735	//Pattern封装正则模糊查询表达式查所有自定义出院诊断类型数据
736	736	for (QhdDischargedDiagnose dischargedDiagnose : list2) {
737	737	list.add(Pattern.compile("^."+dischargedDiagnose.getDiagnoseName()+".$"));