jiangjiazhi / regional-platform

Authored by liquanyu over 9 years ago

Exists in master and in 8 other branches

Showing 4 changed files with 47 additions and 0 deletions

...	...	@@ -686,6 +686,18 @@
686	686	result = getBabyBuildResult(model);
687	687
688	688	}
	689	+
	690	+ if (result != null && StringUtils.isNotEmpty(result.getBuildDoctor()))
	691	+ {
	692	+ Organization org = organizationService.getOrganization(Integer.parseInt(result.getBuildDoctor()));
	693	+ if (org != null)
	694	+ {
	695	+ Map<String,String> doctorObj = new HashMap<>();
	696	+ doctorObj.put("id",result.getBuildDoctor());
	697	+ doctorObj.put("name",org.getName());
	698	+ result.setBuildDoctorObj(doctorObj);
	699	+ }
	700	+ }
689	701	BaseObjectResponse objectResponse = new BaseObjectResponse();
690	702	objectResponse.setData(result);
691	703	objectResponse.setErrorcode(ErrorCodeConstants.SUCCESS);

...	...	@@ -12,7 +12,9 @@
12	12	import com.lyms.platform.common.utils.SystemConfig;
13	13	import com.lyms.platform.operate.web.request.BabyCheckRequest;
14	14	import com.lyms.platform.operate.web.result.*;
	15	+import com.lyms.platform.permission.model.Organization;
15	16	import com.lyms.platform.permission.model.Users;
	17	+import com.lyms.platform.permission.service.OrganizationService;
16	18	import com.lyms.platform.permission.service.UsersService;
17	19	import com.lyms.platform.pojo.*;
18	20	import com.lyms.platform.query.*;
...	...	@@ -50,6 +52,9 @@
50	52
51	53
52	54	@Autowired
	55	+ private OrganizationService organizationService;
	56	+
	57	+ @Autowired
53	58	private AntenatalExaminationFacade antenatalExaminationFacade;
54	59	/**
55	60	* 更新检查
...	...	@@ -544,6 +549,17 @@
544	549	BabyCheckModel checkModel = checkModels.get(0);
545	550	result = getBabyCheckResult(checkModel);
546	551
	552	+ }
	553	+ if (result != null && StringUtils.isNotEmpty(result.getCheckDoctor()))
	554	+ {
	555	+ Organization org = organizationService.getOrganization(Integer.parseInt(result.getCheckDoctor()));
	556	+ if (org != null)
	557	+ {
	558	+ Map<String,String> doctorObj = new HashMap<>();
	559	+ doctorObj.put("id",result.getCheckDoctor());
	560	+ doctorObj.put("name",org.getName());
	561	+ result.setCheckDoctorObj(doctorObj);
	562	+ }
547	563	}
548	564	}
549	565

...	...	@@ -130,6 +130,16 @@
130	130	//体验类型
131	131	private Integer expType;
132	132
	133	+ private Map<String,String> buildDoctorObj;
	134	+
	135	+ public Map<String, String> getBuildDoctorObj() {
	136	+ return buildDoctorObj;
	137	+ }
	138	+
	139	+ public void setBuildDoctorObj(Map<String, String> buildDoctorObj) {
	140	+ this.buildDoctorObj = buildDoctorObj;
	141	+ }
	142	+
133	143	public Integer getExpType() {
134	144	return expType;
135	145	}

...	...	@@ -209,6 +209,15 @@
209	209	private String checkDate;
210	210	private String monthAge;
211	211
	212	+ private Map<String,String> checkDoctorObj;
	213	+
	214	+ public Map<String, String> getCheckDoctorObj() {
	215	+ return checkDoctorObj;
	216	+ }
	217	+
	218	+ public void setCheckDoctorObj(Map<String, String> checkDoctorObj) {
	219	+ this.checkDoctorObj = checkDoctorObj;
	220	+ }
212	221
213	222	public String getMonthAge() {
214	223	return monthAge;