jiangjiazhi / regional-platform

Commit a6aaea45b82902366977665be2f346b05b9c25c4

Authored by liquanyu about 3 years ago

Exists in master and in 6 other branches

两癌

Showing 5 changed files with 286 additions and 290 deletions

platform-dal/src/main/java/com/lyms/platform/pojo/PatientRegistrationModel.java
platform-dal/src/main/java/com/lyms/platform/query/PatientRegistrationModelQuery.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientRegistrationFacade.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/PatientRegistrationRequest.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/PatientRegistrationResult.java

...	...	@@ -27,27 +27,31 @@
27	27	private String phone;
28	28	//身份证号码
29	29	private String cardno;
30		- //是否在我院建档 1是 2 不是
	30	+ //是否同意 1是 2 不是
31	31	private String type;
32		- //末次月经
33		- private Date lastMenses;
	32	+ //1、LDRP(家庭化产房) 2 普通房间（产前）+单人分娩产房+单间（产后） 3 普通房间（产前+产后）
	33	+ private Integer bedType;
	34	+ //预约时间
	35	+ private Date orderDate;
34	36
35		- public String getId() {
36		- return id;
37		- }
38	37
39		- public void setId(String id) {
40		- this.id = id;
41		- }
42	38
43		- public Integer getYn() {
44		- return yn;
45		- }
	39	+ public String getId() {
	40	+ return id;
	41	+ }
46	42
47		- public void setYn(Integer yn) {
48		- this.yn = yn;
49		- }
	43	+ public void setId(String id) {
	44	+ this.id = id;
	45	+ }
50	46
	47	+ public Integer getYn() {
	48	+ return yn;
	49	+ }
	50	+
	51	+ public void setYn(Integer yn) {
	52	+ this.yn = yn;
	53	+ }
	54	+
51	55	public Date getCreateDate() {
52	56	return createDate;
53	57	}
...	...	@@ -88,10 +92,6 @@
88	92	this.phone = phone;
89	93	}
90	94
91		- public String getType() {
92		- return type;
93		- }
94		-
95	95	public String getCardno() {
96	96	return cardno;
97	97	}
98	98
99	99
...	...	@@ -100,16 +100,28 @@
100	100	this.cardno = cardno;
101	101	}
102	102
	103	+ public String getType() {
	104	+ return type;
	105	+ }
	106	+
