jiangjiazhi / regional-platform

Commit c0231a7d64ca4a3fbfc2177064d24eb7560fffce

Authored by liquanyu over 9 years ago

Exists in master and in 8 other branches

add code

Showing 14 changed files with 343 additions and 69 deletions

platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/BabyBookbuildingService.java
platform-common/src/main/java/com/lyms/platform/common/utils/SystemConfig.java
platform-dal/src/main/java/com/lyms/platform/pojo/BabyModel.java
platform-dal/src/main/java/com/lyms/platform/pojo/Patients.java
platform-dal/src/main/java/com/lyms/platform/query/BabyModelQuery.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/BabyBookbuildingController.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyBookbuildingFacade.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BasicConfigFacade.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BookbuildingFacade.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/BabyBookbuildingAddRequest.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/YunBookbuildingAddRequest.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BabyBuildResult.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BabyInfoResult.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/PregnantInfoResult.java

...	...	@@ -38,7 +38,7 @@
38	38
39	39	public List<BabyModel> queryBabyBuildById(BabyModelQuery babyQuery) {
40	40	MongoQuery query = babyQuery.convertToQuery();
41		- return babyBookBuildingDao.queryBabyWithQuery(query.addOrder(Sort.Direction.DESC, "id"));
	41	+ return babyBookBuildingDao.queryBabyWithQuery(query.addOrder(Sort.Direction.DESC, "buildDate"));
42	42	}
43	43	}

...	...	@@ -28,6 +28,9 @@
28	28	//文化程度
29	29	public static final String LEVEL_TYPE_ID = "8046934b-ebe8-4037-98b6-a9ec47996700";
30	30
	31	+ //诊断
	32	+ public static final String DIAGNOSE_TYPE_ID = "5768e5cf0cf2eaac7ba44a18";
	33	+
31	34
32	35	}

...	...	@@ -130,15 +130,18 @@
130	130	//助产机构
131	131	private String deliverOrg;
132	132
133		- //是否畸形 0非畸形 1畸形
134		- private Integer isMalformation;
	133	+ //是否畸形 false非畸形 true畸形
	134	+ private boolean malformation;
135	135
136	136	//建档医生
137	137	private String buildDoctor;
138	138	//建档日期
139	139	private Date buildDate;
140		- //服务状态
	140	+ //服务类型
141	141	private String serviceType;
	142	+
	143	+ //服务状态
	144	+ private String serviceStatus;
142	145	//就诊卡号
143	146	private String vcCardNo;
144	147	//apgar评分
...	...	@@ -156,8 +159,8 @@
156	159	//早吮吸
157	160	private String earlySuck;
158	161
159		- //体验会员 0非体验会员 1体验会员
160		- private Integer isExpVip;
	162	+ //体验会员 false非体验会员 true体验会员
	163	+ private boolean expVip;
161	164
162	165	//会员截止时间
163	166	private Date vipEndTime;
164	167
...	...	@@ -168,11 +171,27 @@
168	171	//诊断
169	172	private String diagnose;
170	173
171		- //是否高危 0 非高危 1高危
172		- private String isHighRisk;
	174	+ //是否高危 false 非高危 true高危
	175	+ private boolean highRisk;
173	176	//母亲备注
174	177	private String mremark;
175	178
	179	+ public boolean isMalformation() {
	180	+ return malformation;
	181	+ }
	182	+
	183	+ public void setMalformation(boolean malformation) {
	184	+ this.malformation = malformation;
	185	+ }
	186	+
	187	+ public String getServiceStatus() {
	188	+ return serviceStatus;
	189	+ }
	190	+
	191	+ public void setServiceStatus(String serviceStatus) {
	192	+ this.serviceStatus = serviceStatus;
	193	+ }
	194	+
