jiangjiazhi / regional-platform

Authored by jiangjiazhi over 8 years ago

Exists in master and in 8 other branches

Showing 4 changed files with 20 additions and 7 deletions

...	...	@@ -213,7 +213,8 @@
213	213	sieveModel.setPhone(patients.getPhone());
214	214	sieveModel.setName(patients.getUsername());
215	215	sieveModel.setLastMenses(patients.getLastMenses());
216		- sieveModel.setDueWeek(com.lyms.platform.common.utils.StringUtils.dueWeek(days));
	216	+ sieveModel.setCardNo(patients.getCardNo());
	217	+ sieveModel.setDueWeek(days);
217	218	sieveDao.updateChanQianSieve(sieveModel);
218	219	}
219	220	}
...	...	@@ -244,6 +245,7 @@
244	245	sieveModel.setHospitalId(patients.getHospitalId());
245	246	sieveModel.setName(patients.getUsername());
246	247	sieveModel.setPhone(patients.getPhone());
	248	+ sieveModel.setCardNo(patients.getCardNo());
247	249	sieveModel.setStatus(SieveStatusEnums.O.getId());
248	250	sieveModel.setCqStatus(0);
249	251	sieveModel.setYn(YnEnums.YES.getId());

...	...	@@ -26,10 +26,12 @@
26	26	private Integer tireNumber;
27	27	//整体风险
28	28	private Integer ztfx;
	29	+ private String cardNo;
	30	+
29	31	//联系方式
30	32	private String phone;
31		- //申请孕周
32		- private String dueWeek;
	33	+ //申请孕周(怀孕的天数)
	34	+ private int dueWeek;
33	35	//产前诊断 1 已检查 0 未检查
34	36	private Integer cqStatus;
35	37	//产前诊断结果
...	...	@@ -52,6 +54,15 @@
52	54	private Date modified;
53	55	private Integer yn;
54	56
	57	+
	58	+ public String getCardNo() {
	59	+ return cardNo;
	60	+ }
	61	+
	62	+ public void setCardNo(String cardNo) {
	63	+ this.cardNo = cardNo;
	64	+ }
	65	+
55	66	public String getFrom() {
56	67	return from;
57	68	}
58	69
...	...	@@ -132,11 +143,11 @@
132	143	this.diaUnit = diaUnit;
133	144	}
134	145
135		- public String getDueWeek() {
	146	+ public int getDueWeek() {
136	147	return dueWeek;
137	148	}
138	149
139		- public void setDueWeek(String dueWeek) {
	150	+ public void setDueWeek(int dueWeek) {
140	151	this.dueWeek = dueWeek;
141	152	}
142	153

...	...	@@ -246,7 +246,7 @@
246	246	SieveModel sieveModel = sieveModels.get(0);
247	247	sieveModel.setStatus(2);
248	248	int days = DateUtil.daysBetween(sieveModel.getLastMenses(), new Date());
249		- sieveModel.setDueWeek(com.lyms.platform.common.utils.StringUtils.dueWeek(days));
	249	+ sieveModel.setDueWeek(days);
250	250	sieveService.updateOneChanQianDiaSieve(sieveModel);
251	251	}
252	252	}

...	...	@@ -179,7 +179,7 @@
179	179	if(null!=destModel.getTireNumber()){
180	180	setTireNumber(TaiShuEnums.getTitle(destModel.getTireNumber() + ""));
181	181	}
182		- setDueWeek(destModel.getDueWeek());
	182	+ setDueWeek(StringUtils.dueWeek(destModel.getDueWeek()));
183	183	if(null!=destModel.getZtfx()) {
184	184	setZtfx(destModel.getZtfx()+"");
185	185	setZtfxText(SieveEnums.getTitle(destModel.getZtfx()));