jiangjiazhi / regional-platform

Authored by jiangjiazhi over 9 years ago

Exists in master and in 8 other branches

Showing 5 changed files with 51 additions and 4 deletions

...	...	@@ -24,10 +24,11 @@
24	24
25	25	//儿保检查时间
26	26	private Date checkDate;
	27	+ //月龄下拉框
	28	+ private String ylSelect;
27	29
28	30
29	31
30		-
31	32	/****问诊情况**/
32	33
33	34	//主要抚养人
...	...	@@ -250,6 +251,14 @@
250	251
251	252	public void setCreated(Date created) {
252	253	this.created = created;
	254	+ }
	255	+
	256	+ public String getYlSelect() {
	257	+ return ylSelect;
	258	+ }
	259	+
	260	+ public void setYlSelect(String ylSelect) {
	261	+ this.ylSelect = ylSelect;
253	262	}
254	263
255	264	/****诊断指导**/

...	...	@@ -80,7 +80,7 @@
80	80	model.setYn(YnEnums.YES.getId());
81	81	model.setBuildId(request.getBuildId());
82	82
83		-
	83	+ model.setYlSelect(request.getYlSelect());
84	84	model.setMainFoster(request.getMainFoster());
85	85	model.setFeedType(request.getFeedType());
86	86	model.setPee(request.getPee());
...	...	@@ -256,6 +256,7 @@
256	256	base.setId(id);
257	257	base.setSex(model.getSex());
258	258	base.setName(model.getName());
	259	+
259	260	base.setMonthAge(DateUtil.getBabyMonthAge(model.getBirth(), new Date()));
260	261	base.setBirthday(DateUtil.getyyyy_MM_dd(model.getBirth()));
261	262	if (model.getDiagnose() != null)
...	...	@@ -295,7 +296,8 @@
295	296	Patients patients = null;
296	297	if (CollectionUtils.isNotEmpty(list)) {
297	298	patients = list.get(0);
298		-
	299	+ base.setCardNo(patients.getCardNo());
	300	+ base.setVcCardNo(patients.getVcCardNo());
299	301	AntExChuQuery antExChuQuery=new AntExChuQuery();
300	302	antExChuQuery.setParentId(patients.getId());
301	303	antExChuQuery.setYn(YnEnums.YES.getId());
...	...	@@ -429,7 +431,7 @@
429	431	model.setId(checkModel.getId());
430	432
431	433	model.setBuildId(checkModel.getBuildId());
432		-
	434	+ model.setYlSelect(checkModel.getYlSelect());
433	435	model.setMainFoster(checkModel.getMainFoster());
434	436	model.setFeedType(checkModel.getFeedType());
435	437	model.setPee(checkModel.getPee());

...	...	@@ -75,8 +75,16 @@
75	75
76	76	//身长别体重
77	77	private String heightWeight;
	78	+ //月龄下拉框
	79	+ private String ylSelect;
78	80
	81	+ public String getYlSelect() {
	82	+ return ylSelect;
	83	+ }
79	84
	85	+ public void setYlSelect(String ylSelect) {
	86	+ this.ylSelect = ylSelect;
	87	+ }
80	88
81	89	//发育评价
82	90	private String growthEvaluate;

...	...	@@ -28,6 +28,26 @@
28	28	private String mremark;
29	29	//性别
30	30	private Integer sex;
	31	+ //母亲的就诊卡号
	32	+ private String vcCardNo;
	33	+ //母亲身份证号
	34	+ private String cardNo;
	35	+
	36	+ public String getCardNo() {
	37	+ return cardNo;
	38	+ }
	39	+
	40	+ public void setCardNo(String cardNo) {
	41	+ this.cardNo = cardNo;
	42	+ }
	43	+
	44	+ public String getVcCardNo() {
	45	+ return vcCardNo;
	46	+ }
	47	+
	48	+ public void setVcCardNo(String vcCardNo) {
	49	+ this.vcCardNo = vcCardNo;
	50	+ }
31	51
32	52	public String getId() {
33	53	return id;

...	...	@@ -46,7 +46,15 @@
46	46
47	47	//药物过敏史
48	48	private Map drugGllergic;
	49	+ private String ylSelect;
49	50
	51	+ public String getYlSelect() {
	52	+ return ylSelect;
	53	+ }
	54	+
	55	+ public void setYlSelect(String ylSelect) {
	56	+ this.ylSelect = ylSelect;
	57	+ }
50	58
51	59	/****问诊情况**/
52	60