176	195	public String getDiagnose() {
177	196	return diagnose;
178	197	}
179	198
...	...	@@ -436,13 +455,7 @@
436	455	this.deliverOrg = deliverOrg;
437	456	}
438	457
439		- public Integer getIsMalformation() {
440		- return isMalformation;
441		- }
442	458
443		- public void setIsMalformation(Integer isMalformation) {
444		- this.isMalformation = isMalformation;
445		- }
446	459
447	460	public String getBuildDoctor() {
448	461	return buildDoctor;
449	462
450	463
451	464
...	...	@@ -641,20 +654,20 @@
641	654	this.highRiskReason = highRiskReason;
642	655	}
643	656
644		- public String getIsHighRisk() {
645		- return isHighRisk;
	657	+ public boolean isExpVip() {
	658	+ return expVip;
646	659	}
647	660
648		- public void setIsHighRisk(String isHighRisk) {
649		- this.isHighRisk = isHighRisk;
	661	+ public void setExpVip(boolean expVip) {
	662	+ this.expVip = expVip;
650	663	}
651	664
652		- public Integer getIsExpVip() {
653		- return isExpVip;
	665	+ public boolean isHighRisk() {
	666	+ return highRisk;
654	667	}
655	668
656		- public void setIsExpVip(Integer isExpVip) {
657		- this.isExpVip = isExpVip;
	669	+ public void setHighRisk(boolean highRisk) {
	670	+ this.highRisk = highRisk;
658	671	}
659	672
660	673	public Date getVipEndTime() {

...	...	@@ -107,6 +107,27 @@
107	107	//会员截止时间
108	108	private Date vipEndTime;
109	109
	110	+ //备注
	111	+ private String mremark;
	112	+
	113	+ //分娩状态 0未分娩 1分娩 2终止妊娠
	114	+ private Integer dueStatus;
	115	+
	116	+ public Integer getDueStatus() {
	117	+ return dueStatus;
	118	+ }
	119	+
	120	+ public void setDueStatus(Integer dueStatus) {
	121	+ this.dueStatus = dueStatus;
	122	+ }
	123	+
	124	+ public String getMremark() {
	125	+ return mremark;
	126	+ }
	127	+
	128	+ public void setMremark(String mremark) {
	129	+ this.mremark = mremark;
	130	+ }
110	131
111	132	public Integer getServiceStatus() {
112	133	return serviceStatus;

...	...	@@ -197,11 +197,11 @@
197	197	}
198	198
199	199	if(null!=mcertNo){
200		- condition=condition.and("mcertNo", null, MongoOper.IS);
	200	+ condition=condition.and("mcertNo", mcertNo, MongoOper.IS);
201	201	}
202	202
203	203	if(null!=vcCardNo){
204		- condition=condition.and("vcCardNo", null, MongoOper.IS);
	204	+ condition=condition.and("vcCardNo", mcertNo, MongoOper.IS);
205	205	}
206	206
207	207	if (null != keyword) {

...	...	@@ -90,7 +90,7 @@
90	90	*/
91	91	@RequestMapping(value = "/queryBabyBuild", method = RequestMethod.GET)
92	92	@ResponseBody
93		- public BaseObjectResponse queryBabyBuild(@RequestParam("idCard")String idCard,@RequestParam("vcCardNo")String vcCardNo){
	93	+ public BaseObjectResponse queryBabyBuild(@RequestParam(required = false)String idCard,@RequestParam(required = false)String vcCardNo){
94	94	BookbuildingQueryRequest param = new BookbuildingQueryRequest();
95	95	param.setIdCard(idCard);
96	96	param.setVcCardNo(vcCardNo);
...	...	@@ -98,6 +98,7 @@
98	98	}
99	99
100	100
	101	+
101	102	/**
102	103	* 查询儿童建档记录就诊卡号，母亲身份证
103	104	* @param idCard
...	...	@@ -106,7 +107,7 @@
106	107	*/
107	108	@RequestMapping(value = "/queryBabyBuildRecord", method = RequestMethod.GET)
108	109	@ResponseBody
109		- public BaseObjectResponse queryBabyBuildRecord(@RequestParam("idCard")String idCard,@RequestParam("vcCardNo")String vcCardNo){
	110	+ public BaseObjectResponse queryBabyBuildRecord(@RequestParam(required = false)String idCard,@RequestParam(required = false)String vcCardNo){
110	111	BookbuildingQueryRequest param = new BookbuildingQueryRequest();
111	112	param.setIdCard(idCard);
112	113	param.setVcCardNo(vcCardNo);
...	...	@@ -123,6 +124,17 @@
123	124	@ResponseBody
124	125	public BaseObjectResponse getBabyBuildBaseConfig(){
125	126	return babyBookbuildingFacade.getBabyBuildBaseConfig();
	127	+ }
	128	+
	129	+
	130	+ /**
	131	+ * 查询诊断根据关键字
	132	+ * @return
	133	+ */
	134	+ @RequestMapping(value = "/queryDiagnose", method = RequestMethod.GET)
	135	+ @ResponseBody
	136	+ public BaseObjectResponse queryDiagnose(@RequestParam(required = true)String keyword){
	137	+ return babyBookbuildingFacade.queryDiagnose(keyword);
126	138	}
127	139
128	140	}

...	...	@@ -4,6 +4,7 @@
4	4	import com.lyms.platform.biz.service.BasicConfigService;
5	5	import com.lyms.platform.biz.service.YunBookbuildingService;
6	6	import com.lyms.platform.common.constants.ErrorCodeConstants;
	7	+import com.lyms.platform.common.enums.ServiceStatusEnums;
7	8	import com.lyms.platform.common.enums.ServiceTypeEnums;
8	9	import com.lyms.platform.common.enums.YnEnums;
9	10	import com.lyms.platform.common.result.BaseListResponse;
...	...	@@ -17,6 +18,8 @@
17	18	import com.lyms.platform.operate.web.request.BookbuildingQueryRequest;
18	19	import com.lyms.platform.operate.web.request.YunBookbuildingAddRequest;
19	20	import com.lyms.platform.operate.web.result.*;
	21	+import com.lyms.platform.permission.model.Organization;
	22	+import com.lyms.platform.permission.service.OrganizationService;
20	23	import com.lyms.platform.pojo.BabyModel;
21	24	import com.lyms.platform.pojo.BasicConfig;
22	25	import com.lyms.platform.pojo.Patients;
...	...	@@ -43,6 +46,9 @@
43	46	@Autowired
44	47	private BasicConfigService basicConfigService;
45	48
	49	+ @Autowired
	50	+ private OrganizationService organizationService;
	51	+
46	52	/**
47	53	* 修改儿童建档
48	54	* @param request
49	55
50	56
51	57
...	...	@@ -118,16 +124,17 @@
118	124	bm.setBabyWeight(b.getBabyWeight());
119	125	bm.setHospitalId(b.getHospitalId());
120	126
121		- bm.setIsHighRisk(b.getIsHighRisk());
	127	+ bm.setHighRisk(b.isHighRisk());
122	128	bm.setHighRiskReason(b.getHighRiskReason());
123		- bm.setIsExpVip(b.getIsExpVip());
	129	+ bm.setExpVip(b.isExpVip());
124	130	bm.setMremark(b.getMremark());
125	131	bm.setDiagnose(b.getDiagnose());
126	132	bm.setVipEndTime(DateUtil.parseYMD(b.getVipEndTime()));
	133	+ bm.setServiceStatus(b.getServiceStatus());
127	134
128	135	bm.setDueDate(DateUtil.parseYMD(b.getDueDate()));
129	136	bm.setDueType(b.getDueType());
130		- bm.setIsMalformation(b.getIsMalformation());
	137	+ bm.setMalformation(b.isMalformation());
131	138	bm.setOrg(b.getDeliverOrg());
132	139	bm.setBuildDoctor(b.getBuildDoctor());
133	140	bm.setBuildDate(DateUtil.parseYMD(b.getBuildDate()));
134	141
135	142
...	...	@@ -216,11 +223,19 @@
216	223	result.setBabyWeight(model.getBabyWeight());
217	224	result.setBabyHead(model.getBabyHead());
218	225	result.setDeliverOrg(model.getOrg());
219		- result.setIsMalformation(model.getIsMalformation());
	226	+ result.setMalformation(model.isMalformation());
220	227	result.setApgar(JsonUtil.str2Obj(model.getApgarScore(), Map.class));
221	228
222	229
	230	+ result.setHighRisk(model.isHighRisk());
	231	+ result.setHighRiskReason(model.getHighRiskReason());
	232	+ result.setExpVip(model.isExpVip());
	233	+ result.setMremark(model.getMremark() == null ? "" : model.getMremark());
	234	+ result.setDiagnose(model.getDiagnose());
	235	+ result.setVipEndTime(DateUtil.getyyyy_MM_dd(model.getVipEndTime()));
	236	+ result.setServiceStatus(model.getServiceStatus());
223	237
	238	+
224	239	result.setBuildDoctor(model.getBuildDoctor());
225	240	result.setBuildDate(DateUtil.getyyyy_MM_dd(model.getBuildDate()));
226	241	result.setServiceType(model.getServiceType());
227	242
...	...	@@ -282,8 +297,12 @@
282	297
283	298	//服务类型
284	299	List serviceType = ServiceTypeEnums.getServiceTypeList();
285		- map.put("serviceType",serviceType);
	300	+ map.put("serviceType", serviceType);
286	301
	302	+ //服务状态
	303	+ List serviceStatus = ServiceStatusEnums.getServiceStatusList();
	304	+ map.put("serviceStatus",serviceStatus);
	305	+
287	306	BaseObjectResponse objectResponse = new BaseObjectResponse();
288	307	objectResponse.setData(map);
289	308	objectResponse.setErrorcode(ErrorCodeConstants.SUCCESS);
...	...	@@ -292,6 +311,11 @@
292	311	return objectResponse;
293	312	}
294	313
	314	+ /**
	315	+ * 查询母亲下面有几个儿童每个儿童下面有几次建档记录
	316	+ * @param param
	317	+ * @return
	318	+ */
295	319	public BaseObjectResponse queryBabyBuildRecord(BookbuildingQueryRequest param) {
296	320
297	321	List<BabyInfoResult> results = new ArrayList<>();
298	322
299	323
300	324
301	325
...	...	@@ -305,20 +329,91 @@
305	329	List<BabyModel> models = babyBookbuildingService.queryBabyBuildById(babyQuery);
306	330	if (models != null && models.size() > 0)
307	331	{
	332	+ Set<String> cardNos = new HashSet<>();
308	333	for(BabyModel model : models)
309	334	{
	335	+ if (model != null && !StringUtils.isEmpty(model.getCardNo()))
	336	+ {
	337	+ cardNos.add(model.getCardNo());
	338	+ }
310	339
311		- BabyInfoResult result = new BabyInfoResult();
312		- result.setId(model.getId());
313		- result.setName(model.getName());
314		- result.setMonthAge(DateUtil.getBabyMonthAge(model.getBirth(), new Date()));
315	340	}
316	341
	342	+ for(String cno : cardNos)
	343	+ {
	344	+ BabyInfoResult result = new BabyInfoResult();
	345	+
	346	+ List<Map<String,String>> list = new ArrayList<>();
	347	+ for(BabyModel model : models)
	348	+ {
	349	+
	350	+ if (cno.equals(model.getCardNo()))
	351	+ {
	352	+ Map<String,String> buildRecords = new HashMap<>();
	353	+ buildRecords.put("id",model.getId());
	354	+ buildRecords.put("buildDate",DateUtil.getyyyy_MM_dd(model.getBuildDate()));
	355	+
	356	+ //查询建档医院
	357	+ Organization org = organizationService.getOrganization(model.getHospitalId());
	358	+ if (org != null)
	359	+ {
	360	+ buildRecords.put("buildHospital", org.getName());
	361	+ }
	362	+ else
	363	+ {
	364	+ buildRecords.put("buildHospital", "");
	365	+ }
	366	+
	367	+ result.setId(model.getId());
	368	+ result.setCardNo(model.getCardNo());
	369	+ result.setName(model.getName());
	370	+ result.setMonthAge(DateUtil.getBabyMonthAge(model.getBirth(), new Date()));
	371	+ list.add(buildRecords);
	372	+
	373	+ }
	374	+ result.setBuildRecords(list);
	375	+ }
	376	+ results.add(result);
	377	+ }
317	378	}
318	379	}
319	380
320	381	BaseObjectResponse objectResponse = new BaseObjectResponse();
321	382	objectResponse.setErrorcode(ErrorCodeConstants.SUCCESS);
	383	+ objectResponse.setData(results);
	384	+ objectResponse.setErrormsg("成功");
	385	+ return objectResponse;
	386	+ }
	387	+
	388	+ /**
	389	+ * 根据关键字查询
	390	+ * @param keyword
	391	+ * @return
	392	+ */
	393	+ public BaseObjectResponse queryDiagnose(String keyword) {
	394	+ BasicConfigQuery basicConfigQuery = new BasicConfigQuery();
	395	+ basicConfigQuery.setYn(YnEnums.YES.getId());
	396	+ basicConfigQuery.setParentId(SystemConfig.DIAGNOSE_TYPE_ID);
	397	+ basicConfigQuery.setKeyword(keyword);
	398	+ List<BasicConfig> datas = basicConfigService.queryBasicConfig(basicConfigQuery);
	399	+ List<BasicConfigResult> configResults = new ArrayList<>();
	400	+ if (datas != null)
	401	+ {
	402	+ for(BasicConfig data : datas)
	403	+ {
	404	+ BasicConfigResult br = new BasicConfigResult();
	405	+ br.setId(data.getId());
	406	+ br.setCode(data.getCode());
	407	+ br.setEnable(data.getEnable());
	408	+ br.setName(data.getName());
	409	+ br.setParentId(data.getParentId());
	410	+ configResults.add(br);
	411	+ }
	412	+
	413	+ }
	414	+ BaseObjectResponse objectResponse = new BaseObjectResponse();
	415	+ objectResponse.setErrorcode(ErrorCodeConstants.SUCCESS);
	416	+ objectResponse.setData(configResults);
322	417	objectResponse.setErrormsg("成功");
323	418	return objectResponse;
324	419	}

...	...	@@ -158,7 +158,7 @@
158	158	basicConfigQuery.setYn(YnEnums.YES.getId());
159	159	basicConfigQuery.setParentId(parentId);
160	160	List<BasicConfig> datas = basicConfigService.queryBasicConfig(basicConfigQuery);
161		- List<BasicConfigResult> provincesResults = new ArrayList<>();
	161	+ List<BasicConfigResult> configResults = new ArrayList<>();
162	162	if (datas != null)
163	163	{
164	164	for(BasicConfig data : datas)
165	165
...	...	@@ -169,11 +169,11 @@
169	169	br.setEnable(data.getEnable());
170	170	br.setName(data.getName());
171	171	br.setParentId(data.getParentId());
172		- provincesResults.add(br);
	172	+ configResults.add(br);
173	173	}
174	174
175	175	}
176		- return provincesResults;
	176	+ return configResults;
177	177	}
178	178
179	179	/**

...	...	@@ -237,6 +237,7 @@
237	237	patient.setServiceStatus(yunRequest.getServiceStatus());
238	238	patient.setVipEndTime(DateUtil.parseYMD(yunRequest.getVipEndTime()));
239	239	patient.setExpVip(yunRequest.isExpVip());
	240	+ patient.setMremark(yunRequest.getMremark());
240	241
241	242	patient.setLastMenses(DateUtil.parseYMD(yunRequest.getLastMenstrualPeriod()));
242	243	patient.setDueDate(DateUtil.parseYMD(yunRequest.getDueDate()));
...	...	@@ -247,6 +248,8 @@
247	248	patient.setVcCardNo(yunRequest.getVcCardNo());
248	249	patient.setHospitalId(yunRequest.getHospitalId());
249	250	patient.setYn(YnEnums.YES.getId());
	251	+
	252	+ patient.setDueStatus(0);
250	253	return patient;
251	254	}
252	255
...	...	@@ -320,6 +323,7 @@
320	323	result.setServiceStatus(p.getServiceStatus());
321	324	result.setVipEndTime(DateUtil.getyyyy_MM_dd(p.getVipEndTime()));
322	325	result.setExpVip(p.isExpVip());
	326	+ result.setMremark(p.getMremark());
323	327
324	328
325	329	//院内信息

...	...	@@ -96,8 +96,8 @@
96	96	//apgar评分
97	97	private Map<String,String> apgar;
98	98
99		- //是否畸形 0非畸形 1畸形
100		- private Integer isMalformation;
	99	+ //是否畸形 false非畸形 true畸形
	100	+ private boolean malformation;
101	101
102	102
103	103
...	...	@@ -110,6 +110,8 @@
110	110	//服务类型
111	111	private String serviceType;
112	112
	113	+ //服务类型
	114	+ private String serviceStatus;
113	115
114	116	//就诊卡号
115	117	private String vcCardNo;
...	...	@@ -117,7 +119,7 @@
117	119	private Integer hospitalId;
118	120
119	121	//体验会员 0非体验会员 1体验会员
120		- private Integer isExpVip;
	122	+ private boolean expVip;
121	123
122	124	//会员截止时间
123	125	private String vipEndTime;
124	126
...	...	@@ -129,8 +131,28 @@
129	131	private String diagnose;
130	132
131	133	//是否高危 0 非高危 1高危
132		- private String isHighRisk;
	134	+ private boolean highRisk;
133	135
	136	+ public void setDeliverOrg(String deliverOrg) {
	137	+ this.deliverOrg = deliverOrg;
	138	+ }
	139	+
	140	+ public boolean isMalformation() {
	141	+ return malformation;
	142	+ }
	143	+
	144	+ public void setMalformation(boolean malformation) {
	145	+ this.malformation = malformation;
	146	+ }
	147	+
	148	+ public String getServiceStatus() {
	149	+ return serviceStatus;
	150	+ }
	151	+
	152	+ public void setServiceStatus(String serviceStatus) {
	153	+ this.serviceStatus = serviceStatus;
	154	+ }
	155	+
134	156	public String getDiagnose() {
135	157	return diagnose;
136	158	}
137	159
138	160
...	...	@@ -383,17 +405,8 @@
383	405	return deliverOrg;
384	406	}
385	407
386		- public void setDeliverOrg(String deliverOrg) {
387		- this.deliverOrg = deliverOrg;
388		- }
389	408
390		- public Integer getIsMalformation() {
391		- return isMalformation;
392		- }
393	409
394		- public void setIsMalformation(Integer isMalformation) {
395		- this.isMalformation = isMalformation;
396		- }
397	410
398	411	public String getBuildDoctor() {
399	412	return buildDoctor;
400	413
401	414
402	415
...	...	@@ -451,20 +464,20 @@
451	464	this.highRiskReason = highRiskReason;
452	465	}
453	466
454		- public String getIsHighRisk() {
455		- return isHighRisk;
	467	+ public boolean isExpVip() {
	468	+ return expVip;
456	469	}
457	470
458		- public void setIsHighRisk(String isHighRisk) {
459		- this.isHighRisk = isHighRisk;
	471	+ public void setExpVip(boolean expVip) {
	472	+ this.expVip = expVip;
460	473	}
461	474
462		- public Integer getIsExpVip() {
463		- return isExpVip;
	475	+ public boolean isHighRisk() {
	476	+ return highRisk;
464	477	}
465	478
466		- public void setIsExpVip(Integer isExpVip) {
467		- this.isExpVip = isExpVip;
	479	+ public void setHighRisk(boolean highRisk) {
	480	+ this.highRisk = highRisk;
468	481	}
469	482
470	483	public String getVipEndTime() {

...	...	@@ -105,8 +105,11 @@
105	105	//服务类型
106	106	private Integer serviceType;
107	107
	108	+ //备注
	109	+ private String mremark;
108	110
109	111
	112	+
110	113	//就诊卡号
111	114	private String vcCardNo;
112	115
...	...	@@ -121,6 +124,15 @@
121	124
122	125	//会员截止时间
123	126	private String vipEndTime;
	127	+
	128	+
	129	+ public String getMremark() {
	130	+ return mremark;
	131	+ }
	132	+
	133	+ public void setMremark(String mremark) {
	134	+ this.mremark = mremark;
	135	+ }
124	136
125	137	public Integer getServiceStatus() {
126	138	return serviceStatus;

...	...	@@ -87,8 +87,8 @@
87	87	//助产机构
88	88	private String deliverOrg;
89	89
90		- //是否畸形 0非畸形 1畸形
91		- private Integer isMalformation;
	90	+ //是否畸形 false非畸形 true畸形
	91	+ private boolean malformation;
92	92
93	93	//apgar评分
94	94	private Map<String,String> apgar;
95	95
96	96
...	...	@@ -97,13 +97,91 @@
97	97	private String buildDoctor;
98	98	//建档日期
99	99	private String buildDate;
100		- //服务状态
	100	+ //服务类型
101	101	private String serviceType;
	102	+
	103	+ //服务状态
	104	+ private String serviceStatus;
102	105	//就诊卡号
103	106	private String vcCardNo;
104	107
105	108	private Integer hospitalId;
106	109
	110	+ //备注
	111	+ private String mremark;
	112	+
	113	+
	114	+ //体验会员 0非体验会员 1体验会员
	115	+ private boolean expVip;
	116	+
	117	+ //会员截止时间
	118	+ private String vipEndTime;
	119	+
	120	+ //高危因素
	121	+ private String highRiskReason;
	122	+
	123	+ //诊断
	124	+ private String diagnose;
	125	+
	126	+ //是否高危 0 非高危 1高危
	127	+ private boolean highRisk;
	128	+
	129	+ public String getMremark() {
	130	+ return mremark;
	131	+ }
	132	+
	133	+ public void setMremark(String mremark) {
	134	+ this.mremark = mremark;
	135	+ }
	136	+
	137	+ public String getServiceStatus() {
	138	+ return serviceStatus;
	139	+ }
	140	+
	141	+ public void setServiceStatus(String serviceStatus) {
	142	+ this.serviceStatus = serviceStatus;
	143	+ }
	144	+
	145	+ public boolean isExpVip() {
	146	+ return expVip;
	147	+ }
	148	+
	149	+ public void setExpVip(boolean expVip) {
	150	+ this.expVip = expVip;
	151	+ }
	152	+
	153	+ public String getVipEndTime() {
	154	+ return vipEndTime;
	155	+ }
	156	+
	157	+ public void setVipEndTime(String vipEndTime) {
	158	+ this.vipEndTime = vipEndTime;
	159	+ }
	160	+
	161	+ public String getHighRiskReason() {
	162	+ return highRiskReason;
	163	+ }
	164	+
	165	+ public void setHighRiskReason(String highRiskReason) {
	166	+ this.highRiskReason = highRiskReason;
	167	+ }
	168	+
	169	+ public String getDiagnose() {
	170	+ return diagnose;
	171	+ }
	172	+
	173	+ public void setDiagnose(String diagnose) {
	174	+ this.diagnose = diagnose;
	175	+ }
	176	+
	177	+ public boolean isHighRisk() {
	178	+ return highRisk;
	179	+ }
	180	+
	181	+ public void setHighRisk(boolean highRisk) {
	182	+ this.highRisk = highRisk;
	183	+ }
	184	+
107	185	public Integer getHospitalId() {
108	186	return hospitalId;
109	187	}
110	188
...	...	@@ -352,12 +430,12 @@
352	430	this.deliverOrg = deliverOrg;
353	431	}
354	432
355		- public Integer getIsMalformation() {
356		- return isMalformation;
	433	+ public boolean isMalformation() {
	434	+ return malformation;
357	435	}
358	436
359		- public void setIsMalformation(Integer isMalformation) {
360		- this.isMalformation = isMalformation;
	437	+ public void setMalformation(boolean malformation) {
	438	+ this.malformation = malformation;
361	439	}
362	440
363	441	public String getBuildDoctor() {

1	1	package com.lyms.platform.operate.web.result;
2	2
	3	+import java.util.List;
3	4	import java.util.Map;
4	5
5	6	/**
6	7
7	8
8	9
...	...	@@ -10,14 +11,16 @@
10	11	private String id;
11	12	private String name;
12	13	private String monthAge;
	14	+ private String cardNo;
13	15
14		- private Map<String,String> buildRecords;
15	16
16		- public Map<String, String> getBuildRecords() {
	17	+ private List<Map<String,String>> buildRecords;
	18	+
	19	+ public List<Map<String, String>> getBuildRecords() {
17	20	return buildRecords;
18	21	}
19	22
20		- public void setBuildRecords(Map<String, String> buildRecords) {
	23	+ public void setBuildRecords(List<Map<String, String>> buildRecords) {
21	24	this.buildRecords = buildRecords;
22	25	}
23	26
...	...	@@ -43,6 +46,14 @@
43	46
44	47	public void setMonthAge(String monthAge) {
45	48	this.monthAge = monthAge;
	49	+ }
	50	+
	51	+ public String getCardNo() {
	52	+ return cardNo;
	53	+ }
	54	+
	55	+ public void setCardNo(String cardNo) {
	56	+ this.cardNo = cardNo;
46	57	}
47	58	}

...	...	@@ -118,6 +118,18 @@
118	118	//会员截止时间
119	119	private String vipEndTime;
120	120
	121	+ //备注
	122	+ private String mremark;
	123	+
	124	+
	125	+ public String getMremark() {
	126	+ return mremark;
	127	+ }
	128	+
	129	+ public void setMremark(String mremark) {
	130	+ this.mremark = mremark;
	131	+ }
	132	+
121	133	public Integer getServiceStatus() {
122	134	return serviceStatus;
123	135	}