fangcheng / regional-platform

Commit 08b651cb7d63fe7ab4e5142ba994800fdbbcdeb1

Authored by baohanddd over 9 years ago

Merge remote-tracking branch 'origin/master'

Showing 14 changed files

platform-common/src/main/java/com/lyms/platform/common/utils/StringUtils.java
platform-dal/src/main/java/com/lyms/platform/pojo/MaternalDeliverModel.java
platform-data-api/src/main/java/com/lyms/platform/data/pojo/MessageRequest.java
platform-data-api/src/main/java/com/lyms/platform/data/util/SaveMessageService.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/controller/BookbuildingController.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/StopPregnancyController.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/BookbuildingFacade.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/BabyGuideSmsequest.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/MatDeliverAddRequest.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/MessageListRequest.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/MessageRequest.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/MaternalDeliverResult.java

...	...	@@ -32,6 +32,15 @@
32	32	return false;
33	33	}
34	34
	35	+ public static boolean isNotEmpty(String str)
	36	+ {
	37	+ if (str != null && !"".equals(str))
	38	+ {
	39	+ return true;
	40	+ }
	41	+ return false;
	42	+ }
	43	+
35	44	/**
36	45	* //+表示1个或多个（如"3"或"225"），表示0个或多个（[0-9]）（如""或"1"或"22"），
37	46	* ?表示0个或1个([0-9]?)(如""或"7")

...	...	@@ -61,13 +61,13 @@
61	61	// 脉搏
62	62	private String pulse;
63	63	// 一小时失血量
64		- private String oHloseBloodL;
	64	+ private Integer oHloseBloodL;
65	65	//二小时失血量
66		- private String tHloseBloodL;
	66	+ private Integer tHloseBloodL;
67	67	//二十四小时失血量
68		- private String rHloseBloodL;
	68	+ private Integer rHloseBloodL;
69	69	//第3产层+产后失血量
70		- private String sHloseBloodL;
	70	+ private Integer sHloseBloodL;
71	71	//失血原因
72	72	private String loseBloodCause;
73	73	//产科并发症
74	74
...	...	@@ -316,14 +316,7 @@
316	316	this.ocs = ocs;
317	317	}
318	318
319		- public String getoHloseBloodL() {
320		- return oHloseBloodL;
321		- }
322	319
323		- public void setoHloseBloodL(String oHloseBloodL) {
324		- this.oHloseBloodL = oHloseBloodL;
325		- }
326		-
327	320	public String getOperationCause() {
328	321	return operationCause;
329	322	}
330	323
331	324
332	325
...	...	@@ -380,19 +373,27 @@
380	373	this.pulse = pulse;
381	374	}
382	375
383		- public String getrHloseBloodL() {
	376	+ public Integer getoHloseBloodL() {
	377	+ return oHloseBloodL;
	378	+ }
	379	+
	380	+ public void setoHloseBloodL(Integer oHloseBloodL) {
	381	+ this.oHloseBloodL = oHloseBloodL;
	382	+ }
	383	+
	384	+ public Integer getrHloseBloodL() {
384	385	return rHloseBloodL;
385	386	}
386	387
387		- public void setrHloseBloodL(String rHloseBloodL) {
	388	+ public void setrHloseBloodL(Integer rHloseBloodL) {
388	389	this.rHloseBloodL = rHloseBloodL;
389	390	}
390	391
391		- public String getsHloseBloodL() {
	392	+ public Integer getsHloseBloodL() {
392	393	return sHloseBloodL;
393	394	}
394	395
395		- public void setsHloseBloodL(String sHloseBloodL) {
	396	+ public void setsHloseBloodL(Integer sHloseBloodL) {
396	397	this.sHloseBloodL = sHloseBloodL;
397	398	}
398	399
399	400
...	...	@@ -404,11 +405,11 @@
404	405	this.siLielevel = siLielevel;
405	406	}
406	407
407		- public String gettHloseBloodL() {
	408	+ public Integer gettHloseBloodL() {
408	409	return tHloseBloodL;
409	410	}
410	411
411		- public void settHloseBloodL(String tHloseBloodL) {
	412	+ public void settHloseBloodL(Integer tHloseBloodL) {
412	413	this.tHloseBloodL = tHloseBloodL;
413	414	}
414	415

...	...	@@ -7,16 +7,12 @@
7	7	private String phone;
8	8	private String content;
9	9	private Integer typeId;
10		- private Integer status;
11	10	private Integer subTypeId;
12	11
13		- private String tableName;
14	12
15	13	//计划发送时间
16	14	private String planTime;
17	15
18		- //实际发送时间
19		- private String actualTime;
20	16
21	17	//对象类型
22	18	private Integer objType;
23	19
24	20
...	...	@@ -24,17 +20,14 @@
24	20	//短信商
25	21	private Integer serviceType;
26	22
27		- //发送次数
28		- private Integer sendCount;
29		-
	23	+ //医院ID
30	24	private String ext1;
31	25
	26	+ //模板ID
32	27	private String ext2;
33	28
34	29	private String ext3;
35	30
36		-
37		-
38	31	public String getPhone() {
39	32	return phone;
40	33	}
...	...	@@ -59,14 +52,6 @@
59	52	this.typeId = typeId;
60	53	}
61	54
62		- public Integer getStatus() {
63		- return status;
64		- }
65		-
66		- public void setStatus(Integer status) {
67		- this.status = status;
68		- }
69		-
70	55	public Integer getSubTypeId() {
71	56	return subTypeId;
72	57	}
...	...	@@ -75,14 +60,6 @@
75	60	this.subTypeId = subTypeId;
76	61	}
77	62
78		- public String getTableName() {
79		- return tableName;
80		- }
81		-
82		- public void setTableName(String tableName) {
83		- this.tableName = tableName;
84		- }
85		-
86	63	public String getPlanTime() {
87	64	return planTime;
88	65	}
...	...	@@ -91,14 +68,6 @@
91	68	this.planTime = planTime;
92	69	}
93	70
94		- public String getActualTime() {
95		- return actualTime;
96		- }
97		-
98		- public void setActualTime(String actualTime) {
99		- this.actualTime = actualTime;
100		- }
101		-
102	71	public Integer getObjType() {
103	72	return objType;
104	73	}
...	...	@@ -113,14 +82,6 @@
113	82
114	83	public void setServiceType(Integer serviceType) {
115	84	this.serviceType = serviceType;
116		- }
117		-
118		- public Integer getSendCount() {
119		- return sendCount;
120		- }
121		-
122		- public void setSendCount(Integer sendCount) {
123		- this.sendCount = sendCount;
124	85	}
125	86
126	87	public String getExt1() {

...	...	@@ -34,7 +34,6 @@
34	34	request.setPhone("18382670032");
35	35	request.setPlanTime("2015-01-06 15:22:12");
36	36	request.setServiceType(1);
37		- request.setStatus(1);
38	37	messages.add(request);
39	38
40	39
...	...	@@ -45,7 +44,6 @@
45	44	request1.setPhone("18382670031");
46	45	request1.setPlanTime("2015-01-06 15:22:12");
47	46	request1.setServiceType(1);
48		- request1.setStatus(1);
49	47	messages.add(request1);
50	48
51	49	list.setTypeId(1);

...	...	@@ -196,6 +196,17 @@
196	196	}
197	197
198	198
	199	+ /**
	200	+ * 儿童个性化指导短信发送
	201	+ * @param request
	202	+ * @return
	203	+ */
	204	+ @RequestMapping(method = RequestMethod.POST, value = "/sendBabyGuildSms")
	205	+ @ResponseBody
	206	+ public BaseResponse babyGuildSms(@Valid @RequestBody BabyGuideSmsequest request) {
	207	+
	208	+ return babyBookbuildingFacade.sendBabyGuideSms(request);
	209	+ }
