jiangjiazhi / regional-platform

Authored by liquanyu over 2 years ago

Exists in master and in 6 other branches

Showing 2 changed files with 31 additions and 1 deletions

...	...	@@ -227,7 +227,27 @@
227	227	* @return
228	228	*/
229	229	public BaseObjectResponse addPregnantBookbuilding(
230		- YunBookbuildingAddRequest yunRequest, final Integer userId, boolean isSync) {
	230	+ YunBookbuildingAddRequest yunRequest, Integer uId, boolean isSync) {
	231	+
	232	+ if (StringUtils.isNotEmpty(yunRequest.getOrgName()))
	233	+ {
	234	+ OrganizationQuery organizationQuery = new OrganizationQuery();
	235	+ organizationQuery.setYn(YnEnums.YES.getId());
	236	+ organizationQuery.setName(yunRequest.getOrgName());
	237	+ List<Organization> organizations = organizationService.queryOrganization(organizationQuery);
	238	+ if (CollectionUtils.isNotEmpty(organizations))
	239	+ {
	240	+ yunRequest.setHospitalId(String.valueOf(organizations.get(0).getId()));
	241	+ UsersQuery usersQuery = new UsersQuery();
	242	+ usersQuery.setOrgId(organizations.get(0).getId());
	243	+ List<Users> users = usersService.queryUsers(usersQuery);
	244	+ if (CollectionUtils.isNotEmpty(users))
	245	+ {
	246	+ uId = users.get(0).getId();
	247	+ }
	248	+ }
	249	+ }
	250	+ final Integer userId = uId;
231	251
232	252	BaseObjectResponse br = new BaseObjectResponse();
233	253	PatientsQuery patientsQuery = new PatientsQuery();

...	...	@@ -76,6 +76,16 @@
76	76	//秦皇岛-有居住证填写字段
77	77	private String liveCardNo;
78	78
	79	+ //归属卫生院名称
	80	+ private String orgName;
	81	+
	82	+ public String getOrgName() {
	83	+ return orgName;
	84	+ }
	85	+
	86	+ public void setOrgName(String orgName) {
	87	+ this.orgName = orgName;
	88	+ }
79	89
80	90	public String getLiveCardNo() {
81	91	return liveCardNo;