fangcheng / regional-platform

Authored by jiangjiazhi over 8 years ago

Showing 2 changed files with 16 additions and 1 deletions

...	...	@@ -63,6 +63,18 @@
63	63	//转入医院
64	64	private String zhuanRname;
65	65
	66	+ //1 孕妇 0 产妇
	67	+ private String isGravida;
	68	+
	69	+
	70	+ public String getIsGravida() {
	71	+ return isGravida;
	72	+ }
	73	+
	74	+ public void setIsGravida(String isGravida) {
	75	+ this.isGravida = isGravida;
	76	+ }
	77	+
66	78	public String getcDueWeek() {
67	79	if(null==cDueWeek){
68	80	return SPIT;
69	81
...	...	@@ -318,8 +330,10 @@
318	330	int days= DateUtil.daysBetween(new Date(),destModel.getDueDate());
319	331	if(-1==destModel.getDueWeek()){
320	332	setDueWeek("已分娩");
	333	+ setIsGravida("0");
321	334	}else{
322	335	setDueWeek(StringUtils.dueWeek(days));
	336	+ setIsGravida("1");
323	337	}
324	338
325	339	}
326	340
...	...	@@ -328,8 +342,10 @@
328	342	if(null!=destModel.getDueWeek()) {
329	343	if (-1 == destModel.getDueWeek()){
330	344	setcDueWeek("已分娩");
	345	+ setIsGravida("0");
331	346	}else{
332	347	setcDueWeek(com.lyms.platform.common.utils.StringUtils.dueWeek(destModel.getDueWeek()));
	348	+ setIsGravida("1");
333	349	}
334	350	}
335	351	if(null!=destModel.getReceived()){

...	...	@@ -127,7 +127,6 @@
127	127	setName(patients.getUsername());
128	128	setPhone(patients.getPhone());
129	129	setRemarks(patients.getMremark());
130		- setRiskScore("60");
131	130
132	131	if (null!=patients.getDueStatus() && 1 == patients.getDueStatus()) {
133	132	this.dueWeek = "终止妊娠";