199	210
200	211
201	212

...	...	@@ -128,5 +128,17 @@
128	128	antenatalExaminationQueryRequest.setPatientId(id);
129	129	return antenatalExaminationFacade.queryAntenatalExamination(antenatalExaminationQueryRequest);
130	130	}
	131	+
	132	+
	133	+ /**
	134	+ * 建档页面基础数据
	135	+ * @return
	136	+ */
	137	+ @RequestMapping(value = "/getYunBuildBaseConfig", method = RequestMethod.GET)
	138	+ @ResponseBody
	139	+ public BaseObjectResponse getBabyBuildBaseConfig(){
	140	+ return bookbuildingFacade.getYunBuildBaseConfig();
	141	+ }
	142	+
131	143	}

...	...	@@ -54,7 +54,7 @@
54	54	* @param hospitalId 医院Id
55	55	* @return
56	56	*/
57		- @RequestMapping(method = RequestMethod.GET, value = "/queryStopPreg/{hospitalId}")
	57	+ @RequestMapping(method = RequestMethod.GET, value = "/queryInPerson/{hospitalId}")
58	58	@ResponseBody
59	59	public BaseResponse queryInPerson(@PathVariable("hospitalId")Integer hospitalId) {
60	60	return stopPregnancyFacade.queryInPerson(hospitalId);

...	...	@@ -698,10 +698,72 @@
698	698	* @return
699	699	*/
700	700	public BaseListResponse queryBabyList(BabyManageRequest request) {
701		-
702	701	BabyModelQuery babyQuery = new BabyModelQuery();
	702	+ List<BabyModel> models = getBabayListByCondition(request,true,babyQuery);
	703	+ List<BabyManageListResult> list = new ArrayList<>();
	704	+ if(CollectionUtils.isNotEmpty(models))
	705	+ {
	706	+ for(BabyModel model : models)
	707	+ {
	708	+ BabyManageListResult result = new BabyManageListResult();
	709	+ result.setId(model.getId());
	710	+ if (model.getHighRisk()== null \|\| model.getHighRisk() == 0)
	711	+ {
	712	+ result.setHighRisk("正常");
	713	+ }
	714	+ else
	715	+ {
	716	+ result.setHighRisk("高危");
	717	+ }
	718	+ result.setSex(SexTypeEnums.getTitleById(model.getSex()));
	719	+ result.setBabyName(model.getName());
	720	+ result.setBirthday(DateUtil.getyyyy_MM_dd(model.getBirth()));
	721	+ result.setMommyName(model.getMname());
	722	+ result.setMommnyPhone(model.getMphone());
	723	+ result.setServiceStatus(model.getServiceStatus() == null ? "" : ServiceStatusEnums.getNameById(model.getServiceStatus()));
	724	+ result.setNextDate(DateUtil.getyyyy_MM_dd(model.getNextDate()));
	725	+ result.setMonthAge(DateUtil.getBabyMonthAge(model.getBirth(), new Date()));
	726	+ result.setPatientId(model.getParentId());
	727	+
	728	+ String diagnose = "正常";
	729	+ if (!StringUtils.isEmpty(model.getDiagnose()))
	730	+ {
	731	+ List diagList = JsonUtil.toList(model.getDiagnose(),List.class);
	732	+ if (CollectionUtils.isNotEmpty(diagList))
	733	+ {
	734	+ diagnose = "";
	735	+ for(Object obj : diagList)
	736	+ {
	737	+ BasicConfig basicConfig = basicConfigService.getOneBasicConfigById((String)obj);
	738	+ if (basicConfig != null)
	739	+ {
	740	+ diagnose += basicConfig.getName() + " ";
	741	+ }
	742	+ }
	743	+ }
	744	+ }
	745	+ result.setDiagnose(diagnose);
	746	+ list.add(result);
	747	+ }
	748	+ }
	749	+
	750	+ BaseListResponse objectResponse = new BaseListResponse();
	751	+ objectResponse.setErrorcode(ErrorCodeConstants.SUCCESS);
	752	+ objectResponse.setData(list);
	753	+ objectResponse.setPageInfo(babyQuery.getPageInfo());
	754	+ objectResponse.setErrormsg("成功");
	755	+ return objectResponse;
	756	+ }
	757	+
	758	+
	759	+ private List<BabyModel> getBabayListByCondition(BabyManageRequest request,boolean isPage,BabyModelQuery babyQuery)
	760	+ {
	761	+
703	762	babyQuery.setYn(YnEnums.YES.getId());
704		- babyQuery.setNeed("1");
	763	+ if (isPage)
	764	+ {
	765	+ babyQuery.setNeed("true");
	766	+ }
705	767	babyQuery.setMcertNo(request.getMcardNo());
706	768	babyQuery.setCardNo(request.getBcardNo());
707	769	babyQuery.setName(request.getName());
708	770
709	771
710	772
711	773
712	774
713	775
714	776
715	777
716	778
717	779
718	780
...	...	@@ -744,65 +806,82 @@
744	806	babyQuery.setPage(request.getPage());
745	807	babyQuery.setLimit(request.getLimit());
746	808
747		- //0 非高危 1 高危 2 全部
	809	+ //0 非高危 1 高危 2 全部
748	810	if (request.getHighRiskType() != null && request.getHighRiskType() != 2)
749	811	{
750	812	babyQuery.setHighRisk(request.getHighRiskType());
751	813	}
752	814
753		- List<BabyManageListResult> list = new ArrayList<>();
754		-
755	815	List<BabyModel> models = babyBookbuildingService.queryBabyBuildByCond(babyQuery);
756	816
757		- if(CollectionUtils.isNotEmpty(models))
	817	+ return models;
	818	+ }
	819	+
	820	+ /**
	821	+ * 生成儿童指导短信
	822	+ * @param request
	823	+ * @return
	824	+ */
	825	+ public BaseResponse sendBabyGuideSms(BabyGuideSmsequest request) {
	826	+ MessageListRequest smsList = new MessageListRequest();
	827	+ List<MessageRequest> messages = new ArrayList<>();
	828	+
	829	+ List<BabyModel> sendModels = new ArrayList<>();
	830	+ if (CollectionUtils.isNotEmpty(request.getIds()))
758	831	{
759		- for(BabyModel model : models)
	832	+ List<String> ids = request.getIds();
	833	+ BabyModelQuery babyQuery = new BabyModelQuery();
	834	+ babyQuery.setYn(YnEnums.YES.getId());
	835	+ for (String id : ids)
760	836	{
761		- BabyManageListResult result = new BabyManageListResult();
762		- result.setId(model.getId());
763		- if (model.getHighRisk()== null \|\| model.getHighRisk() == 0)
	837	+ if (StringUtils.isNotEmpty(id))
764	838	{
765		- result.setHighRisk("正常");
	839	+ babyQuery.setId(id);
	840	+ List<BabyModel> models = babyBookbuildingService.queryBabyBuildByCond(babyQuery);
	841	+ if (CollectionUtils.isNotEmpty(models))
	842	+ {
	843	+ sendModels.addAll(models);
	844	+ }
766	845	}
767		- else
768		- {
769		- result.setHighRisk("高危");
770		- }
771		- result.setSex(SexTypeEnums.getTitleById(model.getSex()));
772		- result.setBabyName(model.getName());
773		- result.setBirthday(DateUtil.getyyyy_MM_dd(model.getBirth()));
774		- result.setMommyName(model.getMname());
775		- result.setMommnyPhone(model.getMphone());
776		- result.setServiceStatus(model.getServiceStatus() == null ? "" : ServiceStatusEnums.getNameById(model.getServiceStatus()));
777		- result.setNextDate(DateUtil.getyyyy_MM_dd(model.getNextDate()));
778		- result.setMonthAge(DateUtil.getBabyMonthAge(model.getBirth(), new Date()));
779		- result.setPatientId(model.getParentId());
	846	+ }
	847	+ }
	848	+ else
	849	+ {
	850	+ //按条件查询发送指导短信
	851	+ BabyModelQuery babyQuery = new BabyModelQuery();
	852	+ sendModels = getBabayListByCondition(request.getRequest(),false,babyQuery);
	853	+ }
780	854
781		- String diagnose = "正常";
782		- if (!StringUtils.isEmpty(model.getDiagnose()))
	855	+ if (CollectionUtils.isNotEmpty(sendModels))
	856	+ {
	857	+ for (BabyModel model : sendModels)
	858	+ {
	859	+ if (model != null && StringUtils.isNotEmpty(model.getMphone()))
783	860	{
784		- List diagList = JsonUtil.toList(model.getDiagnose(),List.class);
785		- if (CollectionUtils.isNotEmpty(diagList))
786		- {
787		- diagnose = "";
788		- for(Object obj : diagList)
789		- {
790		- BasicConfig basicConfig = basicConfigService.getOneBasicConfigById((String)obj);
791		- if (basicConfig != null)
792		- {
793		- diagnose += basicConfig.getName() + " ";
794		- }
795		- }
796		- }
	861	+ MessageRequest mr = new MessageRequest();
	862	+ mr.setContent(request.getSmsContent());
	863	+ mr.setObjType(ServiceObjEnums.BABYOBJ.getId());
	864	+ mr.setPhone(model.getMphone());
	865	+ //短信商
	866	+ mr.setServiceType(1);//待定
	867	+ mr.setTypeId(1); //待定
	868	+ mr.setPlanTime(DateUtil.getyyyy_MM_dd_hms(new Date()));
	869	+ mr.setSubTypeId(SmsServiceEnums.YSGXHZD.getId());
	870	+
	871	+ mr.setExt1(String.valueOf(model.getHospitalId()));
	872	+ messages.add(mr);
797	873	}
798		- result.setDiagnose(diagnose);
799		- list.add(result);
800	874	}
801	875	}
802		- BaseListResponse objectResponse = new BaseListResponse();
	876	+
	877	+ if (CollectionUtils.isNotEmpty(messages))
	878	+ {
	879	+ smsList.setTypeId(1);
	880	+ smsList.setMessages(messages);
	881	+ //调用发送接口 TODO
	882	+ }
	883	+ BaseResponse objectResponse = new BaseResponse();
803	884	objectResponse.setErrorcode(ErrorCodeConstants.SUCCESS);
804		- objectResponse.setData(list);
805		- objectResponse.setPageInfo(babyQuery.getPageInfo());
806	885	objectResponse.setErrormsg("成功");
807	886	return objectResponse;
808	887	}

...	...	@@ -458,5 +458,56 @@
458	458	objectResponse.setErrormsg("成功");
459	459	return objectResponse;
460	460	}
	461	+
	462	+ /**
	463	+ * 孕妇建档页面基础数据
	464	+ * @return
	465	+ */
	466	+ public BaseObjectResponse getYunBuildBaseConfig() {
	467	+ Map<String,List> typeMap = new HashMap<>();
	468	+
	469	+ //证件类型
	470	+ List<BasicConfigResult> pcerteTypeResult = basicConfigFacade.getBaseicConfigByParentId(SystemConfig.CERTE_TYPE_ID);
	471	+ typeMap.put("certeType", pcerteTypeResult);
	472	+
	473	+ //国籍
	474	+ List<BasicConfigResult> countiryResults = basicConfigFacade.getBaseicConfigByParentId(SystemConfig.COUNTRY_TYPE_ID);
	475	+ typeMap.put("country", countiryResults);
	476	+
	477	+ // 民族
	478	+ List<BasicConfigResult> nationResults = basicConfigFacade.getBaseicConfigByParentId(SystemConfig.NATION_TYPE_ID);
	479	+ typeMap.put("nation", nationResults);
	480	+
	481	+ // 职业类别
	482	+ List<BasicConfigResult> professionTypeResults = basicConfigFacade.getBaseicConfigByParentId(SystemConfig.PROFESSION_TYPE_ID);
	483	+ typeMap.put("professionType", professionTypeResults);
	484	+
	485	+ // 户籍类别
	486	+ List<BasicConfigResult> censusType = basicConfigFacade.getBaseicConfigByParentId(SystemConfig.CENSUS_TYPE_ID);
	487	+ typeMap.put("censusType", censusType);
	488	+
	489	+ // 户籍类别
	490	+ List<BasicConfigResult> liveType = basicConfigFacade.getBaseicConfigByParentId(SystemConfig.LIVE_TYPE_ID);
	491	+ typeMap.put("liveType", liveType);
	492	+
	493	+ //服务类型
	494	+ List serviceType = ServiceTypeEnums.getServiceTypeList();
	495	+ typeMap.put("serviceType", serviceType);
	496	+
	497	+ //服务状态
	498	+ List serviceStatus = ServiceStatusEnums.getServiceStatusList();
	499	+ typeMap.put("serviceStatus", serviceStatus);
	500	+
	501	+ //孕妇体验类型
	502	+ List expYunEnums = ExpYunEnums.getExpYunEnums();
	503	+ typeMap.put("expYunEnums", expYunEnums);
	504	+
	505	+
	506	+ BaseObjectResponse objectResponse = new BaseObjectResponse();
	507	+ objectResponse.setData(typeMap);
	508	+ objectResponse.setErrorcode(ErrorCodeConstants.SUCCESS);
	509	+ objectResponse.setErrormsg("成功");
	510	+ return objectResponse;
	511	+ }