103	107	public void setType(String type) {
104	108	this.type = type;
105	109	}
106	110
107		- public Date getLastMenses() {
108		- return lastMenses;
	111	+ public Integer getBedType() {
	112	+ return bedType;
109	113	}
110	114
111		- public void setLastMenses(Date lastMenses) {
112		- this.lastMenses = lastMenses;
	115	+ public void setBedType(Integer bedType) {
	116	+ this.bedType = bedType;
	117	+ }
	118	+
	119	+ public Date getOrderDate() {
	120	+ return orderDate;
	121	+ }
	122	+
	123	+ public void setOrderDate(Date orderDate) {
	124	+ this.orderDate = orderDate;
113	125	}
114	126	}

...	...	@@ -19,8 +19,6 @@
19	19
20	20	private String id;
21	21	private Integer yn;
22		- @FormParam
23		- @NotEmpty(message = "医院ID不能为空")
24	22	private String hospitalId;
25	23	//姓名
26	24	private String name;
27	25
28	26
29	27
30	28
31	29
32	30
33	31
34	32
35	33
36	34
...	...	@@ -28,42 +26,106 @@
28	26	private String phone;
29	27	//身份证号码
30	28	private String cardno;
31		- //是否在我院建档 1是 2 不是
	29	+ //是否同意 1是 2 不是
32	30	private String type;
	31	+ //1、LDRP(家庭化产房) 2 普通房间（产前）+单人分娩产房+单间（产后） 3 普通房间（产前+产后）
	32	+ private Integer bedType;
33	33
	34	+ //查询号
34	35	private String queryNo;
35		- //末次月经
36		- private Date lastMensesStart;
37		- private Date lastMensesEnd;
	36	+ //预约时间
	37	+ private Date orderDateStart;
	38	+ private Date orderDateEnd;
38	39
39	40	//登记时间
40	41	private Date createDateStart;
41	42	private Date createDateEnd;
42	43
43		- private String sort;
44	44
45		- public String getQueryNo() {
46		- return queryNo;
47		- }
	45	+ @Override
	46	+ public MongoQuery convertToQuery() {
	47	+ MongoCondition condition = MongoCondition.newInstance();
48	48
49		- public void setQueryNo(String queryNo) {
50		- this.queryNo = queryNo;
51		- }
	49	+ if (StringUtils.isNotEmpty(name)) {
52	50
53		- public Date getCreateDateStart() {
54		- return createDateStart;
55		- }
	51	+ condition = condition.and("name", name, MongoOper.IS);
	52	+ }
	53	+ // 就诊卡号
	54	+ if (StringUtils.isNotEmpty(phone)) {
56	55
57		- public void setCreateDateStart(Date createDateStart) {
58		- this.createDateStart = createDateStart;
	56	+ condition = condition.and("phone", phone, MongoOper.IS);
	57	+ }
	58	+ // 身份证
	59	+ if (StringUtils.isNotEmpty(cardno)) {
	60	+
	61	+ condition = condition.and("cardno", cardno, MongoOper.IS);
	62	+ }
	63	+ //是否同意
	64	+ if (StringUtils.isNotEmpty(type)) {
	65	+
	66	+ condition = condition.and("type", type, MongoOper.IS);
	67	+ }
	68	+ if (bedType != null) {
	69	+ condition = condition.and("bedType", bedType, MongoOper.IS);
	70	+ }
	71	+ Criteria c = null;
	72	+ // 预约时间
	73	+ if (null != orderDateStart) {
	74	+ if (null != c) {
	75	+ c = c.and("orderDate").gte(orderDateStart);
	76	+ } else {
	77	+ c = Criteria.where("orderDate").gte(orderDateStart);
	78	+ }
	79	+ }
	80	+ if (null != orderDateEnd) {
	81	+ if (null != c) {
	82	+ c = c.lte(orderDateEnd);
	83	+ } else {
	84	+ c = Criteria.where("orderDate").lte(orderDateEnd);
	85	+ }
	86	+ }
	87	+ // 登记时间
	88	+ if (null != createDateStart) {
	89	+ if (null != c) {
	90	+ c = c.and("createDate").gte(createDateStart);
	91	+ } else {
	92	+ c = Criteria.where("createDate").gte(createDateStart);
	93	+ }
	94	+ }
	95	+ if (null != createDateEnd) {
	96	+ if (null != c) {
	97	+ c = c.lte(createDateEnd);
	98	+ } else {
	99	+ c = Criteria.where("createDate").lte(createDateEnd);
	100	+ }
	101	+ }
	102	+ // 查询号
	103	+ if (StringUtils.isNotEmpty(queryNo)) {
	104	+ MongoCondition c1 = MongoCondition.newInstance();
	105	+ MongoCondition con1 = MongoCondition.newInstance("name", queryNo, MongoOper.LIKE);
	106	+ MongoCondition con2 = MongoCondition.newInstance("phone", queryNo, MongoOper.IS);
	107	+ MongoCondition con3 = MongoCondition.newInstance("cardno", queryNo, MongoOper.IS);
	108	+ if (c != null) {
	109	+ c1.orCondition(new MongoCondition[]{con1, con2, con3}).getCriteria();
	110	+ condition.andCondition(c1);
	111	+ } else {
	112	+ c = c1.orCondition(new MongoCondition[]{con1, con2,con3}).getCriteria();
	113	+ }
	114	+ }
	115	+ if (c != null) {
	116	+ return new MongoCondition(c.andOperator(condition.getCriteria())).toMongoQuery();
	117	+ }
	118	+
	119	+ return condition.toMongoQuery();
59	120	}
60	121
61		- public Date getCreateDateEnd() {
62		- return createDateEnd;
	122	+
	123	+ public Integer getBedType() {
	124	+ return bedType;
63	125	}
64	126
65		- public void setCreateDateEnd(Date createDateEnd) {
66		- this.createDateEnd = createDateEnd;
	127	+ public void setBedType(Integer bedType) {
	128	+ this.bedType = bedType;
67	129	}
68	130
69	131	public String getId() {
...	...	@@ -74,14 +136,6 @@
74	136	this.id = id;
75	137	}
76	138
77		- public String getCardno() {
78		- return cardno;
79		- }
80		-
81		- public void setCardno(String cardno) {
82		- this.cardno = cardno;
83		- }
84		-
85	139	public Integer getYn() {
86	140	return yn;
87	141	}
...	...	@@ -114,6 +168,14 @@
114	168	this.phone = phone;
115	169	}
116	170
	171	+ public String getCardno() {
	172	+ return cardno;
	173	+ }
	174	+
	175	+ public void setCardno(String cardno) {
	176	+ this.cardno = cardno;
	177	+ }
	178	+
117	179	public String getType() {
118	180	return type;
119	181	}
120	182
121	183
122	184
123	185
124	186
125	187
126	188
127	189
128	190
...	...	@@ -122,118 +184,44 @@
122	184	this.type = type;
123	185	}
124	186
125		- public Date getLastMensesStart() {
126		- return lastMensesStart;
	187	+ public String getQueryNo() {
	188	+ return queryNo;
127	189	}
128	190
129		- public void setLastMensesStart(Date lastMensesStart) {
130		- this.lastMensesStart = lastMensesStart;
	191	+ public void setQueryNo(String queryNo) {
	192	+ this.queryNo = queryNo;
131	193	}
132	194
133		- public Date getLastMensesEnd() {
134		- return lastMensesEnd;
	195	+ public Date getOrderDateStart() {
	196	+ return orderDateStart;
135	197	}
136	198
137		- public void setLastMensesEnd(Date lastMensesEnd) {
138		- this.lastMensesEnd = lastMensesEnd;
	199	+ public void setOrderDateStart(Date orderDateStart) {
	200	+ this.orderDateStart = orderDateStart;
139	201	}
140	202
141		- @Override
142		- public String getSort() {
143		- return sort;
	203	+ public Date getOrderDateEnd() {
	204	+ return orderDateEnd;
144	205	}
145	206
146		- @Override
147		- public void setSort(String sort) {
148		- this.sort = sort;
	207	+ public void setOrderDateEnd(Date orderDateEnd) {
	208	+ this.orderDateEnd = orderDateEnd;
149	209	}
150	210
151		- @Override
152		- public MongoQuery convertToQuery() {
153		- MongoCondition condition = MongoCondition.newInstance();
	211	+ public Date getCreateDateStart() {
	212	+ return createDateStart;
	213	+ }
154	214
155		- if (StringUtils.isNotEmpty(id)) {
156		- condition = condition.and("id", id, MongoOper.IS);
157		- }
158		- if (null != yn) {
159		- condition = condition.and("yn", yn, MongoOper.IS);
160		- }
	215	+ public void setCreateDateStart(Date createDateStart) {
	216	+ this.createDateStart = createDateStart;
	217	+ }
161	218
162		- if (StringUtils.isNotEmpty(name)) {
163		-
164		- condition = condition.and("name", name, MongoOper.IS);
165		- }
166		- // 就诊卡号
167		- if (StringUtils.isNotEmpty(phone)) {
168		-
169		- condition = condition.and("phone", phone, MongoOper.IS);
170		- }
171		- // 身份证
172		- if (StringUtils.isNotEmpty(cardno)) {
173		-
174		- condition = condition.and("cardno", cardno, MongoOper.IS);
175		- }
176		- //检查医生
177		- if (StringUtils.isNotEmpty(type)) {
178		-
179		- condition = condition.and("type", type, MongoOper.IS);
180		- }
181		-
182		-
183		-
184		- Criteria c = null;
185		- // 末次月经
186		- if (null != lastMensesStart) {
187		- if (null != c) {
188		- c = c.and("lastMenses").gte(lastMensesStart);
189		- } else {
190		- c = Criteria.where("lastMenses").gte(lastMensesStart);
191		- }
192		- }
193		- if (null != lastMensesEnd) {
194		- if (null != c) {
195		- c = c.lte(lastMensesEnd);
196		- } else {
197		- c = Criteria.where("lastMenses").lte(lastMensesEnd);
198		- }
199		- }
200		- // 登记时间
201		- if (null != createDateStart) {
202		- if (null != c) {
203		- c = c.and("createDate").gte(createDateStart);
204		- } else {
205		- c = Criteria.where("createDate").gte(createDateStart);
206		- }
207		- }
208		- if (null != createDateEnd) {
209		- if (null != c) {
210		- c = c.lte(createDateEnd);
211		- } else {
212		- c = Criteria.where("createDate").lte(createDateEnd);
213		- }
214		- }
215		-
216		-
217		- // 查询号
218		- if (StringUtils.isNotEmpty(queryNo)) {
219		- MongoCondition c1 = MongoCondition.newInstance();
220		- MongoCondition con1 = MongoCondition.newInstance("name", queryNo, MongoOper.LIKE);
221		- MongoCondition con2 = MongoCondition.newInstance("phone", queryNo, MongoOper.IS);
222		- MongoCondition con3 = MongoCondition.newInstance("cardno", queryNo, MongoOper.IS);
223		- if (c != null) {
224		- c1.orCondition(new MongoCondition[]{con1, con2, con3}).getCriteria();
225		- condition.andCondition(c1);
226		- } else {
227		- c = c1.orCondition(new MongoCondition[]{con1, con2,con3}).getCriteria();
228		- }
229		- }
230		- if (c != null) {
231		- return new MongoCondition(c.andOperator(condition.getCriteria())).toMongoQuery();
232		- }
233		-
234		- return condition.toMongoQuery();
	219	+ public Date getCreateDateEnd() {
	220	+ return createDateEnd;
235	221	}
236	222
237		-
	223	+ public void setCreateDateEnd(Date createDateEnd) {
	224	+ this.createDateEnd = createDateEnd;
	225	+ }
238	226	}

...	...	@@ -19,9 +19,14 @@
19	19	import com.lyms.platform.operate.web.utils.MongoUtil;
20	20	import com.lyms.platform.permission.service.OrganizationService;
21	21	import com.lyms.platform.permission.service.UsersService;
	22	+import com.lyms.platform.pojo.AntenatalExaminationModel;
22	23	import com.lyms.platform.pojo.PatientRegistrationModel;
	24	+import com.lyms.platform.pojo.PersonModel;
23	25	import com.lyms.platform.query.PatientRegistrationModelQuery;
24	26	import org.springframework.beans.factory.annotation.Autowired;
	27	+import org.springframework.data.mongodb.core.MongoTemplate;
	28	+import org.springframework.data.mongodb.core.query.Criteria;
	29	+import org.springframework.data.mongodb.core.query.Query;
25	30	import org.springframework.stereotype.Component;
26	31
27	32	import javax.servlet.http.HttpServletResponse;
...	...	@@ -51,6 +56,9 @@
51	56	@Autowired
52	57	private UsersService usersService;
53	58
	59	+ @Autowired
	60	+ private MongoTemplate mongoTemplate;
	61	+
54	62	/**
55	63	* 构造保存对象
56	64	*
...	...	@@ -66,7 +74,8 @@
66	74	model.setPhone(request.getPhone());
67	75	model.setCardno(request.getCardno());
68	76	model.setType(request.getType());
69		- model.setLastMenses(DateUtil.parseYMD(request.getLastMenses()));
	77	+ model.setBedType(request.getBedType());
	78	+ model.setOrderDate(DateUtil.parseYMD(request.getOrderDate()));
70	79	return model;
71	80
72	81	}
73	82
74	83
...	...	@@ -77,32 +86,23 @@
77	86	* @Author: 武涛涛
78	87	*/
79	88	public synchronized BaseResponse add(PatientRegistrationRequest request) {
80		-// String hospitalId = autoMatchFacade.getHospitalId(userId);
81		- List<PatientRegistrationModel> patientRegistrationModels = null;
82		- //判断该手机号存在信息
83		- if (StringUtils.isNotEmpty(request.getPhone())) {
84		- PatientRegistrationModelQuery modelQuery = new PatientRegistrationModelQuery();
85		- modelQuery.setYn(YnEnums.YES.getId());
86		- modelQuery.setHospitalId(request.getHospitalId());
87		- modelQuery.setPhone(request.getPhone());
88		- modelQuery.setSort("ASC");
89		- patientRegistrationModels = patientRegistrationService.queryListOne(modelQuery);
90		- }
91		-
92	89	BaseObjectResponse br = new BaseObjectResponse();
93		- if(CollectionUtils.isEmpty(patientRegistrationModels)){
94		- PatientRegistrationModel model = getPatientRegistrationModel(request);
95		- model.setCreateDate(new Date());
96		- model.setHospitalId(request.getHospitalId());
97		- model = patientRegistrationService.add(model);
98		- br.setErrorcode(ErrorCodeConstants.SUCCESS);
99		- br.setErrormsg("成功");
100		- br.setData(model.getId());
101		- }else {
102		- br.setErrorcode(ErrorCodeConstants.DATA_EXIST);
103		- br.setErrormsg("数据已存在");
104		- br.setData(patientRegistrationModels.get(0));
	90	+ PatientRegistrationModel model = getPatientRegistrationModel(request);
	91	+
	92	+ if (StringUtils.isNotEmpty(request.getPid()))
	93	+ {
	94	+ PersonModel personModels = mongoTemplate.findOne(Query.query(Criteria.where("id").is(request.getPid())), PersonModel.class);
	95	+ model.setName(personModels.getName());
	96	+ model.setCardno(personModels.getCardNo());
	97	+ model.setPhone(personModels.getPhone());
105	98	}
	99	+
	100	+ model.setCreateDate(new Date());
	101	+ model.setHospitalId("216");
	102	+ model = patientRegistrationService.add(model);
	103	+ br.setErrorcode(ErrorCodeConstants.SUCCESS);
	104	+ br.setErrormsg("成功");
	105	+ br.setData(model.getId());
106	106	return br;
107	107	}
108	108
...	...	@@ -152,9 +152,9 @@
152	152	babyPsychologistResult.setCheckDoctor(users.getName());
153	153	}
154	154	}*/
155		- if (StringUtils.isNotEmpty(model.getHospitalId())) {
156		- result.setHospitalName(CommonsHelper.getHospitalName(model.getHospitalId(), organizationService));
157		- }
	155	+// if (StringUtils.isNotEmpty(model.getHospitalId())) {
	156	+// result.setHospitalName(CommonsHelper.getHospitalName(model.getHospitalId(), organizationService));
	157	+// }
158	158	br.setData(result);
159	159	br.setErrorcode(ErrorCodeConstants.SUCCESS);
160	160	br.setErrormsg("成功");
...	...	@@ -188,7 +188,6 @@
188	188	public BaseObjectResponse queryPatientRegistrationListOne(PatientRegistrationModelQuery modelQuery) {
189	189
190	190	BaseObjectResponse br = new BaseObjectResponse();
191		-// String hospitalId = autoMatchFacade.getHospitalId(userId);
192	191	List <PatientRegistrationResult> results = new ArrayList <>();
193	192	try {
194	193	//单人多条记录
...	...	@@ -204,9 +203,9 @@
204	203	PatientRegistrationResult result = new PatientRegistrationResult();
205	204	if (patientRegistrationModel != null) {
206	205	result.convertToResult(patientRegistrationModel);
207		- if (StringUtils.isNotEmpty(patientRegistrationModel.getHospitalId())) {
208		- result.setHospitalName(CommonsHelper.getHospitalName(patientRegistrationModel.getHospitalId(), organizationService));
209		- }
	206	+// if (StringUtils.isNotEmpty(patientRegistrationModel.getHospitalId())) {
	207	+// result.setHospitalName(CommonsHelper.getHospitalName(patientRegistrationModel.getHospitalId(), organizationService));
	208	+// }
210	209	results.add(result);
211	210	}
212	211	}
213	212
214	213
215	214
216	215
217	216
218	217
...	...	@@ -228,35 +227,41 @@
228	227	public BaseListResponse queryPatientRegistrationListAll(PatientRegistrationModelQuery modelQuery) {
229	228
230	229	BaseListResponse br = new BaseListResponse();
231		-// String hospitalId = autoMatchFacade.getHospitalId(userId);
232	230	List <PatientRegistrationResult> results = new ArrayList <>();
233	231	try {
234		- //单人多条专病记录
235	232	List <PatientRegistrationModel> patientRegistrationModels = new ArrayList <>();
236	233
237	234	modelQuery.setYn(YnEnums.YES.getId());
238	235	modelQuery.setHospitalId(modelQuery.getHospitalId());
239	236	modelQuery.setSort(null);
240		- if (modelQuery.getLastMensesEnd() != null) {
241		- modelQuery.setLastMensesEnd(DateUtil.getDayLastSecond(modelQuery.getLastMensesEnd()));
	237	+ modelQuery.setQueryNo(modelQuery.getQueryNo());
	238	+ if (modelQuery.getOrderDateStart() != null) {
	239	+ modelQuery.setOrderDateStart(DateUtil.getDayFirstSecond(modelQuery.getOrderDateStart()));
242	240	}
	241	+ if (modelQuery.getOrderDateEnd() != null) {
	242	+ modelQuery.setOrderDateEnd(DateUtil.getDayLastSecond(modelQuery.getOrderDateEnd()));
	243	+ }
	244	+
	245	+ if (modelQuery.getCreateDateStart() != null) {
	246	+ modelQuery.setCreateDateStart(DateUtil.getDayFirstSecond(modelQuery.getCreateDateStart()));
	247	+ }
243	248	if (modelQuery.getCreateDateEnd() != null) {
244	249	modelQuery.setCreateDateEnd(DateUtil.getDayLastSecond(modelQuery.getCreateDateEnd()));
245	250	}
	251	+
246	252	patientRegistrationModels = patientRegistrationService.queryListAll(modelQuery);
247		- System.out.println("--------------"+modelQuery.convertToQuery().convertToMongoQuery());
248	253
249		- for (int i = 0; i < patientRegistrationModels.size(); i++) {
250		- PatientRegistrationModel patientRegistrationModel = patientRegistrationModels.get(i);
251		- PatientRegistrationResult result = new PatientRegistrationResult();
252		- if (patientRegistrationModel != null) {
253		- result.convertToResult(patientRegistrationModel);
254		- if (StringUtils.isNotEmpty(patientRegistrationModel.getHospitalId())) {
255		- result.setHospitalName(CommonsHelper.getHospitalName(patientRegistrationModel.getHospitalId(), organizationService));
256		- }
257		- results.add(result);
258		- }
259		- }
	254	+ if (CollectionUtils.isNotEmpty(patientRegistrationModels))
	255	+ {
	256	+ for(PatientRegistrationModel patientRegistrationModel : patientRegistrationModels)
	257	+ {
	258	+ PatientRegistrationResult result = new PatientRegistrationResult();
	259	+ if (patientRegistrationModel != null) {
	260	+ result.convertToResult(patientRegistrationModel);
	261	+ results.add(result);
	262	+ }
	263	+ }
	264	+ }
260	265	} catch (Exception e) {
261	266	e.printStackTrace();
262	267	}
...	...	@@ -282,8 +287,9 @@
282	287	m.put("name",patientRegistrationResult.getName());
283	288	m.put("phone",patientRegistrationResult.getPhone());
284	289	m.put("cardno",patientRegistrationResult.getCardno());
285		- m.put("type",StringUtils.isNotEmpty(patientRegistrationResult.getType()) ? ("1".equals(patientRegistrationResult.getType())?"是":"否" ):"_");
286		- m.put("lastMenses",patientRegistrationResult.getLastMenses() );
	290	+ m.put("type",patientRegistrationResult.getType());
	291	+ m.put("bedType",patientRegistrationResult.getBedType());
	292	+ m.put("orderDate",patientRegistrationResult.getOrderDate() );
287	293	m.put("createDate",patientRegistrationResult.getCreateDate() );
288	294	datas.add(m);
289	295	}
...	...	@@ -305,8 +311,9 @@
305	311	cnames.put("name", "姓名");
306	312	cnames.put("phone", "手机号码");
307	313	cnames.put("cardno", "身份证号码");
308		- cnames.put("type", "是否在我院建档");
309		- cnames.put("lastMenses", "末次月经");
	314	+ cnames.put("type", "是否同意");
	315	+ cnames.put("bedType", "床位类型");
	316	+ cnames.put("orderDate", "预约时间");
310	317	cnames.put("createDate", "登记时间");
311	318	}
312	319

...	...	@@ -3,6 +3,8 @@
3	3	import com.lyms.platform.common.core.annotation.form.FormParam;
4	4	import org.hibernate.validator.constraints.NotEmpty;
5	5
	6	+import java.util.Date;
	7	+
6	8	/**
7	9	* 患者登记入参类
8	10	*/
9	11
10	12
11	13
12	14
...	...	@@ -17,20 +19,30 @@
17	19	private String hospitalId;
18	20	private String HospitalName;
19	21
	22	+ private String pid;
	23	+
20	24	/表单信息/
21	25	//姓名
22	26	private String name;
23	27	//手机号码
24		- @FormParam
25		- @NotEmpty(message = "手机号吗不能为空")
26	28	private String phone;
27	29	//身份证号码
28	30	private String cardno;
29		- //是否在我院建档 1是 2 不是
	31	+ //是否同意 1是 2 不是
30	32	private String type;
31		- //末次月经
32		- private String lastMenses;
	33	+ //1、LDRP(家庭化产房) 2 普通房间（产前）+单人分娩产房+单间（产后） 3 普通房间（产前+产后）
	34	+ private Integer bedType;
	35	+ //预约时间
	36	+ private String orderDate;
33	37
	38	+ public String getPid() {
	39	+ return pid;
	40	+ }
	41	+
	42	+ public void setPid(String pid) {
	43	+ this.pid = pid;
	44	+ }
	45	+
34	46	public String getId() {
35	47	return id;
36	48	}
...	...	@@ -39,14 +51,6 @@
39	51	this.id = id;
40	52	}
41	53
42		- public String getHospitalName() {
43		- return HospitalName;
44		- }
45		-
46		- public void setHospitalName(String hospitalName) {
47		- HospitalName = hospitalName;
48		- }
49		-
50	54	public Integer getYn() {
51	55	return yn;
52	56	}
53	57
54	58
...	...	@@ -75,16 +79,16 @@
75	79	return hospitalId;
76	80	}
77	81
78		- public String getCardno() {
79		- return cardno;
	82	+ public void setHospitalId(String hospitalId) {
	83	+ this.hospitalId = hospitalId;
80	84	}
81	85
82		- public void setCardno(String cardno) {
83		- this.cardno = cardno;
	86	+ public String getHospitalName() {
	87	+ return HospitalName;
84	88	}
85	89
86		- public void setHospitalId(String hospitalId) {
87		- this.hospitalId = hospitalId;
	90	+ public void setHospitalName(String hospitalName) {
	91	+ HospitalName = hospitalName;
88	92	}
89	93
90	94	public String getName() {
...	...	@@ -103,6 +107,14 @@
103	107	this.phone = phone;
104	108	}
105	109
	110	+ public String getCardno() {
	111	+ return cardno;
	112	+ }
	113	+
	114	+ public void setCardno(String cardno) {
	115	+ this.cardno = cardno;
	116	+ }
	117	+
106	118	public String getType() {
107	119	return type;
108	120	}
109	121
...	...	@@ -111,12 +123,20 @@
111	123	this.type = type;
112	124	}
113	125
114		- public String getLastMenses() {
115		- return lastMenses;
	126	+ public Integer getBedType() {
	127	+ return bedType;
116	128	}
117	129
118		- public void setLastMenses(String lastMenses) {
119		- this.lastMenses = lastMenses;
	130	+ public void setBedType(Integer bedType) {
	131	+ this.bedType = bedType;
	132	+ }
	133	+
	134	+ public String getOrderDate() {
	135	+ return orderDate;
	136	+ }
	137	+
	138	+ public void setOrderDate(String orderDate) {
	139	+ this.orderDate = orderDate;
120	140	}
121	141	}

...	...	@@ -8,12 +8,7 @@
8	8
9	9	/基础信息/
10	10	private String id;
11		- private Integer yn;
12	11	private String createDate;
13		- private String modifyDate;
14		- private String hospitalId;
15		- private String HospitalName;
16		-
17	12	/表单信息/
18	13	//姓名
19	14	private String name;
20	15
21	16
22	17
23	18
24	19
...	...	@@ -21,43 +16,34 @@
21	16	private String phone;
22	17	//身份证号码
23	18	private String cardno;
24		- //是否在我院建档 1是 2 不是
	19	+ //是否同意 1是 2 不是
25	20	private String type;
26		- //末次月经
27		- private String lastMenses;
	21	+ //1、LDRP(家庭化产房) 2 普通房间（产前）+单人分娩产房+单间（产后） 3 普通房间（产前+产后）
	22	+ private String bedType;
	23	+ //预约时间
	24	+ private String orderDate;
28	25
29		- public String getId() {
30		- return id;
	26	+ @Override
	27	+ public PatientRegistrationResult convertToResult(PatientRegistrationModel destModel) {
	28	+ setCreateDate(DateUtil.getYyyyMmDd(destModel.getCreateDate()));
	29	+ setName(destModel.getName());
	30	+ setPhone(destModel.getPhone());
	31	+ setCardno(destModel.getCardno());
	32	+ setType(destModel.getType() == null ? "" : ("1".equals(destModel.getType()) ? "是" : "否" ));
	33	+ setBedType(destModel.getBedType() == null ? "" : (destModel.getBedType() == 1 ? "LDRP(家庭化产房)" : (destModel.getBedType() == 2 ? "普通房间（产前）+单人分娩产房+单间（产后）" : "普通房间（产前+产后）")));
	34	+ setOrderDate(DateUtil.getYyyyMmDd(destModel.getOrderDate()));
	35	+ return this;
31	36	}
32	37
33		- public String getCardno() {
34		- return cardno;
35		- }
36	38
37		- public void setCardno(String cardno) {
38		- this.cardno = cardno;
	39	+ public String getId() {
	40	+ return id;
39	41	}
40	42
41	43	public void setId(String id) {
42	44	this.id = id;
43	45	}
44	46
45		- public Integer getYn() {
46		- return yn;
47		- }
48		-
49		- public void setYn(Integer yn) {
50		- this.yn = yn;
51		- }
52		-
53		- public String getHospitalName() {
54		- return HospitalName;
55		- }
56		-
57		- public void setHospitalName(String hospitalName) {
58		- HospitalName = hospitalName;
59		- }
60		-
61	47	public String getCreateDate() {
62	48	return createDate;
63	49	}
...	...	@@ -66,22 +52,6 @@
66	52	this.createDate = createDate;
67	53	}
68	54
69		- public String getModifyDate() {
70		- return modifyDate;
71		- }
72		-
73		- public void setModifyDate(String modifyDate) {
74		- this.modifyDate = modifyDate;
75		- }
76		-
77		- public String getHospitalId() {
78		- return hospitalId;
79		- }
80		-
81		- public void setHospitalId(String hospitalId) {
82		- this.hospitalId = hospitalId;
83		- }
84		-
85	55	public String getName() {
86	56	return name;
87	57	}
...	...	@@ -98,6 +68,14 @@
98	68	this.phone = phone;
99	69	}
100	70
	71	+ public String getCardno() {
	72	+ return cardno;
	73	+ }
	74	+
	75	+ public void setCardno(String cardno) {
	76	+ this.cardno = cardno;
	77	+ }
	78	+
101	79	public String getType() {
102	80	return type;
103	81	}
104	82
105	83
106	84
...	...	@@ -106,29 +84,20 @@
106	84	this.type = type;
107	85	}
108	86
109		- public String getLastMenses() {
110		- return lastMenses;
	87	+ public String getBedType() {
	88	+ return bedType;
111	89	}
112	90
113		- public void setLastMenses(String lastMenses) {
114		- this.lastMenses = lastMenses;
	91	+ public void setBedType(String bedType) {
	92	+ this.bedType = bedType;
115	93	}
116	94
117		- @Override
118		- public PatientRegistrationResult convertToResult(PatientRegistrationModel destModel) {
119		-
120		- setYn(destModel.getYn());
121		- setModifyDate(DateUtil.getYyyyMmDd(destModel.getModifyDate()));
122		- setCreateDate(DateUtil.getYyyyMmDd(destModel.getCreateDate()));
123		- setName(destModel.getName());
124		- setPhone(destModel.getPhone());
125		- setCardno(destModel.getCardno());
126		- setType(destModel.getType());
127		- setLastMenses(DateUtil.getYyyyMmDd(destModel.getLastMenses()));
128		- setHospitalId(destModel.getHospitalId());
129		- return this;
	95	+ public String getOrderDate() {
	96	+ return orderDate;
130	97	}
131	98
132		-
	99	+ public void setOrderDate(String orderDate) {
	100	+ this.orderDate = orderDate;
	101	+ }
133	102	}