jiangjiazhi / regional-platform

Authored by litao@lymsh.com over 7 years ago

Exists in master and in 6 other branches

Showing 6 changed files with 51 additions and 1 deletions

...	...	@@ -17,6 +17,16 @@
17	17	public class BabyModel extends BaseModel {
18	18
19	19	private static final long serialVersionUID = SerialIdEnum.BabyModel.getCid();
	20	+ // 母亲高危因素
	21	+ List<String> mHighRiskReason;
	22	+
	23	+ public List<String> getmHighRiskReason() {
	24	+ return mHighRiskReason;
	25	+ }
	26	+
	27	+ public void setmHighRiskReason(List<String> mHighRiskReason) {
	28	+ this.mHighRiskReason = mHighRiskReason;
	29	+ }
20	30
21	31	private String id;
22	32	//来源id

...	...	@@ -631,6 +631,7 @@
631	631	}
632	632
633	633	BabyModel model = getBabyModel(request,true);
	634	+ model.setmHighRiskReason(request.getmHighRiskReason());
634	635	model.setPid(babyPersonId);
635	636	model.setOperator(userId);
636	637	if (StringUtils.isNotEmpty(request.getMommyCertificateNum())) {
...	...	@@ -655,6 +656,8 @@
655	656	// String hospitalName = organizationService.getOrganization(Integer.valueOf(request.getHospitalId())).getName();
656	657	model = babyBookbuildingService.addBabyBookbuilding(model);
657	658
	659	+
	660	+
658	661	if (model == null \|\| model.getId() == null) {
659	662	br.setErrorcode(ErrorCodeConstants.SYSTEM_ERROR);
660	663	br.setErrormsg("保存失败");
...	...	@@ -1208,6 +1211,8 @@
1208	1211	*/
1209	1212	private BabyBuildResult getBabyBuildResult(BabyModel model) {
1210	1213	BabyBuildResult result = new BabyBuildResult();
	1214	+ result.setmHighRiskReason(model.getmHighRiskReason());
	1215	+
1211	1216	result.setId(model.getId());
1212	1217	result.setPid(model.getPid());
1213	1218	//母亲信息

...	...	@@ -2773,6 +2773,7 @@
2773	2773	BabyModel model = models.get(0);
2774	2774
2775	2775	result = result.convertToResult(model);
	2776	+ result.setmHighRiskReason(mongoUtil.findNameList(model.getmHighRiskReason()));
2776	2777
2777	2778	String homeAddress = CommonsHelper.getResidence(model.getProvinceId(), model.getCityId(),
2778	2779	model.getAreaId(), model.getStreetId(), model.getAddress(), basicConfigService);

...	...	@@ -14,6 +14,17 @@
14	14	public class BabyBookbuildingAddRequest {
15	15	/*********母亲基本信息*********/
16	16
	17	+ // 母亲高危因素
	18	+ List<String> mHighRiskReason;
	19	+
	20	+ public List<String> getmHighRiskReason() {
	21	+ return mHighRiskReason;
	22	+ }
	23	+
	24	+ public void setmHighRiskReason(List<String> mHighRiskReason) {
	25	+ this.mHighRiskReason = mHighRiskReason;
	26	+ }
	27	+
17	28	//建档Id
18	29	private String id;
19	30

...	...	@@ -7,6 +7,17 @@
7	7	* Created by lqy on 2016/6/17.
8	8	*/
9	9	public class BabyBuildResult {
	10	+ // 母亲高危因素
	11	+ List<String> mHighRiskReason;
	12	+
	13	+ public List<String> getmHighRiskReason() {
	14	+ return mHighRiskReason;
	15	+ }
	16	+
	17	+ public void setmHighRiskReason(List<String> mHighRiskReason) {
	18	+ this.mHighRiskReason = mHighRiskReason;
	19	+ }
	20	+
10	21	/*********母亲基本信息*********/
11	22
12	23	//建档Id

...	...	@@ -12,6 +12,7 @@
12	12	import com.lyms.platform.pojo.BabyModel;
13	13
14	14	import java.util.Date;
	15	+import java.util.List;
15	16	import java.util.Map;
16	17
17	18	/**
...	...	@@ -19,6 +20,17 @@
19	20	*/
20	21	public class BabyPageResult implements IBasicResultConvert<BabyPageResult,BabyModel> {
21	22
	23	+ // 母亲高危因素
	24	+ List<Map<String, Object>> mHighRiskReason;
	25	+
	26	+ public List<Map<String, Object>> getmHighRiskReason() {
	27	+ return mHighRiskReason;
	28	+ }
	29	+
	30	+ public void setmHighRiskReason(List<Map<String, Object>> mHighRiskReason) {
	31	+ this.mHighRiskReason = mHighRiskReason;
	32	+ }
	33	+
22	34	//建档Id
23	35	private String id;
24	36
...	...	@@ -497,7 +509,7 @@
497	509
498	510	@Override
499	511	public BabyPageResult convertToResult(BabyModel destModel) {
500		-
	512	+ List<String> list = destModel.getmHighRiskReason();
501	513	setId(destModel.getId());
502	514	setPid(destModel.getPid());
503	515	setBabyName(destModel.getName());