461	512	}

	1	+package com.lyms.platform.operate.web.request;
	2	+
	3	+import com.lyms.platform.common.core.annotation.form.Form;
	4	+import com.lyms.platform.common.core.annotation.form.FormParam;
	5	+import org.hibernate.validator.constraints.NotEmpty;
	6	+
	7	+import java.util.List;
	8	+import java.util.Map;
	9	+
	10	+/**
	11	+ * 儿童健康指导短信
	12	+ * Created by lqy on 2016/6/15.
	13	+ */
	14	+@Form
	15	+public class BabyGuideSmsequest {
	16	+
	17	+
	18	+ //短信内容
	19	+ @FormParam
	20	+ @NotEmpty(message = "短信内容不能为空")
	21	+ private String smsContent;
	22	+
	23	+ //儿童IDs
	24	+ private List<String> ids;
	25	+
	26	+
	27	+ //如果批量个性化指导就把过滤条件传送到该对象中
	28	+ private BabyManageRequest request;
	29	+
	30	+ public String getSmsContent() {
	31	+ return smsContent;
	32	+ }
	33	+
	34	+ public void setSmsContent(String smsContent) {
	35	+ this.smsContent = smsContent;
	36	+ }
	37	+
	38	+ public List<String> getIds() {
	39	+ return ids;
	40	+ }
	41	+
	42	+ public void setIds(List<String> ids) {
	43	+ this.ids = ids;
	44	+ }
	45	+
	46	+ public BabyManageRequest getRequest() {
	47	+ return request;
	48	+ }
	49	+
	50	+ public void setRequest(BabyManageRequest request) {
	51	+ this.request = request;
	52	+ }
	53	+}

