jiangjiazhi / regional-platform

Authored by yangfei over 7 years ago

Exists in master and in 6 other branches

Showing 3 changed files with 34 additions and 1 deletions

...	...	@@ -13,7 +13,8 @@
13	13	public class PatientSerEnums {
14	14	//服务类型(1-高危精准指导、2-体重、3-血糖、4-血压、5-专家咨询)
15	15	public enum SerTypeEnums{
16		- gwjzzd(1,"高危精准指导"),
	16	+ bzfw(6, "标准服务"),
	17	+ gwjzzd(1,"孕期精准医疗"),
17	18	tz(2,"体重管理"),
18	19	xt(3, "血糖管理"),
19	20	xy(4, "血压管理"),

...	...	@@ -156,10 +156,16 @@
156	156	ps.setSerType(Integer.parseInt(psType));
157	157	//默认已经领取
158	158	ps.setStatus(2);
	159	+ //默认待同步
	160	+ ps.setSynStatus(1);
159	161	//领取时间
160	162	ps.setReceiveDate(new Date());
161	163	//领取操作医生id
162	164	ps.setReceiveUser(String.valueOf(id));
	165	+ //服务开通操作时间
	166	+ ps.setUpdateDate(new Date());
	167	+ //服务开通操作人
	168	+ ps.setUpdateUser(String.valueOf(id));
163	169	patientServiceService.addPatientService(ps);
164	170
165	171	operateLogFacade.addAddOptLog(id, Integer.valueOf(hospitalId), ps, OptActionEnums.ADD.getId(), "开通增值服务");
...	...	@@ -192,6 +198,8 @@
192	198	//根据用户id获取医院ID
193	199	ps.setUpdateDate(new Date());
194	200	ps.setUpdateUser(String.valueOf(id));
	201	+ //待同步
	202	+ ps.setSynStatus(1);
195	203
196	204	PatientService before = patientServiceService.getPatientService(ps.getId());
197	205

...	...	@@ -65,6 +65,14 @@
65	65	*/
66	66	private String updateDate;
67	67	/**
	68	+ * 修改人
	69	+ */
	70	+ private String updateUser;
	71	+ /**
	72	+ * 开通医院
	73	+ */
	74	+ private String hospitalName;
	75	+ /**
68	76	* 开通医生名称
69	77	*/
70	78	private String createUserStr;
...	...	@@ -91,6 +99,22 @@
91	99	* 退款人
92	100	*/
93	101	private String backUser;
	102	+
	103	+ public String getHospitalName() {
	104	+ return hospitalName;
	105	+ }
	106	+
	107	+ public void setHospitalName(String hospitalName) {
	108	+ this.hospitalName = hospitalName;
	109	+ }
	110	+
	111	+ public String getUpdateUser() {
	112	+ return updateUser;
	113	+ }
	114	+
	115	+ public void setUpdateUser(String updateUser) {
	116	+ this.updateUser = updateUser;
	117	+ }
94	118
95	119	public List<Map> getrLevel() {
96	120	return rLevel;