jiangjiazhi / regional-platform

Authored by wtt over 5 years ago

Exists in master and in 6 other branches

Showing 5 changed files with 9 additions and 30 deletions

...	...	@@ -32,8 +32,6 @@
32	32	private Date modified;
33	33	//医院ID
34	34	private String hospitalId;
35		- //证件号
36		- private String certNo;
37	35
38	36	/儿童信息/
39	37	/*
40	38
41	39
...	...	@@ -395,19 +393,11 @@
395	393	this.weight = weight;
396	394	}
397	395
398		- public String getCertNo() {
399		- return certNo;
400		- }
401	396
402		- public void setCertNo(String certNo) {
403		- this.certNo = certNo;
404		- }
405		-
406	397	public Map <String,String> convertToDataModel(){
407	398	Map<String,String> map = new HashMap <String,String>();
408	399	map.put("id",id);
409	400	map.put("babyId",babyId);
410		- map.put("certNo",certNo);
411	401	map.put("bhnum",bhnum);
412	402	map.put("matdeliverId",matdeliverId);
413	403	map.put("patientId",patientId);

...	...	@@ -271,7 +271,7 @@
271	271	babySieveQhdManager.setBabyId(babyModel.getId());
272	272	babySieveQhdManager.setPatientId(pat.getId());
273	273	babySieveQhdManager.setmName(pat.getUsername());
274		- babySieveQhdManager.setCardNo(pat.getCardNo());
	274	+ babySieveQhdManager.setIdcard(pat.getCardNo());
275	275	babySieveQhdManager.setPhone(pat.getPhone());
276	276	babySieveQhdManager.setBirthYMD(DateUtil.getYmd(babyModel.getBirth()));
277	277	babySieveQhdManager.setBabyName(babyModel.getName());

...	...	@@ -23,10 +23,9 @@
23	23	@NotEmpty(message = "儿童id不能为空")
24	24	private String babyId;
25	25
26		- //证件号
	26	+ //证件号 //母亲证件号码（身份证军官证士官证护照手机号其他）
27	27	@NotEmpty(message = "证件号不能为空")
28		- private String certNo;
29		-
	28	+ private String idcard;
30	29	//分娩id
31	30	private String matdeliverId;
32	31	//孕妇档案id
...	...	@@ -74,8 +73,6 @@
74	73	private String momName;
75	74	//住院号
76	75	private String zhuYuanNum;
77		- //母亲证件号码（身份证军官证士官证护照手机号其他）
78		- private String idcard;
79	76	//联系方式
80	77	private String phone;
81	78	//户口性质: 0 城市 1农村
82	79
...	...	@@ -314,14 +311,7 @@
314	311	this.bornTime = bornTime;
315	312	}
316	313
317		- public String getCertNo() {
318		- return certNo;
319		- }
320	314
321		- public void setCertNo(String certNo) {
322		- this.certNo = certNo;
323		- }
324		-
325	315	public String getYunZhou() {
326	316	return yunZhou;
327	317	}
...	...	@@ -436,7 +426,6 @@
436	426	BabySieveQhdModel babySieveQhdModel = new BabySieveQhdModel();
437	427	babySieveQhdModel.setId(id);
438	428	babySieveQhdModel.setBabyId(babyId);
439		- babySieveQhdModel.setCertNo(certNo);
440	429	babySieveQhdModel.setMatdeliverId(matdeliverId);
441	430	babySieveQhdModel.setPatientId(patientId);
442	431	babySieveQhdModel.setHospitalId(hospitalId);

...	...	@@ -22,7 +22,7 @@
22	22	//母亲姓名
23	23	private String mName;
24	24	//母亲身份证号（也是证件号）
25		- private String cardNo;
	25	+ private String idcard;
26	26	//分娩日期（也是出生日期）
27	27	private String birthYMD;
28	28	//娩出时间
29	29
...	...	@@ -122,12 +122,12 @@
122	122	this.matdeliverId = matdeliverId;
123	123	}
124	124
125		- public String getCardNo() {
126		- return cardNo;
	125	+ public String getIdcard() {
	126	+ return idcard;
127	127	}
128	128
129		- public void setCardNo(String cardNo) {
130		- this.cardNo = cardNo;
	129	+ public void setIdcard(String idcard) {
	130	+ this.idcard = idcard;
131	131	}
132	132
133	133	public String getPhone() {

...	...	@@ -112,7 +112,7 @@
112	112	Patients patients = patientsService.findOnePatientById(babyModel.getParentId());
113	113	if(patients != null){
114	114	babySieveQhdManager.setPatientId(patients.getId());//母亲ID
115		- babySieveQhdManager.setCardNo(patients.getCardNo());//母亲身份证号（也是证件号）
	115	+ babySieveQhdManager.setIdcard(patients.getCardNo());//母亲身份证号（也是证件号）
116	116	babySieveQhdManager.setPhone(patients.getPhone());
117	117
118	118	//母亲居住地址（详细地址）