...	...	@@ -61,13 +61,13 @@
61	61	// 脉搏
62	62	private String pulse;
63	63	// 一小时失血量
64		- private String oHloseBloodL;
	64	+ private Integer oHloseBloodL;
65	65	//二小时失血量
66		- private String tHloseBloodL;
	66	+ private Integer tHloseBloodL;
67	67	//二十四小时失血量
68		- private String rHloseBloodL;
	68	+ private Integer rHloseBloodL;
69	69	//第3产层+产后失血量
70		- private String sHloseBloodL;
	70	+ private Integer sHloseBloodL;
71	71	//失血原因
72	72	private java.util.Map loseBloodCause;
73	73	//产科并发症
...	...	@@ -224,14 +224,6 @@
224	224
225	225
226	226
227		- public String getoHloseBloodL() {
228		- return oHloseBloodL;
229		- }
230		-
231		- public void setoHloseBloodL(String oHloseBloodL) {
232		- this.oHloseBloodL = oHloseBloodL;
233		- }
234		-
235	227	public String getOperationCause() {
236	228	return operationCause;
237	229	}
...	...	@@ -282,31 +274,6 @@
282	274	this.pulse = pulse;
283	275	}
284	276
285		- public String getrHloseBloodL() {
286		- return rHloseBloodL;
287		- }
288		-
289		- public void setrHloseBloodL(String rHloseBloodL) {
290		- this.rHloseBloodL = rHloseBloodL;
291		- }
292		-
293		- public String getsHloseBloodL() {
294		- return sHloseBloodL;
295		- }
296		-
297		- public void setsHloseBloodL(String sHloseBloodL) {
298		- this.sHloseBloodL = sHloseBloodL;
299		- }
300		-
301		-
302		-
303		- public String gettHloseBloodL() {
304		- return tHloseBloodL;
305		- }
306		-
307		- public void settHloseBloodL(String tHloseBloodL) {
308		- this.tHloseBloodL = tHloseBloodL;
309		- }
310	277
311	278
312	279

	1	+package com.lyms.platform.operate.web.request;
	2	+
	3	+import java.util.List;
	4	+
	5	+/**
	6	+ * Created by Administrator on 2016/7/5.
	7	+ */
	8	+public class MessageListRequest {
	9	+ private Integer typeId;
	10	+
	11	+ private List<MessageRequest> messages;
	12	+
	13	+ public Integer getTypeId() {
	14	+ return typeId;
	15	+ }
	16	+
	17	+ public void setTypeId(Integer typeId) {
	18	+ this.typeId = typeId;
	19	+ }
	20	+
	21	+ public List<MessageRequest> getMessages() {
	22	+ return messages;
	23	+ }
	24	+
	25	+ public void setMessages(List<MessageRequest> messages) {
	26	+ this.messages = messages;
	27	+ }
	28	+}

	1	+package com.lyms.platform.operate.web.request;
	2	+
	3	+/**
	4	+ * Created by Administrator on 2016/7/5.
	5	+ */
	6	+public class MessageRequest {
	7	+ private String phone;
	8	+ private String content;
	9	+ private Integer typeId;
	10	+ private Integer subTypeId;
	11	+
	12	+
	13	+ //计划发送时间
	14	+ private String planTime;
	15	+
	16	+
	17	+ //对象类型
	18	+ private Integer objType;
	19	+
	20	+ //短信商
	21	+ private Integer serviceType;
	22	+
	23	+ //医院ID
	24	+ private String ext1;
	25	+
	26	+ //模板ID
	27	+ private String ext2;
	28	+
	29	+ private String ext3;
	30	+
	31	+ public String getPhone() {
	32	+ return phone;
	33	+ }
	34	+
	35	+ public void setPhone(String phone) {
	36	+ this.phone = phone;
	37	+ }
	38	+
	39	+ public String getContent() {
	40	+ return content;
	41	+ }
	42	+
	43	+ public void setContent(String content) {
	44	+ this.content = content;
	45	+ }
	46	+
	47	+ public Integer getTypeId() {
	48	+ return typeId;
	49	+ }
	50	+
	51	+ public void setTypeId(Integer typeId) {
	52	+ this.typeId = typeId;
	53	+ }
	54	+
	55	+ public Integer getSubTypeId() {
	56	+ return subTypeId;
	57	+ }
	58	+
	59	+ public void setSubTypeId(Integer subTypeId) {
	60	+ this.subTypeId = subTypeId;
	61	+ }
	62	+
	63	+ public String getPlanTime() {
	64	+ return planTime;
	65	+ }
	66	+
	67	+ public void setPlanTime(String planTime) {
	68	+ this.planTime = planTime;
	69	+ }
	70	+
	71	+ public Integer getObjType() {
	72	+ return objType;
	73	+ }
	74	+
	75	+ public void setObjType(Integer objType) {
	76	+ this.objType = objType;
	77	+ }
	78	+
	79	+ public Integer getServiceType() {
	80	+ return serviceType;
	81	+ }
	82	+
	83	+ public void setServiceType(Integer serviceType) {
	84	+ this.serviceType = serviceType;
	85	+ }
	86	+
	87	+ public String getExt1() {
	88	+ return ext1;
	89	+ }
	90	+
	91	+ public void setExt1(String ext1) {
	92	+ this.ext1 = ext1;
	93	+ }
	94	+
	95	+ public String getExt2() {
	96	+ return ext2;
	97	+ }
	98	+
	99	+ public void setExt2(String ext2) {
	100	+ this.ext2 = ext2;
	101	+ }
	102	+
	103	+ public String getExt3() {
	104	+ return ext3;
	105	+ }
	106	+
	107	+ public void setExt3(String ext3) {
	108	+ this.ext3 = ext3;
	109	+ }
	110	+}

