jiangjiazhi / regional-platform

Authored by zhangchao over 1 year ago

Exists in dev

Showing 2 changed files with 6 additions and 6 deletions

...	...	@@ -4130,6 +4130,7 @@
4130	4130	antexListResult.setSieveStatus(sieveFacade.getSieveStatus(patients.getId(), hospitalId));
4131	4131	DiagnoseConfigQuery diagnoseConfigQuery = new DiagnoseConfigQuery();
4132	4132	diagnoseConfigQuery.setHospitalId(hospitalId);
	4133	+ diagnoseConfigQuery.setEnable(1);
4133	4134	List <DiagnoseConfigModel> configModels = diagnoseConfigService.queryDiagnoseConfigs(diagnoseConfigQuery);
4134	4135	if (CollectionUtils.isNotEmpty(configModels) && StringUtils.isNotEmpty(configModels.get(0).getEnable())) {
4135	4136	antexListResult.setEnableConfig(configModels.get(0).getEnable());

...	...	@@ -1300,10 +1300,7 @@
1300	1300
1301	1301
1302	1302	Query yn = null;
1303		- if (hospital.equals("2100002419")){
1304		- Criteria criteria4 = Criteria.where("name").is("双胎妊娠");
1305		- yn = Query.query(Criteria.where("yn").is(1).orOperator(criteria4));
1306		- }else {
	1303	+
1307	1304	//双绒双羊、单绒单羊、单绒双羊
1308	1305	if ("1".equals(riskPatientsQueryRequest.getTwinsType())) {
1309	1306	Criteria criteria2 = Criteria.where("name").is("双胎妊娠（双绒双羊）");
1310	1307
...	...	@@ -1320,9 +1317,11 @@
1320	1317	Criteria criteria1 = Criteria.where("name").is("双胎妊娠（双绒双羊）");
1321	1318	Criteria criteria2 = Criteria.where("name").is("双胎妊娠（单绒双羊）");
1322	1319	Criteria criteria3 = Criteria.where("name").is("双胎妊娠（单绒单羊）");
1323		- yn = Query.query(Criteria.where("yn").is(1).orOperator(criteria1, criteria2, criteria3));
	1320	+ Criteria criteria4 = Criteria.where("name").is("双胎妊娠");
	1321	+ //yn = Query.query(Criteria.where("yn").is(1).orOperator(criteria4));
	1322	+ yn = Query.query(Criteria.where("yn").is(1).orOperator(criteria1, criteria2, criteria3,criteria4));
1324	1323	}
1325		- }
	1324	+
1326	1325
1327	1326	List <BasicConfig> models = mongoTemplate.find(yn, BasicConfig.class);
1328	1327	List <String> rFactorList = new ArrayList <>();