fangcheng / regional-platform

Commit f70bbda3efefd3d2883102b8bbaabbc06b1d2c6e

Authored by baohanddd over 9 years ago

Merge remote-tracking branch 'origin/master'

Showing 27 changed files

platform-biz-patient-service/src/main/java/com/lyms/platform/biz/dal/ISmsTemplateDao.java
platform-biz-patient-service/src/main/java/com/lyms/platform/biz/dal/impl/SmsTemplateDaoImpl.java
platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/SmsTemplateService.java
platform-common/src/main/java/com/lyms/platform/common/enums/SieveEnums.java
platform-dal/src/main/java/com/lyms/platform/pojo/AntExChuModel.java
platform-dal/src/main/java/com/lyms/platform/pojo/AntenatalExaminationModel.java
platform-dal/src/main/java/com/lyms/platform/pojo/MaternalDeliverModel.java
platform-dal/src/main/java/com/lyms/platform/pojo/PostReviewModel.java
platform-dal/src/main/java/com/lyms/platform/query/ReferralApplyOrderQuery.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/AntenatalExaminationController.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/MatDeliverController.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/PostReviewController.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/SieveController.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/SmsTemplateController.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntenatalExaminationFacade.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ApplyOrderFacade.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/facade/MatDeliverFacade.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PostReviewFacade.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/SmsTemplateFacade.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/result/AntData.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/AntexListResult.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/PregnantInfoResult.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/ReferralApplyOrderResult.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/SieveApplyOrderResult.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/SieveListResult.java

...	...	@@ -18,5 +18,7 @@
18	18	public List<SmsTemplateModel> querySmsTemplates(MongoQuery mongoQuery);
19	19
20	20	int queryBabyManageCount(MongoQuery mongoQuery);
	21	+
	22	+ void deleteTempById(String id);
21	23	}

...	...	@@ -33,5 +33,12 @@
33	33	public int queryBabyManageCount(MongoQuery mongoQuery) {
34	34	return (int) count(mongoQuery.convertToMongoQuery());
35	35	}
	36	+
	37	+ @Override
	38	+ public void deleteTempById(String id) {
	39	+ MongoCondition condition = MongoCondition.newInstance();
	40	+ condition = condition.and("id", id, MongoOper.IS);
	41	+ delete(condition.toMongoQuery().convertToMongoQuery());
	42	+ }
36	43	}

...	...	@@ -40,9 +40,10 @@
40	40	}
41	41
42	42	public void deleteTempById(String id) {
43		- SmsTemplateModel model = new SmsTemplateModel();
44		- model.setYn(YnEnums.NO.getId());
45		- smsTemplateDao.updateSmsTemplate(model,id);
	43	+// SmsTemplateModel model = new SmsTemplateModel();
	44	+// model.setYn(YnEnums.NO.getId());
	45	+// smsTemplateDao.updateSmsTemplate(model,id);
	46	+ smsTemplateDao.deleteTempById(id);
46	47	}
47	48	}

...	...	@@ -13,6 +13,39 @@
13	13	=id;
14	14	this.name=name;
15	15	}
	16	+ public enum NotifyEnums{
	17	+ O("未通知",0),O1("已通知",1);
	18	+ private NotifyEnums(String name,Integer id){
	19	+ this.name=name;
	20	+ this.id=id;
	21	+ }
	22	+ private Integer id;
	23	+ private String name;
	24	+
	25	+ public Integer getId() {
	26	+ return id;
	27	+ }
	28	+
	29	+ public void setId(Integer id) {
	30	+ this.id = id;
	31	+ }
	32	+
	33	+ public String getName() {
	34	+ return name;
	35	+ }
	36	+
	37	+ public void setName(String name) {
	38	+ this.name = name;
	39	+ }
	40	+ public static String getTitle(Integer id){
	41	+ for(NotifyEnums enums:values()){
	42	+ if(id==enums.getId()){
	43	+ return enums.getName();
	44	+ }
	45	+ }
	46	+ return null;
	47	+ }
	48	+ }
16	49	private Integer id;
17	50	private String name;
18	51

...	...	@@ -85,6 +85,15 @@
85	85	//附件
86	86	private String fujian;
87	87	private Date created;
	88	+ private String hospitalId;
	89	+
	90	+ public String getHospitalId() {
	91	+ return hospitalId;
	92	+ }
	93	+
	94	+ public void setHospitalId(String hospitalId) {
	95	+ this.hospitalId = hospitalId;
	96	+ }