...	...	@@ -58,13 +58,13 @@
58	58	// 脉搏
59	59	private String pulse;
60	60	// 一小时失血量
61		- private String oHloseBloodL;
	61	+ private Integer oHloseBloodL;
62	62	//二小时失血量
63		- private String tHloseBloodL;
	63	+ private Integer tHloseBloodL;
64	64	//二十四小时失血量
65		- private String rHloseBloodL;
	65	+ private Integer rHloseBloodL;
66	66	//第3产层+产后失血量
67		- private String sHloseBloodL;
	67	+ private Integer sHloseBloodL;
68	68	//失血原因
69	69	private Map loseBloodCause;
70	70	//产科并发症
71	71
...	...	@@ -402,14 +402,7 @@
402	402
403	403
404	404
405		- public String getoHloseBloodL() {
406		- return oHloseBloodL;
407		- }
408	405
409		- public void setoHloseBloodL(String oHloseBloodL) {
410		- this.oHloseBloodL = oHloseBloodL;
411		- }
412		-
413	406	public String getOperationCause() {
414	407	return operationCause;
415	408	}
416	409
417	410
418	411
419	412
420	413
421	414
...	...	@@ -460,35 +453,39 @@
460	453	this.pulse = pulse;
461	454	}
462	455
463		- public String getrHloseBloodL() {
	456	+ public Integer getoHloseBloodL() {
	457	+ return oHloseBloodL;
	458	+ }
	459	+
	460	+ public void setoHloseBloodL(Integer oHloseBloodL) {
	461	+ this.oHloseBloodL = oHloseBloodL;
	462	+ }
	463	+
	464	+ public Integer getrHloseBloodL() {
464	465	return rHloseBloodL;
465	466	}
466	467
467		- public void setrHloseBloodL(String rHloseBloodL) {
	468	+ public void setrHloseBloodL(Integer rHloseBloodL) {
468	469	this.rHloseBloodL = rHloseBloodL;
469	470	}
470	471
471		- public String getsHloseBloodL() {
	472	+ public Integer getsHloseBloodL() {
472	473	return sHloseBloodL;
473	474	}
474	475
475		- public void setsHloseBloodL(String sHloseBloodL) {
	476	+ public void setsHloseBloodL(Integer sHloseBloodL) {
476	477	this.sHloseBloodL = sHloseBloodL;
477	478	}
478	479
479		- public int getSiLielevel() {
	480	+ public Integer getSiLielevel() {
480	481	return siLielevel;
481	482	}
482	483
483		- public void setSiLielevel(int siLielevel) {
484		- this.siLielevel = siLielevel;
485		- }
486		-
487		- public String gettHloseBloodL() {
	484	+ public Integer gettHloseBloodL() {
488	485	return tHloseBloodL;
489	486	}
490	487
491		- public void settHloseBloodL(String tHloseBloodL) {
	488	+ public void settHloseBloodL(Integer tHloseBloodL) {
492	489	this.tHloseBloodL = tHloseBloodL;
493	490	}
494	491