shiyang / regional-platform

Authored by jiangjiazhi over 8 years ago

Showing 3 changed files with 15 additions and 6 deletions

...	...	@@ -30,6 +30,8 @@
30	30	private Date birth;
31	31	//申请孕周、申请月龄(多少天)
32	32	private Integer dueWeek;
	33	+ //末次月经
	34	+ private Date lastMenses;
33	35
34	36	//身份证号
35	37	private String cardNo;
...	...	@@ -77,6 +79,14 @@
77	79	private Integer type;
78	80
79	81	private Integer serviceType;
	82	+
	83	+ public Date getLastMenses() {
	84	+ return lastMenses;
	85	+ }
	86	+
	87	+ public void setLastMenses(Date lastMenses) {
	88	+ this.lastMenses = lastMenses;
	89	+ }
80	90
81	91	public String getRecDoctor() {
82	92	return recDoctor;

...	...	@@ -119,6 +119,7 @@
119	119	if(patients.getType()==1){
120	120	days = DateUtil.daysBetween(patients.getLastMenses(), new Date());
121	121	}
	122	+ referralApplyOrderModel.setLastMenses(patients.getLastMenses());
122	123	HighScoreResult highScoreResult = antenatalExaminationFacade.findLastRisk(patients.getPid(), true);
123	124	referralApplyOrderModel.setrRisk(highScoreResult.getHighId());
124	125	referralApplyOrderModel.setScore(highScoreResult.getScore());

...	...	@@ -326,25 +326,23 @@
326	326	setId(destModel.getId());
327	327	setName(destModel.getName());
328	328	setScore(destModel.getScore());
329		- if(null!=destModel.getDueDate()){
330		- int days= DateUtil.daysBetween(new Date(),destModel.getDueDate());
	329	+ if(null!=destModel.getDueWeek()){
331	330	if(-1==destModel.getDueWeek()){
332	331	setDueWeek("已分娩");
333	332	setIsGravida("0");
334	333	}else{
335		- setDueWeek(StringUtils.dueWeek(days));
	334	+ setDueWeek(StringUtils.dueWeek(destModel.getDueWeek()));
336	335	setIsGravida("1");
337	336	}
338		-
339	337	}
340	338
341	339	setPid(destModel.getPid());
342		- if(null!=destModel.getDueWeek()) {
	340	+ if(null!=destModel.getLastMenses()) {
343	341	if (-1 == destModel.getDueWeek()){
344	342	setcDueWeek("已分娩");
345	343	setIsGravida("0");
346	344	}else{
347		- setcDueWeek(com.lyms.platform.common.utils.StringUtils.dueWeek(destModel.getDueWeek()));
	345	+ setcDueWeek(com.lyms.platform.common.utils.StringUtils.dueWeek(DateUtil.daysBetween(destModel.getLastMenses(), new Date())));
348	346	setIsGravida("1");
349	347	}
350	348	}