jiangjiazhi / regional-platform

Authored by jiangjiazhi about 9 years ago

Exists in master and in 8 other branches

Showing 4 changed files with 32 additions and 1 deletions

...	...	@@ -16,6 +16,8 @@
16	16	private String id;
17	17	//患者id
18	18	private String parentId;
	19	+
	20	+ private String pid;
19	21	//患者名字
20	22	private String name;
21	23	private String mname;
...	...	@@ -69,6 +71,14 @@
69	71	private Integer status;
70	72	//转诊类型 1 儿童 2 孕妇
71	73	private Integer type;
	74	+
	75	+ public String getPid() {
	76	+ return pid;
	77	+ }
	78	+
	79	+ public void setPid(String pid) {
	80	+ this.pid = pid;
	81	+ }
72	82
73	83	public Date getModified() {
74	84	return modified;

...	...	@@ -99,6 +99,7 @@
99	99	referralApplyOrderModel.setBirth(patients.getBirth());
100	100	referralApplyOrderModel.setExpVip(patients.getExpVip());
101	101	int days= DateUtil.daysBetween(new Date(),patients.getDueDate());;
	102	+ referralApplyOrderModel.setPid(patients.getPid());
102	103	referralApplyOrderModel.setDueWeek(com.lyms.platform.common.utils.StringUtils.dueWeek(days));
103	104	}
104	105	} else {
...	...	@@ -119,6 +120,7 @@
119	120	referralApplyOrderModel.setSex(babyModel.getSex());
120	121	referralApplyOrderModel.setCardNo(patients.getCardNo());
121	122	referralApplyOrderModel.setExpVip(babyModel.getExpVip());
	123	+ referralApplyOrderModel.setPid(babyModel.getPid());
122	124	}
123	125	}
124	126

...	...	@@ -16,6 +16,7 @@
16	16	public class BabyApplyOrderResult {
17	17	public static final String SPIT="-";
18	18	private String id;
	19	+ private String pid;
19	20	//名字
20	21	private String name;
21	22	//高危转诊
...	...	@@ -54,6 +55,14 @@
54	55	private String zhuanRname;
55	56	private String status;
56	57
	58	+ public String getPid() {
	59	+ return pid;
	60	+ }
	61	+
	62	+ public void setPid(String pid) {
	63	+ this.pid = pid;
	64	+ }
	65	+
57	66	public String getCyl() {
58	67	return cyl;
59	68	}
...	...	@@ -95,6 +104,7 @@
95	104	}
96	105
97	106	public BabyApplyOrderResult convert(ReferralApplyOrderModel referralApplyOrderModel, String zhuanCName,String zhuanRname) {
	107	+ setPid(referralApplyOrderModel.getPid());
98	108	setZhuanRname(zhuanRname);
99	109	setZhuanCName(zhuanCName);
100	110	setId(referralApplyOrderModel.getId());

...	...	@@ -26,6 +26,7 @@
26	26	//末次月经
27	27	private String lastMenses;
28	28	private String id;
	29	+ private String pid;
29	30	//患者id
30	31	private String parentId;
31	32	//患者名字
...	...	@@ -66,6 +67,14 @@
66	67	//转入医院
67	68	private String zhuanRname;
68	69
	70	+ public String getPid() {
	71	+ return pid;
	72	+ }
	73	+
	74	+ public void setPid(String pid) {
	75	+ this.pid = pid;
	76	+ }
	77	+
69	78	public String getZhuanCName() {
70	79	return zhuanCName;
71	80	}
...	...	@@ -235,7 +244,7 @@
235	244	int days= DateUtil.daysBetween(new Date(),destModel.getDueDate());
236	245	this.dueWeek=StringUtils.dueWeek(days);
237	246	}
238		-
	247	+ setPid(destModel.getPid());
239	248	setCardNo(destModel.getCardNo());
240	249	setDueDate(DateUtil.getyyyy_MM_dd(destModel.getDueDate()));
241	250	setrLevel(destModel.getrLevel());