jiangjiazhi / regional-platform

Authored by jiangjiazhi almost 9 years ago

Exists in master and in 8 other branches

Showing 4 changed files with 30 additions and 4 deletions

...	...	@@ -45,7 +45,8 @@
45	45	private String transferredHospital;
46	46	//转出医院id
47	47	private String outHospitalId;
48		-
	48	+ //体验会员 0非会员 1会员
	49	+ private Integer expVip;
49	50	//转入科室
50	51	private String transferredDepartment;
51	52	//病情描述
...	...	@@ -66,6 +67,14 @@
66	67	private Integer status;
67	68	//转诊类型 1 儿童 2 孕妇
68	69	private Integer type;
	70	+
	71	+ public Integer getExpVip() {
	72	+ return expVip;
	73	+ }
	74	+
	75	+ public void setExpVip(Integer expVip) {
	76	+ this.expVip = expVip;
	77	+ }
69	78
70	79	public String getDueWeek() {
71	80	return dueWeek;

...	...	@@ -49,7 +49,18 @@
49	49	private String outHospitalId;
50	50	private String phone;
51	51	private Integer type;
	52	+ //体验会员 0非会员 1会员
	53	+ private Integer expVip;
52	54
	55	+
	56	+ public Integer getExpVip() {
	57	+ return expVip;
	58	+ }
	59	+
	60	+ public void setExpVip(Integer expVip) {
	61	+ this.expVip = expVip;
	62	+ }
	63	+
53	64	public String getmCardNo() {
54	65	return mCardNo;
55	66	}
...	...	@@ -139,6 +150,9 @@
139	150	}
140	151	if(null!=age){
141	152	condition=condition.and("age",age, MongoOper.IS);
	153	+ }
	154	+ if(null!=expVip){
	155	+ condition=condition.and("expVip",expVip, MongoOper.IS);
142	156	}
143	157	if(null!=transferredHospital){
144	158	condition=condition.and("transferredHospital",transferredHospital, MongoOper.IS);

...	...	@@ -96,6 +96,7 @@
96	96	referralApplyOrderModel.setPhone(patients.getPhone());
97	97	referralApplyOrderModel.setSex(SexEnum.WOMAN.getId());
98	98	referralApplyOrderModel.setBirth(patients.getBirth());
	99	+ referralApplyOrderModel.setExpVip(patients.getExpVip());
99	100	int days= DateUtil.daysBetween(new Date(),patients.getDueDate());;
100	101	referralApplyOrderModel.setDueWeek(com.lyms.platform.common.utils.StringUtils.dueWeek(days));
101	102	}
...	...	@@ -116,6 +117,7 @@
116	117	referralApplyOrderModel.setPhone(patients.getPhone());
117	118	referralApplyOrderModel.setSex(babyModel.getSex());
118	119	referralApplyOrderModel.setCardNo(patients.getCardNo());
	120	+ referralApplyOrderModel.setExpVip(babyModel.getExpVip());
119	121	}
120	122	}
121	123
...	...	@@ -264,6 +266,7 @@
264	266	referralApplyOrderQuery.setOutHospitalId(data.get(0) + "");
265	267	}
266	268	}
	269	+ referralApplyOrderQuery.setExpVip(applyOrderQueryRequest.getTyVip());
267	270
268	271	List<ReferralApplyOrderModel> orderModels = applyOrderService.queryReferralApplyOrderWithQuery(referralApplyOrderQuery);
269	272	if (CollectionUtils.isNotEmpty(orderModels)) {

...	...	@@ -33,7 +33,7 @@
33	33	//转出日期
34	34	private String transferred;
35	35	//体验会员
36		- private String tyVip;
	36	+ private Integer tyVip;
37	37	// //1 转入 0转出
38	38	private String action;
39	39
40	40
...	...	@@ -125,11 +125,11 @@
125	125	this.transferred = transferred;
126	126	}
127	127
128		- public String getTyVip() {
	128	+ public Integer getTyVip() {
129	129	return tyVip;
130	130	}
131	131
132		- public void setTyVip(String tyVip) {
	132	+ public void setTyVip(Integer tyVip) {
133	133	this.tyVip = tyVip;
134	134	}
135	135