88	97
89	98	public String getCervical() {
90	99	return cervical;

...	...	@@ -89,6 +89,16 @@
89	89	private Integer yn;
90	90	private Date created;
91	91
	92	+ private String hospitalId;
	93	+
	94	+ public String getHospitalId() {
	95	+ return hospitalId;
	96	+ }
	97	+
	98	+ public void setHospitalId(String hospitalId) {
	99	+ this.hospitalId = hospitalId;
	100	+ }
	101	+
92	102	public String getTypeYc() {
93	103	return typeYc;
94	104	}

...	...	@@ -97,6 +97,15 @@
97	97	private Integer yn;
98	98	private Date created;
99	99	private Date modified;
	100	+ private String hospitalId;
	101	+
	102	+ public String getHospitalId() {
	103	+ return hospitalId;
	104	+ }
	105	+
	106	+ public void setHospitalId(String hospitalId) {
	107	+ this.hospitalId = hospitalId;
	108	+ }
100	109
101	110	public Date getCreated() {
102	111	return created;

...	...	@@ -87,6 +87,15 @@
87	87	private Integer yn;
88	88	private Date created;
89	89	private Date modified;
	90	+ private String hospitalId;
	91	+
	92	+ public String getHospitalId() {
	93	+ return hospitalId;
	94	+ }
	95	+
	96	+ public void setHospitalId(String hospitalId) {
	97	+ this.hospitalId = hospitalId;
	98	+ }
90	99
91	100	public String getBasin() {
92	101	return basin;

...	...	@@ -12,6 +12,8 @@
12	12	*/
13	13	public class ReferralApplyOrderQuery extends BaseQuery implements IConvertToNativeQuery {
14	14
	15	+ private String id;
	16	+
15	17	private String parentId;
16	18
17	19	/**
18	20
...	...	@@ -72,11 +74,22 @@
72	74	this.transferredHospital = transferredHospital;
73	75	}
74	76
	77	+ public String getId() {
	78	+ return id;
	79	+ }
	80	+
	81	+ public void setId(String id) {
	82	+ this.id = id;
	83	+ }
	84	+
75	85	@Override
76	86	public MongoQuery convertToQuery() {
77	87	MongoCondition condition = MongoCondition.newInstance();
78	88	if(null!=parentId){
79	89	condition=condition.and("parentId",parentId, MongoOper.IS);
	90	+ }
	91	+ if(null!=id){
	92	+ condition=condition.and("id",id, MongoOper.IS);
80	93	}
81	94	if(null!=name){
82	95	condition=condition.and("name",name, MongoOper.IS);

1	1	package com.lyms.platform.operate.web.controller;
2	2
	3	+import com.lyms.platform.common.annotation.TokenRequired;
3	4	import com.lyms.platform.common.base.BaseController;
	5	+import com.lyms.platform.common.base.LoginContext;
4	6	import com.lyms.platform.common.constants.ErrorCodeConstants;
5	7	import com.lyms.platform.common.result.BaseResponse;
6	8	import com.lyms.platform.operate.web.facade.AntenatalExaminationFacade;
...	...	@@ -13,6 +15,7 @@
13	15	import org.springframework.web.bind.annotation.RequestMethod;
14	16	import org.springframework.web.bind.annotation.ResponseBody;
15	17
	18	+import javax.servlet.http.HttpServletRequest;
16	19	import javax.validation.Valid;
17	20
18	21	/**
...	...	@@ -49,8 +52,10 @@
49	52	*/
50	53	@RequestMapping(method = RequestMethod.POST, value = "/antexmanage")
51	54	@ResponseBody
52		- public BaseResponse addOneAntenatalExamination(@Valid @RequestBody AntExAddRequest antExAddRequest) {
53		- return antenatalExaminationFacade.addOneAntEx(antExAddRequest);
	55	+ @TokenRequired
	56	+ public BaseResponse addOneAntenatalExamination(@Valid @RequestBody AntExAddRequest antExAddRequest,HttpServletRequest request) {
	57	+ LoginContext loginState = (LoginContext) request.getAttribute("loginContext");
	58	+ return antenatalExaminationFacade.addOneAntEx(antExAddRequest,loginState.getId());
54	59	}
55	60
56	61	/**
...	...	@@ -61,8 +66,10 @@
61	66	*/
62	67	@RequestMapping(method = RequestMethod.POST, value = "/antex")
63	68	@ResponseBody
64		- public BaseResponse addOneAntEx(@Valid @RequestBody AntExcAddRequest antExcAddRequest) {
65		- return antenatalExaminationFacade.addOneAnetExChu(antExcAddRequest);
	69	+ @TokenRequired
	70	+ public BaseResponse addOneAntEx(@Valid @RequestBody AntExcAddRequest antExcAddRequest,HttpServletRequest request) {
	71	+ LoginContext loginState = (LoginContext) request.getAttribute("loginContext");
	72	+ return antenatalExaminationFacade.addOneAnetExChu(antExcAddRequest,loginState.getId());
66	73	}
67	74
68	75

1	1	package com.lyms.platform.operate.web.controller;
2	2
	3	+import com.lyms.platform.common.annotation.TokenRequired;
3	4	import com.lyms.platform.common.base.BaseController;
	5	+import com.lyms.platform.common.base.LoginContext;
4	6	import com.lyms.platform.common.constants.ErrorCodeConstants;
5	7	import com.lyms.platform.common.result.BaseResponse;
6	8	import com.lyms.platform.operate.web.facade.MatDeliverFacade;
...	...	@@ -11,6 +13,7 @@
11	13	import org.springframework.stereotype.Controller;
12	14	import org.springframework.web.bind.annotation.*;
13	15
	16	+import javax.servlet.http.HttpServletRequest;
14	17	import javax.validation.Valid;
15	18
16	19	/**
...	...	@@ -47,8 +50,10 @@
47	50	*/
48	51	@RequestMapping(value = "/matdel",method = RequestMethod.POST)
49	52	@ResponseBody
50		- public BaseResponse addOneMatDeliver(@Valid @RequestBody MatDeliverAddRequest deliverAddRequest){
51		- return matDeliverFacade.addOrUpdateMatDeliver(deliverAddRequest);
	53	+ @TokenRequired
	54	+ public BaseResponse addOneMatDeliver(@Valid @RequestBody MatDeliverAddRequest deliverAddRequest,HttpServletRequest request){
	55	+ LoginContext loginState = (LoginContext) request.getAttribute("loginContext");
	56	+ return matDeliverFacade.addOrUpdateMatDeliver(deliverAddRequest,loginState.getId());
52	57	}
53	58	/**
54	59	* 删除一条删除记录

1	1	package com.lyms.platform.operate.web.controller;
2	2
	3	+import com.lyms.platform.common.annotation.TokenRequired;
3	4	import com.lyms.platform.common.base.BaseController;
	5	+import com.lyms.platform.common.base.LoginContext;
4	6	import com.lyms.platform.common.constants.ErrorCodeConstants;
5	7	import com.lyms.platform.common.result.BaseResponse;
6	8	import com.lyms.platform.operate.web.facade.PostReviewFacade;
...	...	@@ -11,6 +13,7 @@
11	13	import org.springframework.stereotype.Controller;
12	14	import org.springframework.web.bind.annotation.*;
13	15
	16	+import javax.servlet.http.HttpServletRequest;
14	17	import javax.validation.Valid;
15	18
16	19	/**
...	...	@@ -32,8 +35,10 @@
32	35	*/
33	36	@RequestMapping(method = RequestMethod.POST,value = "/postreview")
34	37	@ResponseBody
35		- public BaseResponse addPostReview(@Valid @RequestBody PostReviewRequest postReviewRequest){
36		- return postReviewFacade.addPostReview(postReviewRequest);
	38	+ @TokenRequired
	39	+ public BaseResponse addPostReview(@Valid @RequestBody PostReviewRequest postReviewRequest,HttpServletRequest request){
	40	+ LoginContext loginState = (LoginContext) request.getAttribute("loginContext");
	41	+ return postReviewFacade.addPostReview(postReviewRequest,loginState.getId());
37	42	}
38	43
39	44	/**

...	...	@@ -66,6 +66,7 @@
66	66	map.put("getCqResult",getCqResult());
67	67	map.put("getSieveEnums",getSieveEnums());
68	68	map.put("getRenShenJieJuEnums",getRenShenJieJuEnums());
	69	+ map.put("getNotify",getNotify());
69	70	return new BaseObjectResponse().setData(map).setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("成功"); }
70	71	//产前诊断结果
71	72	public List<Object> getChanQResultEnums() {
...	...	@@ -78,7 +79,16 @@
78	79	}
79	80	return list;
80	81	}
81		-
	82	+ public List<Object> getNotify(){
	83	+ List<Object> list = new ArrayList<>();
	84	+ for (SieveEnums.NotifyEnums enums : SieveEnums.NotifyEnums.values()) {
	85	+ Map<String, Object> resultMap = new HashMap<>();
	86	+ resultMap.put("id", enums.getId());
	87	+ resultMap.put("name", enums.getName());
	88	+ list.add(resultMap);
	89	+ }
	90	+ return list;
	91	+ }
82	92	//产前诊断结果
83	93	public List<Object> getCqResult() {
84	94	List<Object> list = new ArrayList<>();

...	...	@@ -84,7 +84,7 @@
84	84	* @param id
85	85	* @return
86	86	*/
87		- @RequestMapping(method = RequestMethod.GET, value = "/deleteTempById/{id}")
	87	+ @RequestMapping(method = RequestMethod.DELETE, value = "/deleteTempById/{id}")
88	88	@ResponseBody
89	89	public BaseResponse deleteTempById(@PathVariable("id") String id) {
90	90	return smsTemplateFacade.deleteTempById(id);

...	...	@@ -49,6 +49,8 @@
49	49	private MatDeliverService matDeliverService;
50	50	@Autowired
51	51	private PostReviewService postReviewService;
	52	+ @Autowired
	53	+ private AutoMatchFacade autoMatchFacade;
52	54
53	55	/**
54	56	* 增加一条产前检查
55	57
56	58
...	...	@@ -56,14 +58,19 @@
56	58	* @param antExAddRequest
57	59	* @return
58	60	*/
59		- public BaseResponse addOneAntEx(AntExAddRequest antExAddRequest) {
	61	+ public BaseResponse addOneAntEx(AntExAddRequest antExAddRequest,Integer userId) {
60	62	if (StringUtils.isNotEmpty(antExAddRequest.getId())) {
61	63	AntenatalExaminationModel antenatalExamination = antExAddRequest.convertToDataModel();
	64	+ antenatalExamination.setHospitalId(autoMatchFacade.matchOrgId(userId).get(0)+"");
62	65	antenatalExaminationService.updateOneAnt(antenatalExamination, antExAddRequest.getId());
63	66	updateApplyOrder(antenatalExamination, antExAddRequest.getParentId());
64	67	} else {
65	68	AntenatalExaminationModel model = antExAddRequest.convertToDataModel();
66	69	model.setYn(YnEnums.YES.getId());
	70	+ List list1 = autoMatchFacade.matchOrgId(userId);
	71	+ if(CollectionUtils.isNotEmpty(list1)){
	72	+ model.setHospitalId(list1.get(0)+"");
	73	+ }
67	74	antenatalExaminationService.addOneBabyAnt(model);
68	75	updateApplyOrder(model, antExAddRequest.getParentId());
69	76	}
70	77
...	...	@@ -93,11 +100,15 @@
93	100	* @param excAddRequest
94	101	* @return
95	102	*/
96		- public BaseResponse addOneAnetExChu(AntExcAddRequest excAddRequest) {
	103	+ public BaseResponse addOneAnetExChu(AntExcAddRequest excAddRequest,Integer userId) {
97	104	AntExChuModel antExChuModel = excAddRequest.convertToDataModel();
98	105	if (StringUtils.isNotEmpty(antExChuModel.getId()) && StringUtils.isNotEmpty(antExChuModel.getParentId())) {
99	106	antenatalExaminationService.updateAntExChu(antExChuModel, antExChuModel.getId());
100	107	} else {
	108	+ List list1 = autoMatchFacade.matchOrgId(userId);
	109	+ if(CollectionUtils.isNotEmpty(list1)){
	110	+ antExChuModel.setHospitalId(list1.get(0)+"");
	111	+ }
101	112	antExChuModel.setYn(YnEnums.YES.getId());
102	113	antenatalExaminationService.addOneAntEx(antExChuModel);
103	114	}
...	...	@@ -128,7 +139,8 @@
128	139	matDeliverQuery.setYn(YnEnums.YES.getId());
129	140	matDeliverQuery.setParentId(patients.getId());
130	141	//建档记录
131		- data.add(new AntData(patients));
	142	+ Organization organization = organizationService.getOrganization(patients.getHospitalId());
	143	+ data.add(new AntData(patients, null != organization ? organization.getName() : ""));
132	144	//分娩记录
133	145	List<MaternalDeliverModel> modelList = matDeliverService.query(matDeliverQuery);
134	146	String dueDate = "";
...	...	@@ -148,7 +160,8 @@
148	160	List<AntExChuModel> antExChuModels = antenatalExaminationService.queryAntExChu(antExChuQuery);
149	161	if (CollectionUtils.isNotEmpty(antExChuModels)) {
150	162	for (AntExChuModel an : antExChuModels) {
151		- data.add(new AntData(an));
	163	+ organization = organizationService.getOrganization(Integer.valueOf(an.getHospitalId()));
	164	+ data.add(new AntData(an,null != organization ? organization.getName() : ""));
152	165	}
153	166	}
154	167	//复诊记录
155	168
156	169
157	170
...	...	@@ -160,26 +173,33 @@
160	173	List<AntenatalExaminationModel> list1 = antenatalExaminationService.queryAntenatalExamination(antExQuery.convertToQuery());
161	174	if (CollectionUtils.isNotEmpty(list1)) {
162	175	for (AntenatalExaminationModel an : list1) {
163		- data.add(new AntData(an));
	176	+ organization = organizationService.getOrganization(Integer.valueOf(an.getHospitalId()));
	177	+ data.add(new AntData(an,null != organization ? organization.getName() : ""));
164	178	}
165	179	}
166	180	postReviewQuery = new PostReviewQuery();
167	181	postReviewQuery.setYn(YnEnums.YES.getId());
168		- postReviewQuery.setStart(date);
169		- //下次建档记录前都是产后复查
170		- postReviewQuery.setEnd(list.size() - 1 > i ? list.get(i).getCreated() : new Date());
	182	+ if (list.size() - 1 > i) {
	183	+ postReviewQuery.setStart(date);
	184	+ //下次建档记录前都是产后复查,如果没有下个产程的数据就直接显示
	185	+// postReviewQuery.setEnd(list.size() - 1 > i ? list.get(i).getCreated() :null/* new Date()*/);
	186	+ postReviewQuery.setEnd(list.get(i).getCreated());
	187	+ }
	188	+
171	189	postReviewQuery.setParentId(patients.getId());
172	190	}
173	191	i++;
174	192	//分娩记录
175	193	if (CollectionUtils.isNotEmpty(modelList)) {
176		- data.add(new AntData(modelList.get(0), patients.getLastMenses()));
	194	+ organization = organizationService.getOrganization(Integer.valueOf(modelList.get(0).getHospitalId()));
	195	+ data.add(new AntData(modelList.get(0), patients.getLastMenses(),null != organization ? organization.getName() : ""));
177	196	}
178	197	//产后复查记录
179	198	List<PostReviewModel> reviewModels = postReviewService.findWithList(postReviewQuery);
180	199	if (CollectionUtils.isNotEmpty(reviewModels)) {
181	200	for (PostReviewModel postReviewModel : reviewModels) {
182		- data.add(new AntData(postReviewModel));
	201	+ organization = organizationService.getOrganization(Integer.valueOf(postReviewModel.getHospitalId()));
	202	+ data.add(new AntData(postReviewModel,null != organization ? organization.getName() : ""));
183	203	}
184	204	}
185	205	listDate.add(data);
186	206
187	207
...	...	@@ -326,13 +346,13 @@
326	346	antenatalExaminationResult.setDiagnosis(queryRisk(list));
327	347	} catch (Exception e) {
328	348	}
329		- ReferralApplyOrderQuery referralApplyOrderQuery=new ReferralApplyOrderQuery();
	349	+ ReferralApplyOrderQuery referralApplyOrderQuery = new ReferralApplyOrderQuery();
330	350	referralApplyOrderQuery.setParentId(examinationModel.getParentId());
331	351	antenatalExaminationResult.setHasRefer(CollectionUtils.isEmpty(applyOrderService.queryReferralApplyOrderWithQuery(referralApplyOrderQuery)) ? 0 : 1);
332		- SieveApplyOrderQuery applyOrderQuery=new SieveApplyOrderQuery();
	352	+ SieveApplyOrderQuery applyOrderQuery = new SieveApplyOrderQuery();
333	353	applyOrderQuery.setParentId(examinationModel.getParentId());
334	354	applyOrderQuery.setYn(YnEnums.YES.getId());
335		- antenatalExaminationResult.setHasSieve(CollectionUtils.isEmpty(applyOrderService.querySieveApplyOrderWithQuery(applyOrderQuery))?0:1);
	355	+ antenatalExaminationResult.setHasSieve(CollectionUtils.isEmpty(applyOrderService.querySieveApplyOrderWithQuery(applyOrderQuery)) ? 0 : 1);
336	356	object = antenatalExaminationResult;
337	357	} else {
338	358	//查询初诊数据
339	359
340	360
...	...	@@ -356,13 +376,13 @@
356	376	antexChuResult.setHighrisk(queryRisk(list1));
357	377	} catch (Exception e) {
358	378	}
359		- ReferralApplyOrderQuery referralApplyOrderQuery=new ReferralApplyOrderQuery();
	379	+ ReferralApplyOrderQuery referralApplyOrderQuery = new ReferralApplyOrderQuery();
360	380	referralApplyOrderQuery.setParentId(antExChuModel.getParentId());
361	381	antexChuResult.setHasRefer(CollectionUtils.isEmpty(applyOrderService.queryReferralApplyOrderWithQuery(referralApplyOrderQuery)) ? 0 : 1);
362		- SieveApplyOrderQuery applyOrderQuery=new SieveApplyOrderQuery();
	382	+ SieveApplyOrderQuery applyOrderQuery = new SieveApplyOrderQuery();
363	383	applyOrderQuery.setParentId(antExChuModel.getParentId());
364	384	applyOrderQuery.setYn(YnEnums.YES.getId());
365		- antexChuResult.setHasSieve(CollectionUtils.isEmpty(applyOrderService.querySieveApplyOrderWithQuery(applyOrderQuery))?0:1);
	385	+ antexChuResult.setHasSieve(CollectionUtils.isEmpty(applyOrderService.querySieveApplyOrderWithQuery(applyOrderQuery)) ? 0 : 1);
366	386	object = antexChuResult;
367	387	}
368	388

...	...	@@ -3,6 +3,7 @@
3	3	import com.lyms.platform.biz.service.ApplyOrderService;
4	4	import com.lyms.platform.biz.service.PatientsService;
5	5	import com.lyms.platform.common.constants.ErrorCodeConstants;
	6	+import com.lyms.platform.common.enums.YnEnums;
6	7	import com.lyms.platform.common.result.BaseListResponse;
7	8	import com.lyms.platform.common.result.BaseObjectResponse;
8	9	import com.lyms.platform.common.result.BaseResponse;
...	...	@@ -11,6 +12,8 @@
11	12	import com.lyms.platform.operate.web.request.ReferralApplyOrderAddRequest;
12	13	import com.lyms.platform.operate.web.request.SieveApplyOrderAddRequest;
13	14	import com.lyms.platform.operate.web.result.ApplyOrderOutResult;
	15	+import com.lyms.platform.operate.web.result.ReferralApplyOrderResult;
	16	+import com.lyms.platform.operate.web.result.SieveApplyOrderResult;
14	17	import com.lyms.platform.pojo.Patients;
15	18	import com.lyms.platform.pojo.ReferralApplyOrderModel;
16	19	import com.lyms.platform.pojo.SieveApplyOrderModel;
17	20
18	21
...	...	@@ -89,12 +92,15 @@
89	92	* @param id
90	93	* @return
91	94	*/
92		- public BaseListResponse queryReferralApplyOrder(String id) {
	95	+ public BaseObjectResponse queryReferralApplyOrder(String id) {
93	96	ReferralApplyOrderQuery referralApplyOrderQuery = new ReferralApplyOrderQuery();
94		- referralApplyOrderQuery.setParentId(id);
	97	+ referralApplyOrderQuery.setId(id);
95	98	List<ReferralApplyOrderModel> list = applyOrderService.queryReferralApplyOrderWithQuery(referralApplyOrderQuery);
96		-
97		- return new BaseListResponse().setData(list).setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("成功");
	99	+ ReferralApplyOrderResult referralApplyOrderResult=new ReferralApplyOrderResult();
	100	+ if(CollectionUtils.isNotEmpty(list)){
	101	+ referralApplyOrderResult.convertToResult(list.get(0));
	102	+ }
	103	+ return new BaseObjectResponse().setData(referralApplyOrderResult).setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("成功");
98	104	}
99	105
100	106	/**
101	107
102	108
...	...	@@ -103,10 +109,19 @@
103	109	* @param id
104	110	* @return
105	111	*/
106		- public BaseListResponse querySieveApplyOrder(String id) {
	112	+ public BaseResponse querySieveApplyOrder(String id) {
107	113	SieveApplyOrderQuery sieveApplyOrderQuery = new SieveApplyOrderQuery();
	114	+ sieveApplyOrderQuery.setYn(YnEnums.YES.getId());
	115	+ sieveApplyOrderQuery.setId(id);
108	116	List<SieveApplyOrderModel> list = applyOrderService.querySieveApplyOrderWithQuery(sieveApplyOrderQuery);
109		- return new BaseListResponse().setData(list).setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("成功");
	117	+ SieveApplyOrderResult sieveApplyOrderResult = new SieveApplyOrderResult();
	118	+ SieveApplyOrderModel sieveApplyOrderModel = null;
	119	+ if (CollectionUtils.isNotEmpty(list)) {
	120	+ sieveApplyOrderModel = list.get(0);
	121	+ Patients patients =patientsService.findOnePatientById(sieveApplyOrderModel.getParentId());
	122	+ sieveApplyOrderResult.convertToResult(sieveApplyOrderModel,patients);
	123	+ }
	124	+ return new BaseObjectResponse().setData(sieveApplyOrderResult).setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("成功");
110	125	}
111	126
112	127	/**

...	...	@@ -435,7 +435,7 @@
435	435	result.setHusbandAreaRegisterId(p.getHareaRegisterId());
436	436	result.setHusbandStreetRegisterId(p.getHstreetRegisterId());
437	437
438		- result.setServiceStatus(p.getServiceStatus());
	438	+ result.setServiceStatus(p.getServiceStatus() == null ? "" : String.valueOf(p.getServiceStatus()));
439	439	result.setVipEndTime(DateUtil.getyyyy_MM_dd(p.getVipEndTime()));
440	440	result.setExpVip(p.getExpVip());
441	441	result.setMremark(p.getMremark());
...	...	@@ -448,7 +448,7 @@
448	448	result.setVcCardNo(p.getVcCardNo());
449	449	result.setBookbuildingDoctor(p.getBookbuildingDoctor());
450	450	result.setBookbuildingDate(DateUtil.getyyyy_MM_dd(p.getBookbuildingDate()));
451		- result.setServiceType(p.getServiceType());
	451	+ result.setServiceType(p.getServiceType() == null ? "" : String.valueOf(p.getServiceType()));
452	452
453	453	result.setExpType(p.getExpType());
454	454	}

...	...	@@ -47,6 +47,8 @@
47	47	private AntenatalExaminationService antenatalExaminationService;
48	48	@Autowired
49	49	private BasicConfigService basicConfigService;
	50	+ @Autowired
	51	+ private AutoMatchFacade autoMatchFacade;
50	52
51	53
52	54	/**
...	...	@@ -55,7 +57,7 @@
55	57	* @param deliverAddRequest
56	58	* @return
57	59	*/
58		- public BaseResponse addOrUpdateMatDeliver(MatDeliverAddRequest deliverAddRequest) {
	60	+ public BaseResponse addOrUpdateMatDeliver(MatDeliverAddRequest deliverAddRequest,Integer userId) {
59	61	//增加
60	62	if (StringUtils.isEmpty(deliverAddRequest.getId()) && StringUtils.isNotEmpty(deliverAddRequest.getParentId())) {
61	63	MaternalDeliverModel maternalDeliverModel = deliverAddRequest.convertToDataModel();
...	...	@@ -86,7 +88,10 @@
86	88	babyIds.add(babyService.addOneBaby(babyModel).getId());
87	89	}
88	90	}
89		-
	91	+ List list1 = autoMatchFacade.matchOrgId(userId);
	92	+ if(CollectionUtils.isNotEmpty(list1)){
	93	+ maternalDeliverModel.setHospitalId(list1.get(0)+"");
	94	+ }
90	95	maternalDeliverModel.setBaby(babyIds);
91	96	maternalDeliverModel.setYn(YnEnums.YES.getId());
92	97	matDeliverService.addMatDeliver(maternalDeliverModel);

...	...	@@ -39,10 +39,18 @@
39	39	private PatientsService patientsService;
40	40	@Autowired
41	41	private MatDeliverService matDeliverService;
	42	+ @Autowired
	43	+ private AutoMatchFacade autoMatchFacade;
42	44
43		- public BaseResponse addPostReview(PostReviewRequest postReviewRequest) {
	45	+ public BaseResponse addPostReview(PostReviewRequest postReviewRequest,Integer userId) {
44	46	if (StringUtils.isEmpty(postReviewRequest.getId())) {
45		- postReviewService.addPostReview(postReviewRequest.convertToDataModel());
	47	+ PostReviewModel postReviewModel = postReviewRequest.convertToDataModel();
	48	+ postReviewModel.setYn(YnEnums.YES.getId());
	49	+ List list1 = autoMatchFacade.matchOrgId(userId);
	50	+ if(CollectionUtils.isNotEmpty(list1)){
	51	+ postReviewModel.setHospitalId(list1.get(0)+"");
	52	+ }
	53	+ postReviewService.addPostReview(postReviewModel);
46	54	} else {
47	55	postReviewService.updatePostById(postReviewRequest.convertToDataModel(), postReviewRequest.getId());
48	56	}

...	...	@@ -35,7 +35,10 @@
35	35	SmsTemplateModel model = getSmsTemplateModel(request);
36	36	model.setModified(new Date());
37	37
38		- smsTemplateService.updateSmsTemplate(model, request.getId());
	38	+ smsTemplateService.deleteTempById(request.getId());
	39	+ model.setId(request.getId());
	40	+ smsTemplateService.addSmsTemplate(model);
	41	+ //smsTemplateService.updateSmsTemplate(model, request.getId());
39	42
40	43	BaseResponse objectResponse = new BaseResponse();
41	44	objectResponse.setErrorcode(ErrorCodeConstants.SUCCESS);
...	...	@@ -213,6 +216,7 @@
213	216	result.put("sendDate",str);
214	217	result.put("sendTimes", SendTimeEnums.getNameById(temp.getSendTimeType()));
215	218	result.put("status",(temp.getStatus() == null \|\| temp.getStatus() == 0 ) ? "未启用" : "启用");
	219	+ result.put("model",getSmsTemplateResult(temp));
216	220	results.add(result);
217	221	}
218	222	}

...	...	@@ -88,6 +88,38 @@
88	88	this.extPlacentas = extPlacentas;
89	89	}
90	90
	91	+ public Integer getoHloseBloodL() {
	92	+ return oHloseBloodL;
	93	+ }
	94	+
	95	+ public void setoHloseBloodL(Integer oHloseBloodL) {
	96	+ this.oHloseBloodL = oHloseBloodL;
	97	+ }
	98	+
	99	+ public Integer getrHloseBloodL() {
	100	+ return rHloseBloodL;
	101	+ }
	102	+
	103	+ public void setrHloseBloodL(Integer rHloseBloodL) {
	104	+ this.rHloseBloodL = rHloseBloodL;
	105	+ }
	106	+
	107	+ public Integer getsHloseBloodL() {
	108	+ return sHloseBloodL;
	109	+ }
	110	+
	111	+ public void setsHloseBloodL(Integer sHloseBloodL) {
	112	+ this.sHloseBloodL = sHloseBloodL;
	113	+ }
	114	+
	115	+ public Integer gettHloseBloodL() {
	116	+ return tHloseBloodL;
	117	+ }
	118	+
	119	+ public void settHloseBloodL(Integer tHloseBloodL) {
	120	+ this.tHloseBloodL = tHloseBloodL;
	121	+ }
	122	+
91	123	@Override
92	124	public MaternalDeliverModel convertToDataModel() {
93	125	MaternalDeliverModel maternalDeliverModel=new MaternalDeliverModel();

...	...	@@ -13,6 +13,25 @@
13	13	//1 建档 2初诊 3 复诊 4 产后分娩 5 产后复查
14	14	private String type;
15	15
	16	+ private String hospitalName;
	17	+ private String hospitalId;
	18	+
	19	+ public String getHospitalId() {
	20	+ return hospitalId;
	21	+ }
	22	+
	23	+ public void setHospitalId(String hospitalId) {
	24	+ this.hospitalId = hospitalId;
	25	+ }
	26	+
	27	+ public String getHospitalName() {
	28	+ return hospitalName;
	29	+ }
	30	+
	31	+ public void setHospitalName(String hospitalName) {
	32	+ this.hospitalName = hospitalName;
	33	+ }
	34	+
16	35	public String getType() {
17	36	return type;
18	37	}
19	38
20	39
...	...	@@ -29,15 +48,17 @@
29	48	this.title = title;
30	49	}
31	50
32		- public AntData(AntenatalExaminationModel model) {
	51	+ public AntData(AntenatalExaminationModel model,String hospitalName) {
33	52	this.id = model.getId();
34	53	this.dueWeek = model.getCurrentDueDate();
35	54	this.checkTime = model.getCheckDate();
36	55	this.title="复诊";
37	56	this.type="3";
	57	+ this.hospitalName=hospitalName;
	58	+ this.hospitalId=model.getHospitalId();
38	59	}
39	60
40		- public AntData(AntExChuModel model) {
	61	+ public AntData(AntExChuModel model,String hospitalName) {
41	62	this.id = model.getId();
42	63	int days = DateUtil.daysBetween(model.getLastMenses(), new Date());
43	64	String week = (days / 7) + "";
44	65
...	...	@@ -46,9 +67,11 @@
46	67	this.checkTime = model.getCheckTime();
47	68	this.title="初诊";
48	69	this.type="2";
	70	+ this.hospitalName=hospitalName;
	71	+ this.hospitalId=model.getHospitalId();
49	72	}
50	73
51		- public AntData(Patients model) {
	74	+ public AntData(Patients model,String hospitalName) {
52	75	this.id = model.getId();
53	76	int days = DateUtil.daysBetween(model.getLastMenses(), new Date());
54	77	String week = (days / 7) + "";
55	78
...	...	@@ -57,9 +80,11 @@
57	80	this.checkTime = DateUtil.getyyyy_MM_dd(model.getCreated());
58	81	this.title="孕妇建档";
59	82	this.type="1";
	83	+ this.hospitalName=hospitalName;
	84	+ this.hospitalId=model.getHospitalId()+"";
60	85	}
61	86
62		- public AntData(MaternalDeliverModel model,Date lastMenses) {
	87	+ public AntData(MaternalDeliverModel model,Date lastMenses,String hospitalName) {
63	88	this.id = model.getId();
64	89	int days = DateUtil.daysBetween(lastMenses,model.getCreated());
65	90	String week = (days / 7) + "";
66	91
67	92
...	...	@@ -68,14 +93,18 @@
68	93	this.checkTime = DateUtil.getyyyy_MM_dd(model.getCreated());
69	94	this.title="孕妇分娩";
70	95	this.type="4";
	96	+ this.hospitalName=hospitalName;
	97	+ this.hospitalId=model.getHospitalId();
71	98	}
72	99
73		- public AntData(PostReviewModel postReviewModel) {
	100	+ public AntData(PostReviewModel postReviewModel,String hospitalName) {
74	101	this.id=postReviewModel.getId();
75	102	this.dueWeek=postReviewModel.getDay();
76	103	this.checkTime=postReviewModel.getCheckTime();
77	104	this.title="产后复查";
78	105	this.type="5";
	106	+ this.hospitalName=hospitalName;
	107	+ this.hospitalId=postReviewModel.getHospitalId();
79	108	}
80	109
81	110	public String getCheckTime() {

...	...	@@ -126,7 +126,7 @@
126	126	}
127	127	setName(patients.getUsername());
128	128	setPhone(patients.getPhone());
129		- setRemarks("产妇备注");
	129	+ setRemarks(patients.getMremark());
130	130	setRiskScore("60");
131	131
132	132	int days= DateUtil.daysBetween(patients.getLastMenses(),new Date());
133	133
...	...	@@ -138,11 +138,11 @@
138	138	}
139	139	List<AntData> dataList = new ArrayList<>();
140	140	if(null!=antExChuModel){
141		- dataList.add(new AntData(antExChuModel));
	141	+ dataList.add(new AntData(antExChuModel,""));
142	142	}
143	143	if(CollectionUtils.isNotEmpty(destModel)){
144	144	for(AntenatalExaminationModel model:destModel){
145		- dataList.add(new AntData(model));
	145	+ dataList.add(new AntData(model,""));
146	146	}
147	147	}
148	148	setData(dataList);

...	...	@@ -105,7 +105,7 @@
105	105	//建档日期
106	106	private String bookbuildingDate;
107	107	//服务类型
108		- private Integer serviceType;
	108	+ private String serviceType;
109	109
110	110	//就诊卡号
111	111	private String vcCardNo;
...	...	@@ -115,7 +115,7 @@
115	115
116	116
117	117	//服务状态
118		- private Integer serviceStatus;
	118	+ private String serviceStatus;
119	119
120	120	//体验会员 0非会员 1会员
121	121	private Integer expVip;
122	122
...	...	@@ -144,13 +144,7 @@
144	144	this.mremark = mremark;
145	145	}
146	146
147		- public Integer getServiceStatus() {
148		- return serviceStatus;
149		- }
150	147
151		- public void setServiceStatus(Integer serviceStatus) {
152		- this.serviceStatus = serviceStatus;
153		- }
154	148
155	149	public Integer getExpVip() {
156	150	return expVip;
...	...	@@ -364,12 +358,6 @@
364	358	this.bookbuildingDate = bookbuildingDate;
365	359	}
366	360
367		- public Integer getServiceType() {
368		- return serviceType;
369		- }
370		- public void setServiceType(Integer serviceType) {
371		- this.serviceType = serviceType;
372		- }
373	361	public String getPregnantCensusAddr() {
374	362	return pregnantCensusAddr;
375	363	}
376	364
...	...	@@ -437,14 +425,8 @@
437	425	this.childbirthAreaId = childbirthAreaId;
438	426	}
439	427
440		-// public String getHospitalId() {
441		-// return hospitalId;
442		-// }
443		-//
444		-// public void setHospitalId(String hospitalId) {
445		-// this.hospitalId = hospitalId;
446		-// }
447	428
	429	+
448	430	public String getVcCardNo() {
449	431	return vcCardNo;
450	432	}
...	...	@@ -491,6 +473,22 @@
491	473
492	474	public void setId(String id) {
493	475	this.id = id;
	476	+ }
	477	+
	478	+ public String getServiceType() {
	479	+ return serviceType;
	480	+ }
	481	+
	482	+ public void setServiceType(String serviceType) {
	483	+ this.serviceType = serviceType;
	484	+ }
	485	+
	486	+ public String getServiceStatus() {
	487	+ return serviceStatus;
	488	+ }
	489	+
	490	+ public void setServiceStatus(String serviceStatus) {
	491	+ this.serviceStatus = serviceStatus;
494	492	}
495	493	}

	1	+package com.lyms.platform.operate.web.result;
	2	+
	3	+import com.lyms.platform.common.base.IBasicResultConvert;
	4	+import com.lyms.platform.common.utils.DateUtil;
	5	+import com.lyms.platform.pojo.ReferralApplyOrderModel;
	6	+import com.lyms.platform.pojo.SieveApplyOrderModel;
	7	+
	8	+import java.util.Date;
	9	+import java.util.List;
	10	+
	11	+/**
	12	+ * Created by Administrator on 2016/7/7 0007.
	13	+ */
	14	+public class ReferralApplyOrderResult implements IBasicResultConvert<ReferralApplyOrderResult, ReferralApplyOrderModel> {
	15	+
	16	+ private String id;
	17	+ //患者id
	18	+ private String parentId;
	19	+ //患者名字
	20	+ private String name;
	21	+ //患者年龄
	22	+ private Integer age;
	23	+ //孕周
	24	+ private String dueWeek;
	25	+ //身份证号
	26	+ private String cardNo;
	27	+ //预产期
	28	+ private String dueDate;
	29	+ //高危分级
	30	+ private String rLevel;
	31	+ //高危风险因素
	32	+ private List rRisk;
	33	+ //高危评分
	34	+ private Integer score;
	35	+ //转入医院
	36	+ private String transferredHospital;
	37	+ //转出医院id
	38	+ private String outHospitalId;
	39	+
	40	+ //转入科室
	41	+ private String transferredDepartment;
	42	+ //病情描述
	43	+ private String diseaseDesc;
	44	+ //转院必要性
	45	+ private String transferredDisease;
	46	+ // 潜在风险
	47	+ private String potentialRisk;
	48	+ //转院方式
	49	+ private String transferMode;
	50	+ //申请医生
	51	+ private String applyDoctor;
	52	+
	53	+ public Integer getAge() {
	54	+ return age;
	55	+ }
	56	+
	57	+ public void setAge(Integer age) {
	58	+ this.age = age;
	59	+ }
	60	+
	61	+ public String getApplyDoctor() {
	62	+ return applyDoctor;
	63	+ }
	64	+
	65	+ public void setApplyDoctor(String applyDoctor) {
	66	+ this.applyDoctor = applyDoctor;
	67	+ }
	68	+
	69	+ public String getCardNo() {
	70	+ return cardNo;
	71	+ }
	72	+
	73	+ public void setCardNo(String cardNo) {
	74	+ this.cardNo = cardNo;
	75	+ }
	76	+
	77	+ public String getDiseaseDesc() {
	78	+ return diseaseDesc;
	79	+ }
	80	+
	81	+ public void setDiseaseDesc(String diseaseDesc) {
	82	+ this.diseaseDesc = diseaseDesc;
	83	+ }
	84	+
	85	+ public String getDueDate() {
	86	+ return dueDate;
	87	+ }
	88	+
	89	+ public void setDueDate(String dueDate) {
	90	+ this.dueDate = dueDate;
	91	+ }
	92	+
	93	+ public String getDueWeek() {
	94	+ return dueWeek;
	95	+ }
	96	+
	97	+ public void setDueWeek(String dueWeek) {
	98	+ this.dueWeek = dueWeek;
	99	+ }
	100	+
	101	+ public String getId() {
	102	+ return id;
	103	+ }
	104	+
	105	+ public void setId(String id) {
	106	+ this.id = id;
	107	+ }
	108	+
	109	+ public String getName() {
	110	+ return name;
	111	+ }
	112	+
	113	+ public void setName(String name) {
	114	+ this.name = name;
	115	+ }
	116	+
	117	+ public String getOutHospitalId() {
	118	+ return outHospitalId;
	119	+ }
	120	+
	121	+ public void setOutHospitalId(String outHospitalId) {
	122	+ this.outHospitalId = outHospitalId;
	123	+ }
	124	+
	125	+ public String getParentId() {
	126	+ return parentId;
	127	+ }
	128	+
	129	+ public void setParentId(String parentId) {
	130	+ this.parentId = parentId;
	131	+ }
	132	+
	133	+ public String getPotentialRisk() {
	134	+ return potentialRisk;
	135	+ }
	136	+
	137	+ public void setPotentialRisk(String potentialRisk) {
	138	+ this.potentialRisk = potentialRisk;
	139	+ }
	140	+
	141	+ public String getrLevel() {
	142	+ return rLevel;
	143	+ }
	144	+
	145	+ public void setrLevel(String rLevel) {
	146	+ this.rLevel = rLevel;
	147	+ }
	148	+
	149	+ public List getrRisk() {
	150	+ return rRisk;
	151	+ }
	152	+
	153	+ public void setrRisk(List rRisk) {
	154	+ this.rRisk = rRisk;
	155	+ }
	156	+
	157	+ public Integer getScore() {
	158	+ return score;
	159	+ }
	160	+
	161	+ public void setScore(Integer score) {
	162	+ this.score = score;
	163	+ }
	164	+
	165	+ public String getTransferMode() {
	166	+ return transferMode;
	167	+ }
	168	+
	169	+ public void setTransferMode(String transferMode) {
	170	+ this.transferMode = transferMode;
	171	+ }
	172	+
	173	+ public String getTransferredDepartment() {
	174	+ return transferredDepartment;
	175	+ }
	176	+
	177	+ public void setTransferredDepartment(String transferredDepartment) {
	178	+ this.transferredDepartment = transferredDepartment;
	179	+ }
	180	+
	181	+ public String getTransferredDisease() {
	182	+ return transferredDisease;
	183	+ }
	184	+
	185	+ public void setTransferredDisease(String transferredDisease) {
	186	+ this.transferredDisease = transferredDisease;
	187	+ }
	188	+
	189	+ public String getTransferredHospital() {
	190	+ return transferredHospital;
	191	+ }
	192	+
	193	+ public void setTransferredHospital(String transferredHospital) {
	194	+ this.transferredHospital = transferredHospital;
	195	+ }
	196	+
	197	+ @Override
	198	+ public ReferralApplyOrderResult convertToResult(ReferralApplyOrderModel destModel) {
	199	+ setId(destModel.getId());
	200	+ setParentId(destModel.getParentId());
	201	+ setName(destModel.getName());
	202	+ setAge(destModel.getAge());
	203	+ setDueWeek(destModel.getDueWeek());
	204	+ setCardNo(destModel.getCardNo());
	205	+ setDueDate(DateUtil.getyyyy_MM_dd(destModel.getDueDate()));
	206	+ setrLevel(destModel.getrLevel());
	207	+ setScore(destModel.getScore());
	208	+ setDiseaseDesc(destModel.getDiseaseDesc());
	209	+ setTransferredDisease(destModel.getTransferredDisease());
	210	+ setPotentialRisk(destModel.getPotentialRisk());
	211	+ setTransferMode(destModel.getTransferMode());
	212	+ setApplyDoctor(destModel.getApplyDoctor());
	213	+ return this;
	214	+ }
	215	+}

	1	+package com.lyms.platform.operate.web.result;
	2	+
	3	+import com.lyms.platform.common.base.IBasicResultConvert;
	4	+import com.lyms.platform.common.utils.DateUtil;
	5	+import com.lyms.platform.common.utils.JsonUtil;
	6	+import com.lyms.platform.pojo.Patients;
	7	+import com.lyms.platform.pojo.SieveApplyOrderModel;
	8	+import org.apache.commons.lang.StringUtils;
	9	+
	10	+import java.util.Date;
	11	+import java.util.List;
	12	+
	13	+/**
	14	+ * Created by Administrator on 2016/7/7 0007.
	15	+ */
	16	+public class SieveApplyOrderResult {
	17	+
	18	+ //名字
	19	+ private String name;
	20	+ //年龄
	21	+ private Integer age;
	22	+ //孕周
	23	+ private String dueWeek;
	24	+ //预产期
	25	+ private String yChanQi;
	26	+ //手机号
	27	+ private String phone;
	28	+ //高危因素
	29	+ private List riskFactor;
	30	+ //高危评分
	31	+ private String riskScore;
	32	+ //备注
	33	+ private String remarks;
	34	+ //末次月经
	35	+ private String lastMenses;
	36	+
	37	+
	38	+
	39	+ private String id;
	40	+ //患者id
	41	+ private String parentId;
	42	+ //产筛项
	43	+ private List checkItem;
	44	+ //医生指导
	45	+ private String guide;
	46	+ // 预约日期
	47	+ private String checkDate;
	48	+ //申请医生
	49	+ private String applyDoctor;
	50	+
	51	+ public String getApplyDoctor() {
	52	+ return applyDoctor;
	53	+ }
	54	+
	55	+ public void setApplyDoctor(String applyDoctor) {
	56	+ this.applyDoctor = applyDoctor;
	57	+ }
	58	+
	59	+ public String getCheckDate() {
	60	+ return checkDate;
	61	+ }
	62	+
	63	+ public void setCheckDate(String checkDate) {
	64	+ this.checkDate = checkDate;
	65	+ }
	66	+
	67	+ public List getCheckItem() {
	68	+ return checkItem;
	69	+ }
	70	+
	71	+ public void setCheckItem(List checkItem) {
	72	+ this.checkItem = checkItem;
	73	+ }
	74	+
	75	+ public String getGuide() {
	76	+ return guide;
	77	+ }
	78	+
	79	+ public void setGuide(String guide) {
	80	+ this.guide = guide;
	81	+ }
	82	+
	83	+ public String getId() {
	84	+ return id;
	85	+ }
	86	+
	87	+ public void setId(String id) {
	88	+ this.id = id;
	89	+ }
	90	+
	91	+ public String getParentId() {
	92	+ return parentId;
	93	+ }
	94	+
	95	+ public void setParentId(String parentId) {
	96	+ this.parentId = parentId;
	97	+ }
	98	+
	99	+ public SieveApplyOrderResult convertToResult(SieveApplyOrderModel destModel,Patients patients) {
	100	+ setId(destModel.getId());
	101	+ setParentId(destModel.getParentId());
	102	+ setApplyDoctor(destModel.getApplyDoctor());
	103	+ setCheckDate(destModel.getCheckDate());
	104	+ setGuide(destModel.getGuide());
	105	+ if(StringUtils.isNotEmpty(destModel.getCheckItem())){
	106	+ setCheckItem(JsonUtil.toList(destModel.getCheckItem(),List.class));
	107	+ }
	108	+ try {
	109	+ if(null!=patients.getBirth()){
	110	+ setAge(DateUtil.getAge(patients.getBirth()));
	111	+ }
	112	+ }catch (Exception e){
	113	+ }
	114	+ setName(patients.getUsername());
	115	+ setPhone(patients.getPhone());
	116	+ setRemarks(patients.getMremark());
	117	+ setRiskScore("60");
	118	+
	119	+ int days= DateUtil.daysBetween(patients.getLastMenses(),new Date());
	120	+ String week= (days/7)+"";
	121	+ int day = (days%7);
	122	+ this.dueWeek="孕"+week+"周" +(day>0?"+"+day+"天":"");
	123	+ if(null!=patients.getLastMenses()){
	124	+ setLastMenses(DateUtil.getyyyy_MM_dd(patients.getLastMenses()));
	125	+ }
	126	+ return this;
	127	+ }
	128	+
	129	+ public Integer getAge() {
	130	+ return age;
	131	+ }
	132	+
	133	+ public void setAge(Integer age) {
	134	+ this.age = age;
	135	+ }
	136	+
	137	+ public String getDueWeek() {
	138	+ return dueWeek;
	139	+ }
	140	+
	141	+ public void setDueWeek(String dueWeek) {
	142	+ this.dueWeek = dueWeek;
	143	+ }
	144	+
	145	+ public String getLastMenses() {
	146	+ return lastMenses;
	147	+ }
	148	+
	149	+ public void setLastMenses(String lastMenses) {
	150	+ this.lastMenses = lastMenses;
	151	+ }
	152	+
	153	+ public String getName() {
	154	+ return name;
	155	+ }
	156	+
	157	+ public void setName(String name) {
	158	+ this.name = name;
	159	+ }
	160	+
	161	+ public String getPhone() {
	162	+ return phone;
	163	+ }
	164	+
	165	+ public void setPhone(String phone) {
	166	+ this.phone = phone;
	167	+ }
	168	+
	169	+ public String getRemarks() {
	170	+ return remarks;
	171	+ }
	172	+
	173	+ public void setRemarks(String remarks) {
	174	+ this.remarks = remarks;
	175	+ }
	176	+
	177	+ public List getRiskFactor() {
	178	+ return riskFactor;
	179	+ }
	180	+
	181	+ public void setRiskFactor(List riskFactor) {
	182	+ this.riskFactor = riskFactor;
	183	+ }
	184	+
	185	+ public String getRiskScore() {
	186	+ return riskScore;
	187	+ }
	188	+
	189	+ public void setRiskScore(String riskScore) {
	190	+ this.riskScore = riskScore;
	191	+ }
	192	+
	193	+ public String getyChanQi() {
	194	+ return yChanQi;
	195	+ }
	196	+
	197	+ public void setyChanQi(String yChanQi) {
	198	+ this.yChanQi = yChanQi;
	199	+ }
	200	+}

...	...	@@ -30,6 +30,17 @@
30	30
31	31	//整体风险
32	32	private String ztfx;
	33	+ //整体风险
	34	+ private String ztfxText;
	35	+
	36	+ public String getZtfxText() {
	37	+ return ztfxText;
	38	+ }
	39	+
	40	+ public void setZtfxText(String ztfxText) {
	41	+ this.ztfxText = ztfxText;
	42	+ }
	43	+
33	44	//联系方式
34	45	private String phone;
35	46
36	47
...	...	@@ -39,7 +50,16 @@
39	50	private String cqResult;
40	51	//妊娠结局
41	52	private String renShenResult;
	53	+ private Integer status;
42	54
	55	+ public Integer getStatus() {
	56	+ return status;
	57	+ }
	58	+
	59	+ public void setStatus(Integer status) {
	60	+ this.status = status;
	61	+ }
	62	+
43	63	public String getcDueWeek() {
44	64	return cDueWeek;
45	65	}
...	...	@@ -144,7 +164,8 @@
144	164	}
145	165	setDueWeek(destModel.getDueWeek());
146	166	if(null!=destModel.getZtfx()) {
147		- setZtfx(SieveEnums.getTitle(destModel.getZtfx()));
	167	+ setZtfx(destModel.getZtfx()+"");
	168	+ setZtfxText(SieveEnums.getTitle(destModel.getZtfx()));
148	169	}
149	170	setPhone(destModel.getPhone());
150	171	if(null!=destModel.getCqStatus()) {
...	...	@@ -156,6 +177,7 @@
156	177	if(null!=destModel.getRenShenResult()) {
157	178	setRenShenResult(RenShenJieJuEnums.getTitle(destModel.getRenShenResult()));
158	179	}
	180	+ setStatus(destModel.getStatus());
159	181	//整体风险枚举
160	182	// SieveEnums.
161	183	//妊娠结局