shiyang / regional-platform

Authored by jiangjiazhi over 8 years ago

Exists in master

Showing 2 changed files with 5 additions and 3 deletions

...	...	@@ -1050,6 +1050,7 @@
1050	1050	organization = organizationService.getOrganization(Integer.valueOf(patients.getHospitalId()));
1051	1051	}
1052	1052	pid = patients.getPid();
	1053	+ //当主档案的医院不在group组里需要显示本来的隐藏档案
1053	1054	if(!"2".equals(patients.getEnable())){
1054	1055	listData.add(new AntData(patients, null != organization ? organization.getName() : ""));
1055	1056	}

...	...	@@ -78,6 +78,7 @@
78	78	@Autowired
79	79	private BasicConfigService basicConfigService;
80	80
	81	+
81	82	private static Map<Integer, String> ONE_ENUMS = new HashMap<>();
82	83
83	84	private static Map<String, List> babyMap = new HashMap<>();
84	85
...	...	@@ -131,14 +132,14 @@
131	132	String hospitalId = autoMatchFacade.getHospitalId(userId);
132	133	MaternalDeliverModel maternalDeliverModel = deliverAddRequest.convertToDataModel();
133	134
134		- Organization og = organizationService.getOrganization(Integer.valueOf(hospitalId));
135		- //区域模式
136		- if (og.getbStatus()!=1) {
	135	+ //表示区域的
	136	+ if (StringUtils.isNotEmpty(organizationGroupsFacade.findByCurrentUserId(hospitalId))) {
137	137	String parentId =antenatalExaminationFacade.handHideBuild(deliverAddRequest.getPid(), deliverAddRequest.getParentId(), userId);
138	138	if (StringUtils.isEmpty(parentId)) {
139	139	logger.warn("get handHideBuild parentId is null.");
140	140	}
141	141	maternalDeliverModel.setParentId(parentId);
	142	+ deliverAddRequest.setParentId(parentId);
142	143	}
143	144
144	145	//增加