jiangjiazhi / regional-platform

Commit ec48b61c223757f72f8b09e20c9ac3afb848debf

Authored by wtt over 6 years ago

Exists in master and in 6 other branches

Merge remote-tracking branch 'origin/master'

# Conflicts:
#	platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/ApplyOrderController.java
#	platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ApplyOrderFacade.java

Showing 11 changed files

platform-common/src/main/java/com/lyms/platform/common/enums/ApplyOrderStatusEnums.java
platform-dal/src/main/java/com/lyms/platform/pojo/MatdeliverFollowPushModel.java
platform-dal/src/main/java/com/lyms/platform/query/ReferralApplyOrderQuery.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/ApplyOrderController.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/MatdeliverFollowController.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/facade/ApplyOrderFacade.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/DiagnosisFacaed.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/MatdeliverFollowFacade.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/MatdeliverFollowListResult.java

...	...	@@ -4,25 +4,26 @@
4	4	* Created by Administrator on 2016/6/27 0027.
5	5	*/
6	6	public enum ApplyOrderStatusEnums {
7		- CREATED("待接收","1"),
8		- O("已接收","2"),
9		- O1("建议转诊","3");
	7	+ CREATED("待接收", "1"),
	8	+ O("已接收", "2"),
	9	+ O1("建议转诊", "3"),
	10	+ O2("拒绝接收", "4");
10	11
11	12
12		-
13		- private ApplyOrderStatusEnums(String name,String id){
14		- this.name=name;
15		- this.id=id;
	13	+ private ApplyOrderStatusEnums(String name, String id) {
	14	+ this.name = name;
	15	+ this.id = id;
16	16	}
17	17
18		- public static String getTitle(Integer id){
19		- for(ApplyOrderStatusEnums enums:values()){
20		- if(enums.getId().equals(id+"")){
	18	+ public static String getTitle(Integer id) {
	19	+ for (ApplyOrderStatusEnums enums : values()) {
	20	+ if (enums.getId().equals(id + "")) {
21	21	return enums.getName();
22	22	}
23	23	}
24	24	return null;
25	25	}
	26	+
26	27	private String name;
27	28	private String id;
28	29

...	...	@@ -73,9 +73,42 @@
73	73	*/
74	74	private String confirmDoctor;
75	75
76		- private Date createTime;
	76	+ /**
	77	+ * 创建医生
	78	+ */
	79	+ private String createDoctor;
77	80
	81	+ private String hospitalId;
	82	+
	83	+ public String getHospitalId() {
	84	+ return hospitalId;
	85	+ }
	86	+
	87	+ public void setHospitalId(String hospitalId) {
	88	+ this.hospitalId = hospitalId;
	89	+ }
	90	+
	91	+ private Date createTime;
	92	+
78	93	private Date updateTime;
	94	+
	95	+ private Integer yn;
	96	+
	97	+ public String getCreateDoctor() {
	98	+ return createDoctor;
	99	+ }
	100	+
	101	+ public void setCreateDoctor(String createDoctor) {
	102	+ this.createDoctor = createDoctor;
	103	+ }
	104	+
	105	+ public Integer getYn() {
	106	+ return yn;
	107	+ }
	108	+
	109	+ public void setYn(Integer yn) {
	110	+ this.yn = yn;
	111	+ }
79	112
80	113	public String getId() {
81	114	return id;

...	...	@@ -55,6 +55,7 @@
55	55	private String outHospitalId;
56	56	private String hospitalId;
57	57	private String phone;
	58	+
58	59	private Integer type;
59	60	//体验会员 0非会员 1会员
60	61	private Integer expVip;
...	...	@@ -313,7 +314,7 @@
313	314	public MongoQuery convertToQuery() {
314	315	MongoCondition condition = MongoCondition.newInstance();
315	316
316		- if(CollectionUtils.isNotEmpty(parentIds)){
	317	+ if (CollectionUtils.isNotEmpty(parentIds)) {
317	318	condition = condition.and("parentId", parentIds, MongoOper.IN);
318	319	}
319	320
...	...	@@ -353,8 +354,6 @@
353	354	}
354	355
355	356
356		-
357		-
358	357	if (null != hospitalId) {
359	358	condition = condition.and("hospitalId", hospitalId, MongoOper.IS);
360	359	}
361	360
...	...	@@ -406,14 +405,14 @@
406	405	}
407	406	if (StringUtils.isNotEmpty(queryNo)) {
408	407	MongoCondition c1 = MongoCondition.newInstance();
409		- MongoCondition con1 = MongoCondition.newInstance("phone", queryNo, MongoOper.IS);
	408	+ MongoCondition con1 = MongoCondition.newInstance("phone", queryNo, MongoOper.IS);
410	409	MongoCondition con2 = MongoCondition.newInstance("name", queryNo, MongoOper.IS);
411	410	MongoCondition con3 = MongoCondition.newInstance("mname", queryNo, MongoOper.LIKE);
412	411	MongoCondition con4 = MongoCondition.newInstance("mCardNo", queryNo, MongoOper.IS);
413		- if(c!=null) {
414		- c = c.andOperator(c1.orCondition(new MongoCondition[]{con1, con2, con3,con4}).getCriteria());
415		- }else {
416		- c = c1.orCondition(new MongoCondition[]{con1, con2, con3,con4}).getCriteria();
	412	+ if (c != null) {
	413	+ c = c.andOperator(c1.orCondition(new MongoCondition[]{con1, con2, con3, con4}).getCriteria());
	414	+ } else {
	415	+ c = c1.orCondition(new MongoCondition[]{con1, con2, con3, con4}).getCriteria();
417	416	}
418	417	}
419	418

...	...	@@ -7,7 +7,6 @@
7	7	import com.lyms.platform.common.result.BaseResponse;
8	8	import com.lyms.platform.operate.web.facade.ApplyOrderFacade;
9	9	import com.lyms.platform.operate.web.request.*;
10		-import net.sf.json.JSONObject;
11	10	import org.apache.commons.lang.StringUtils;
12	11	import org.springframework.beans.factory.annotation.Autowired;
13	12	import org.springframework.stereotype.Controller;
14	13
...	...	@@ -18,11 +17,9 @@
18	17	import javax.validation.Valid;
19	18
20	19	/**
21		- *
22		- *
23	20	* 申请单接口
24	21	* <p>
25		- *
	22	+ * <p>
26	23	* Created by Administrator on 2016/6/15 0015.
27	24	*/
28	25	@Controller
29	26
30	27
...	...	@@ -32,18 +29,18 @@
32	29	private ApplyOrderFacade applyOrderFacade;
33	30
34	31	//查询转诊申请单
35		- @RequestMapping(method = RequestMethod.GET,value = "/referralapply")
	32	+ @RequestMapping(method = RequestMethod.GET, value = "/referralapply")
36	33	@ResponseBody
37	34	@TokenRequired
38	35	public BaseResponse queryReferralApplyOrder(@RequestParam("id") String id) {
39		- if(StringUtils.isEmpty(id)){
	36	+ if (StringUtils.isEmpty(id)) {
40	37	return new BaseResponse().setErrorcode(ErrorCodeConstants.PARAMETER_ERROR).setErrormsg("id不能为空.");
41	38	}
42	39	return applyOrderFacade.queryReferralApplyOrder(id);
43	40	}
44	41
45	42	//增加或修改转诊单的回执信息
46		- @RequestMapping(method = RequestMethod.POST,value = "/referralReceipt")
	43	+ @RequestMapping(method = RequestMethod.POST, value = "/referralReceipt")
47	44	@ResponseBody
48	45	@TokenRequired
49	46	public BaseResponse addReferralReceipt(@Valid @RequestBody ReferralReceiptRequest referralReceiptRequest, HttpServletRequest request) {
50	47
51	48
52	49
53	50
54	51
55	52
56	53
57	54
58	55
...	...	@@ -51,54 +48,38 @@
51	48	}
52	49
53	50	//增加儿童转诊申请单
54		- @RequestMapping(method = RequestMethod.POST,value = "/referralapply")
	51	+ @RequestMapping(method = RequestMethod.POST, value = "/referralapply")
55	52	@ResponseBody
56	53	@TokenRequired
57		- public BaseResponse addReferralApplyOrder(@Valid @RequestBody ReferralApplyOrderAddRequest applyOrderAddRequest,HttpServletRequest request) {
	54	+ public BaseResponse addReferralApplyOrder(@Valid @RequestBody ReferralApplyOrderAddRequest applyOrderAddRequest, HttpServletRequest request) {
58	55	LoginContext loginState = (LoginContext) request.getAttribute("loginContext");
59	56	return applyOrderFacade.addOneReferralApplyOrder(applyOrderAddRequest, loginState.getId(), 2);
60	57	}
61	58
62	59	//增加转诊申请单
63		- @RequestMapping(method = RequestMethod.POST,value = "/referrbapply")
	60	+ @RequestMapping(method = RequestMethod.POST, value = "/referrbapply")
64	61	@ResponseBody
65	62	@TokenRequired
66		- public BaseResponse addReferralBaApplyOrder(@Valid @RequestBody ReferralApplyOrderAddRequest applyOrderAddRequest,HttpServletRequest request) {
	63	+ public BaseResponse addReferralBaApplyOrder(@Valid @RequestBody ReferralApplyOrderAddRequest applyOrderAddRequest, HttpServletRequest request) {
67	64	LoginContext loginState = (LoginContext) request.getAttribute("loginContext");
68		- return applyOrderFacade.addOneReferralApplyOrder(applyOrderAddRequest, loginState.getId(),1);
	65	+ return applyOrderFacade.addOneReferralApplyOrder(applyOrderAddRequest, loginState.getId(), 1);
69	66	}
70	67
71		- @RequestMapping(method = RequestMethod.POST,value = "/sieveapply")
	68	+ @RequestMapping(method = RequestMethod.POST, value = "/sieveapply")
72	69	@ResponseBody
73	70	@TokenRequired
74	71	//增加产筛申请单
75		- public BaseResponse addSieveApplyOrder(@Valid @RequestBody SieveApplyOrderAddRequest applyOrderAddRequest,HttpServletRequest request) {
	72	+ public BaseResponse addSieveApplyOrder(@Valid @RequestBody SieveApplyOrderAddRequest applyOrderAddRequest, HttpServletRequest request) {
76	73	LoginContext loginState = (LoginContext) request.getAttribute("loginContext");
77	74	return applyOrderFacade.addOneSieveApplyOrder(applyOrderAddRequest, loginState.getId());
78	75	}
79	76
80		- @RequestMapping(method = RequestMethod.POST,value = "/sieveapply_huada")
	77	+ @RequestMapping(method = RequestMethod.GET, value = "/sieveapply")
81	78	@ResponseBody
82	79	@TokenRequired
83		- //增加产筛申请单_华大基因
84		- public BaseResponse addSieveApplyOrder_huada(@Valid @RequestBody SieveApplyOrderAddRequestHuada sieveApplyOrderAddRequestHuada,HttpServletRequest request) {
85		- LoginContext loginState = (LoginContext) request.getAttribute("loginContext");
86		- return applyOrderFacade.addOneSieveApplyOrder_huada(sieveApplyOrderAddRequestHuada, loginState.getId());
87		- }
88		-
89		- @RequestMapping(method = RequestMethod.POST,value = "/callbackLyms")
90		- @ResponseBody
91		- //华大基因回调接口
92		- public BaseResponse callbackLyms(@Valid @RequestBody JSONObject jsonObject) {
93		- return applyOrderFacade.callbackLyms(jsonObject);
94		- }
95		-
96		- @RequestMapping(method = RequestMethod.GET,value = "/sieveapply")
97		- @ResponseBody
98		- @TokenRequired
99	80	//查询转诊申请单
100	81	public BaseResponse querySieveApplyOrder(@RequestParam("id") String id) {
101		- if(StringUtils.isEmpty(id)){
	82	+ if (StringUtils.isEmpty(id)) {
102	83	return new BaseResponse().setErrorcode(ErrorCodeConstants.PARAMETER_ERROR).setErrormsg("id不能为空.");
103	84	}
104	85	return applyOrderFacade.querySieveApplyOrder(id);
105	86
106	87
107	88
108	89
109	90
110	91
111	92
112	93
...	...	@@ -110,39 +91,41 @@
110	91	* @param orderQueryRequest
111	92	* @return
112	93	*/
113		- @RequestMapping(method = RequestMethod.GET,value = "/applyorder")
	94	+ @RequestMapping(method = RequestMethod.GET, value = "/applyorder")
114	95	@ResponseBody
115	96	@TokenRequired
116		- public BaseResponse queryApplyOrder(@Valid ApplyOrderQueryRequest orderQueryRequest,HttpServletRequest request){
	97	+ public BaseResponse queryApplyOrder(@Valid ApplyOrderQueryRequest orderQueryRequest, HttpServletRequest request) {
117	98	LoginContext loginState = (LoginContext) request.getAttribute("loginContext");
118	99	return applyOrderFacade.queryApplyOrder(orderQueryRequest, loginState.getId());
119	100	}
120	101
121	102
122	103	/**
123		- *转诊单打印
	104	+ * 转诊单打印
	105	+ *
124	106	* @param id
125	107	* @return
126	108	*/
127		- @RequestMapping(method = RequestMethod.GET,value = "/printRe")
	109	+ @RequestMapping(method = RequestMethod.GET, value = "/printRe")
128	110	@ResponseBody
129	111	@TokenRequired
130		- public BaseResponse queryApplyOrder(@RequestParam("id") String id){
	112	+ public BaseResponse queryApplyOrder(@RequestParam("id") String id) {
131	113	return applyOrderFacade.getOrderModel(id);
132	114	}
133	115
134	116
135	117	/**
136	118	* 导出孕妇转诊
	119	+ *
137	120	* @param orderQueryRequest
138	121	* @param request
139	122	* @return
140	123	*/
141		- @RequestMapping(method = RequestMethod.GET,value = "/exportYunZZ")
	124	+ @RequestMapping(method = RequestMethod.GET, value = "/exportYunZZ")
142	125	@TokenRequired
143		- public void exportYunZZ(@Valid ApplyOrderQueryRequest orderQueryRequest,HttpServletRequest request,HttpServletResponse response){
	126	+ public void exportYunZZ(@Valid ApplyOrderQueryRequest orderQueryRequest, HttpServletRequest request, HttpServletResponse response) {
144	127	LoginContext loginState = (LoginContext) request.getAttribute("loginContext");
145		- applyOrderFacade.exportYunZZ(orderQueryRequest, loginState.getId(),response);
	128	+ applyOrderFacade.exportYunZZ(orderQueryRequest, loginState.getId(), response);
146	129	}
147	130
148	131
149	132
150	133
151	134
152	135
153	136
154	137
155	138
156	139
...	...	@@ -152,32 +135,54 @@
152	135	* @param orderQueryRequest
153	136	* @return
154	137	*/
155		- @RequestMapping(method = RequestMethod.GET,value = "/applybabyorder")
	138	+ @RequestMapping(method = RequestMethod.GET, value = "/applybabyorder")
156	139	@ResponseBody
157	140	@TokenRequired
158		- public BaseResponse queryBabyApplyOrder(@Valid BabyApplyOrderQueryRequest orderQueryRequest,HttpServletRequest request){
	141	+ public BaseResponse queryBabyApplyOrder(@Valid BabyApplyOrderQueryRequest orderQueryRequest, HttpServletRequest request) {
159	142	LoginContext loginState = (LoginContext) request.getAttribute("loginContext");
160	143	return applyOrderFacade.queryBabyApplyOrder(orderQueryRequest, loginState.getId());
161	144	}
162	145
163	146	/**
164	147	* 导出儿童转诊
	148	+ *
165	149	* @param orderQueryRequest
166	150	* @param request
167	151	* @return
168	152	*/
169		- @RequestMapping(method = RequestMethod.GET,value = "/exportChildZZ")
	153	+ @RequestMapping(method = RequestMethod.GET, value = "/exportChildZZ")
170	154	@TokenRequired
171		- public void exportChildZZ(@Valid BabyApplyOrderQueryRequest orderQueryRequest,HttpServletRequest request,HttpServletResponse response){
	155	+ public void exportChildZZ(@Valid BabyApplyOrderQueryRequest orderQueryRequest, HttpServletRequest request, HttpServletResponse response) {
172	156	LoginContext loginState = (LoginContext) request.getAttribute("loginContext");
173		- applyOrderFacade.exportChildZZ(orderQueryRequest, loginState.getId(),response);
	157	+ applyOrderFacade.exportChildZZ(orderQueryRequest, loginState.getId(), response);
174	158	}
175	159
176	160
177		- @RequestMapping(method = RequestMethod.GET,value = "/applyorderEnums")
	161	+ @RequestMapping(method = RequestMethod.GET, value = "/applyorderEnums")
178	162	@ResponseBody
179		- public BaseResponse getEnums(){
	163	+ public BaseResponse getEnums() {
180	164	return applyOrderFacade.getEnums();
181	165	}
	166	+
	167	+ /**
	168	+ * 高危转诊审核/消息接口
	169	+ */
	170	+ @RequestMapping(method = RequestMethod.GET, value = "/messageAudit")
	171	+ @TokenRequired
	172	+ @ResponseBody
	173	+ public BaseResponse messageAudit(HttpServletRequest request, String type) {
	174	+ return applyOrderFacade.messageAudit(getUserId(request), type);
	175	+ }
	176	+
	177	+ /***
	178	+ * 审核高危转诊
	179	+ * */
	180	+ @RequestMapping(method = RequestMethod.GET, value = "/auditMessages")
	181	+ @TokenRequired
	182	+ @ResponseBody
	183	+ public BaseResponse auditMessages(HttpServletRequest request, String id, String state) {
	184	+ return applyOrderFacade.auditMessages(getUserId(request), id, state);
	185	+ }
	186	+
182	187	}

...	...	@@ -156,6 +156,7 @@
156	156	* @return
157	157	*/
158	158	@ResponseBody
	159	+ @TokenRequired
159	160	@RequestMapping(value = "/questionnaire/list", method = RequestMethod.POST)
160	161	public BaseResponse questionnaireList(@RequestBody @Valid QuestionnaireListRequest param, HttpServletRequest request) {
161	162	LoginContext loginState = (LoginContext) request.getAttribute("loginContext");

...	...	@@ -230,7 +230,7 @@
230	230	* @return
231	231	*/
232	232	@ResponseBody
233		- @RequestMapping(value = "",method = RequestMethod.GET)
	233	+ @RequestMapping(value = "/cqsieves",method = RequestMethod.GET)
234	234	@TokenRequired
235	235	public BaseResponse queryChanQianSieve(@Valid CqSieveQueryRequest cqSieveQueryRequest,HttpServletRequest request){
236	236	LoginContext loginState = (LoginContext) request.getAttribute("loginContext");

1	1	package com.lyms.platform.operate.web.facade;
2	2
3		-import com.alibaba.fastjson.JSON;
4		-import com.alibaba.fastjson.JSONArray;
5		-import com.alibaba.fastjson.JSONObject;
6	3	import com.lyms.platform.biz.service.*;
7	4	import com.lyms.platform.common.constants.ErrorCodeConstants;
8	5	import com.lyms.platform.common.enums.*;
9	6	import com.lyms.platform.common.exception.BusinessException;
10		-import com.lyms.platform.common.result.BaseListResponse;
11		-import com.lyms.platform.common.result.BaseObjectResponse;
12		-import com.lyms.platform.common.result.BaseResponse;
	7	+import com.lyms.platform.common.result.*;
13	8	import com.lyms.platform.common.utils.*;
14	9	import com.lyms.platform.operate.web.request.*;
15	10	import com.lyms.platform.operate.web.result.*;
16	11	import com.lyms.platform.operate.web.utils.CommonsHelper;
17	12	import com.lyms.platform.operate.web.utils.FunvCommonUtil;
18		-import com.lyms.platform.permission.model.Organization;
19		-import com.lyms.platform.permission.model.OrganizationQuery;
20		-import com.lyms.platform.permission.model.PatientService;
21		-import com.lyms.platform.permission.model.Users;
	13	+import com.lyms.platform.permission.model.*;
22	14	import com.lyms.platform.permission.service.CouponService;
23	15	import com.lyms.platform.permission.service.OrganizationService;
24	16	import com.lyms.platform.permission.service.UsersService;
25	17
26	18
...	...	@@ -29,12 +21,11 @@
29	21	import org.apache.commons.lang.math.NumberUtils;
30	22	import org.springframework.beans.factory.annotation.Autowired;
31	23	import org.springframework.stereotype.Component;
32		-import org.springframework.web.client.RestTemplate;
33	24
	25	+import javax.servlet.http.HttpServletRequest;
34	26	import javax.servlet.http.HttpServletResponse;
35	27	import java.io.IOException;
36	28	import java.io.OutputStream;
37		-import java.text.SimpleDateFormat;
38	29	import java.util.*;
39	30
40	31	/**
41	32
...	...	@@ -45,15 +36,10 @@
45	36	@Component
46	37	public class ApplyOrderFacade {
47	38
48		- public static final String HUADA_URL = PropertiesUtils.getPropertyValue("huada_url");
49		- public static final String SYSCODE = PropertiesUtils.getPropertyValue("huada_syscode");
50		- public static final String SECRET = PropertiesUtils.getPropertyValue("huada_secret");
51	39
52	40	@Autowired
53	41	private ApplyOrderService applyOrderService;
54	42	@Autowired
55		- private ApplyOrderHuadaService applyOrderHuadaService;
56		- @Autowired
57	43	private PatientsService patientsService;
58	44	@Autowired
59	45	private AutoMatchFacade autoMatchFacade;
...	...	@@ -245,7 +231,7 @@
245	231
246	232	PatientService patientService = new PatientService();
247	233	Map<String, String> serInfo = new HashMap<>();
248		- serInfo.put("serType",PatientSerEnums.SerTypeEnums.bzfw.getId().toString());
	234	+ serInfo.put("serType", PatientSerEnums.SerTypeEnums.bzfw.getId().toString());
249	235
250	236	patientService.setSerInfos(Arrays.asList(serInfo));
251	237	patientService.setPerType(1);
...	...	@@ -377,8 +363,7 @@
377	363	SieveApplyOrderModel sieveApplyOrderModel = sieveApplyOrderAddRequest.convertToDataModel();
378	364
379	365	//修改
380		- if (StringUtils.isNotEmpty(sieveApplyOrderAddRequest.getId()))
381		- {
	366	+ if (StringUtils.isNotEmpty(sieveApplyOrderAddRequest.getId())) {
382	367	sieveApplyOrderModel.setId(sieveApplyOrderAddRequest.getId());
383	368	applyOrderService.updateSieve(sieveApplyOrderModel);
384	369
...	...	@@ -388,8 +373,7 @@
388	373	List<SieveModel> sieveModels = sieveService.queryList(sieveQuery);
389	374	if (CollectionUtils.isNotEmpty(sieveModels)) {
390	375	SieveModel sieveModel = sieveModels.get(0);
391		- if (sieveModel.getSieveHospitalId() != null && !sieveModel.getSieveHospitalId().equals(sieveApplyOrderAddRequest.getSieveHospitalId()))
392		- {
	376	+ if (sieveModel.getSieveHospitalId() != null && !sieveModel.getSieveHospitalId().equals(sieveApplyOrderAddRequest.getSieveHospitalId())) {
393	377	sieveModel.setSieveHospitalId(sieveApplyOrderAddRequest.getSieveHospitalId());
394	378	sieveService.updateOneChanQianDiaSieve(sieveModel);
395	379	}
...	...	@@ -471,8 +455,7 @@
471	455	}
472	456	SieveApplyOrderModel sieveApplyOrderModel1 = new SieveApplyOrderModel();
473	457	sieveApplyOrderModel1.setStatus(1);
474		- for (String str : idList)
475		- {
	458	+ for (String str : idList) {
476	459	sieveApplyOrderModel1.setId(str);
477	460	sieveApplyOrderModel1.setModified(new Date());
478	461	sieveApplyOrderModel1.setStatus(1);
...	...	@@ -487,8 +470,7 @@
487	470	sieveQuery.setYn(YnEnums.YES.getId());
488	471	sieveQuery.setParentId(sieveApplyOrderAddRequest.getParentId());
489	472	List<SieveModel> sieveModels = sieveService.queryList(sieveQuery);
490		- if (CollectionUtils.isNotEmpty(sieveModels))
491		- {
	473	+ if (CollectionUtils.isNotEmpty(sieveModels)) {
492	474	SieveModel sieveModel = sieveModels.get(0);
493	475	sieveModel.setReviceStatus(1);
494	476	sieveModel.setSieveHospitalId(sieveApplyOrderAddRequest.getSieveHospitalId());
495	477
496	478
497	479
...	...	@@ -1014,27 +996,28 @@
1014	996	}
1015	997
1016	998	/**
1017		- *转诊通知单打印（唐山滦县）
	999	+ * 转诊通知单打印（唐山滦县）
	1000	+ *
1018	1001	* @param id
1019	1002	* @return
1020	1003	*/
1021		- public BaseResponse getOrderModel(String id){
	1004	+ public BaseResponse getOrderModel(String id) {
1022	1005	ReferralApplyOrderQuery referralApplyOrderQuery = new ReferralApplyOrderQuery();
1023	1006	referralApplyOrderQuery.setId(id);
1024	1007	List<ReferralApplyOrderModel> orderModels = applyOrderService.queryReferralApplyOrderWithQuery(referralApplyOrderQuery);
1025	1008	if (CollectionUtils.isNotEmpty(orderModels)) {
1026	1009	ReferralApplyOrderModel reOrderModel = orderModels.get(0);
1027	1010	Patients data = patientsService.findOnePatientById(reOrderModel.getParentId());
1028		- Map<String,Object> map = new HashMap<String,Object>();
1029		- map.put("ycName",reOrderModel.getName());
1030		- map.put("age",reOrderModel.getAge());
1031		- map.put("nation",getBasicConfig(data.getPnationId()));
1032		- map.put("plevelType",getBasicConfig(data.getPlevelTypeId()));
	1011	+ Map<String, Object> map = new HashMap<String, Object>();
	1012	+ map.put("ycName", reOrderModel.getName());
	1013	+ map.put("age", reOrderModel.getAge());
	1014	+ map.put("nation", getBasicConfig(data.getPnationId()));
	1015	+ map.put("plevelType", getBasicConfig(data.getPlevelTypeId()));
1033	1016	map.put("register", CommonsHelper.getResidence(data.getProvinceRegisterId(), data.getCityRegisterId(),
1034	1017	data.getAreaRegisterId(), data.getStreetRegisterId(), data.getAddressRegister(), basicConfigService));
1035		- if(StringUtils.isNotEmpty(data.getHusbandName())){
1036		- map.put("husbandName",data.getHusbandName()+",丈夫");
1037		- map.put("hPhone",data.getHusbandPhone());
	1018	+ if (StringUtils.isNotEmpty(data.getHusbandName())) {
	1019	+ map.put("husbandName", data.getHusbandName() + ",丈夫");
	1020	+ map.put("hPhone", data.getHusbandPhone());
1038	1021	}
1039	1022	String hospital = "";
1040	1023	if (org.apache.commons.lang.StringUtils.isNotEmpty(reOrderModel.getOutHospitalId())) {
1041	1024
...	...	@@ -1043,10 +1026,10 @@
1043	1026	hospital = organization.getName();
1044	1027	}
1045	1028	}
1046		- map.put("zhuanCName",hospital);
	1029	+ map.put("zhuanCName", hospital);
1047	1030	Users users = usersService.getUsers(NumberUtils.toInt(reOrderModel.getApplyDoctor()));
1048		- map.put("applyDoctor",users.getName());
1049		- map.put("create",DateUtil.getyyyy_MM_dd(reOrderModel.getCreated()));
	1031	+ map.put("applyDoctor", users.getName());
	1032	+ map.put("create", DateUtil.getyyyy_MM_dd(reOrderModel.getCreated()));
1050	1033	String hospital1 = "";
1051	1034	/*if (org.apache.commons.lang.StringUtils.isNotEmpty(reOrderModel.getTransferredHospital())) {
1052	1035	Organization organization = organizationService.getOrganization(Integer.parseInt(reOrderModel.getTransferredHospital()));
1053	1036
...	...	@@ -1054,11 +1037,11 @@
1054	1037	hospital1 = organization.getName();
1055	1038	}
1056	1039	}*/
1057		- map.put("zhuanRname",reOrderModel.getTransferredHospital());
	1040	+ map.put("zhuanRname", reOrderModel.getTransferredHospital());
1058	1041	if (NumberUtils.isNumber(reOrderModel.getRecDoctor())) {
1059	1042	Users users1 = usersService.getUsers(NumberUtils.toInt(reOrderModel.getRecDoctor()));
1060	1043	if (null != users) {
1061		- map.put("recDoctor",users1.getName());
	1044	+ map.put("recDoctor", users1.getName());
1062	1045	}
1063	1046	}
1064	1047	if (null != reOrderModel.getReceived()) {
1065	1048
1066	1049
1067	1050
1068	1051
1069	1052
1070	1053
1071	1054
1072	1055
1073	1056
1074	1057
...	...	@@ -1269,211 +1252,112 @@
1269	1252	return "";
1270	1253	}
1271	1254
1272		- public BaseResponse addOneSieveApplyOrder_huada(SieveApplyOrderAddRequestHuada sieveApplyOrderAddRequestHuada, Integer userId) {
1273		- SieveApplyOrderHuadaModel sieveApplyOrderHuadaModel = sieveApplyOrderAddRequestHuada.convertToDataModel();
1274		- //修改这块占时不写
1275		-
	1255	+ /**
	1256	+ * 审核高危转诊
	1257	+ **/
	1258	+ public BaseResponse messageAudit(Integer userId, String type) {
1276	1259	String hospitalId = autoMatchFacade.getHospitalId(userId);
1277		- //表示区域的_暂时不使用(sieveApplyOrderAddRequestHuada, userId, sieveApplyOrderHuadaModel, hospitalId);
1278		-
1279		- SieveApplyOrderQuery sieveApplyOrderQuery1 = new SieveApplyOrderQuery();
1280		- sieveApplyOrderQuery1.setParentId(sieveApplyOrderAddRequestHuada.getParentId());
1281		- sieveApplyOrderQuery1.setHospitalId(hospitalId);
1282		- sieveApplyOrderQuery1.setYn(YnEnums.YES.getId());
1283		- //先查询本院是否已申请
1284		- List<SieveApplyOrderHuadaModel> list1 = applyOrderHuadaService.querySieveApplyOrderWithQuery(sieveApplyOrderQuery1);
1285		- if (CollectionUtils.isEmpty(list1)) {
1286		- //增加产筛
1287		- sieveApplyOrderHuadaModel.setCreated(new Date());
1288		- sieveApplyOrderHuadaModel.setHospitalId(hospitalId);
1289		- sieveApplyOrderHuadaModel.setInformedConsent("02");
1290		- sieveApplyOrderHuadaModel.setInformedConsentVersion("02");
1291		- sieveApplyOrderHuadaModel.setGestationalWeeks(getWeeks(sieveApplyOrderAddRequestHuada.getGestationalWeeks()));//孕周
1292		- sieveApplyOrderHuadaModel.setChargeType("3");
1293		- Patients patients = patientsService.findOnePatientById(sieveApplyOrderAddRequestHuada.getParentId());
1294		- Date lmp = patients.getFuckLastMens() == null ? patients.getLastMenses() : patients.getFuckLastMens();
1295		- SimpleDateFormat formatter = new SimpleDateFormat("yyyy-MM-dd");
1296		- sieveApplyOrderHuadaModel.setLmp(formatter.format(lmp));//末次月经
1297		- sieveApplyOrderHuadaModel.setAge(patients.getAge().toString());
1298		- SieveApplyOrderHuadaModel sieveApplyOrderHuadaModel1 = applyOrderHuadaService.addOneSieveApplyOrder(sieveApplyOrderHuadaModel);
1299		- /*优惠卷改为已使用状态，等看看设计这块有没有这块需求
1300		- if (StringUtils.isNotBlank(sieveApplyOrderAddRequestHuada.getCouponCode())) {
1301		- couponService.use(hospitalId, sieveApplyOrderAddRequestHuada.getCouponCode(), userId, sieveApplyOrderHuadaModel1.getId());
1302		- }*/
1303		- operateLogFacade.addAddOptLog(userId, Integer.parseInt(hospitalId), sieveApplyOrderHuadaModel, OptActionEnums.ADD.getId(), "增加产筛申请单");
1304		-
1305		- //调用华大基因接口
1306		- sieveApplyOrderHuadaModel.setExtBaseInfoId(sieveApplyOrderHuadaModel1.getId());
1307		- boolean b = huadaSaveSampleInfo(sieveApplyOrderHuadaModel);
1308		- if(b){
1309		- System.out.println("华大基因5.1.保存送检单成功");
1310		- //华大基因产筛申请，保存成功后在改变产筛状态
1311		- //产前产筛状态，等看看设计这块有没有这块需求
1312		- // updateSieveStatus(sieveApplyOrderAddRequestHuada, userId, sieveApplyOrderHuadaModel, hospitalId);
1313		-
1314		- }else {
1315		- operateLogFacade.addAddOptLog(userId, Integer.parseInt(hospitalId), sieveApplyOrderHuadaModel, OptActionEnums.ADD.getId(), "华大基因5.1.保存送检单失败");
1316		- }
1317		- }else {
1318		- return new BaseResponse().setErrorcode(ErrorCodeConstants.DATA_EXIST).setErrormsg("已申请过产筛");
1319		- }
1320		- return new BaseResponse().setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("成功");
1321		-
1322		- }
1323		-
1324		- private String getWeeks(String str) {
1325		- String s1=null;
1326		- s1 = str.replace("孕", "");
1327		- s1 = s1.replace("周", "w");
1328		- s1 = s1.replace("天", "");
1329		- return s1;
1330		- }
1331		-
1332		- private void 表示区域的_暂时不使用(SieveApplyOrderAddRequestHuada sieveApplyOrderAddRequestHuada, Integer userId, SieveApplyOrderHuadaModel sieveApplyOrderHuadaModel, String hospitalId) {
1333		- if (StringUtils.isNotEmpty(groupsFacade.findByCurrentUserId(hospitalId))) {
1334		- String parentId = antenatalExaminationFacade.handHideBuild(sieveApplyOrderAddRequestHuada.getPid(), sieveApplyOrderAddRequestHuada.getParentId(), userId, -1);
1335		- if (StringUtils.isEmpty(parentId)) {
1336		- throw new BusinessException();
1337		- //打印日志
	1260	+ ReferralApplyOrderQuery referralApplyOrderQuery = new ReferralApplyOrderQuery();
	1261	+ //转入医院
	1262	+ referralApplyOrderQuery.setTransferredHospital(hospitalId);
	1263	+ referralApplyOrderQuery.setStatus(1);
	1264	+ List<Map<String, Object>> message = new ArrayList<>();
	1265	+ List<BabyApplyOrderResult> babyApplyOrderResults = new ArrayList<>();
	1266	+ //查询是否有消息
	1267	+ Map<String, Object> messageMap = new HashMap<>();
	1268	+ if ("0".equals(type)) {
	1269	+ //查询24小时内的消息数据
	1270	+ referralApplyOrderQuery.setTransferredStart(DateUtil.addDay(new Date(), -1));
	1271	+ referralApplyOrderQuery.setTransferredEnd(new Date());
	1272	+ int cout = applyOrderService.queryCount(referralApplyOrderQuery);
	1273	+ if (cout > 0) {
	1274	+ messageMap.put("count", cout);
	1275	+ //messageMap.put("flag", true);
	1276	+ //message.add(messageMap);
1338	1277	} else {
1339		- sieveApplyOrderHuadaModel.setParentId(parentId);
1340		- sieveApplyOrderAddRequestHuada.setParentId(parentId);
1341		- Patients p = patientsService.findOnePatientById(parentId);
1342		- //加入产筛
1343		- patientsService.validata(p);
	1278	+ messageMap.put("count", 0);
	1279	+ // message.add(messageMap);
1344	1280	}
1345		- }
1346		- }
	1281	+ return new BaseObjectResponse().setData(messageMap).setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("提示：您有" + cout + "条高危转诊数据未处理！");
	1282	+ } else {
	1283	+ List<ReferralApplyOrderModel> referralApplyOrderModels = applyOrderService.queryReferralApplyOrderWithQuery(referralApplyOrderQuery);
	1284	+ if (CollectionUtils.isNotEmpty(referralApplyOrderModels)) {
	1285	+ for (ReferralApplyOrderModel applyOrderModel : referralApplyOrderModels) {
	1286	+ BabyApplyOrderResult babyApplyOrderResult = new BabyApplyOrderResult();
	1287	+ String zhuanchu = applyOrderModel.getOutHospitalId();
	1288	+ String zhuanru = applyOrderModel.getTransferredHospital();
	1289	+ String zhuanCName = zhuanchu;
	1290	+ String zhuanRname = zhuanru;
	1291	+ if (NumberUtils.isNumber(zhuanchu)) {
	1292	+ try {
	1293	+ Organization zhuanc = organizationService.getOrganization(Integer.valueOf(zhuanchu));
	1294	+ if (null != zhuanc) {
	1295	+ zhuanCName = zhuanc.getName();
	1296	+ }
	1297	+ } catch (Exception e) {
1347	1298
1348		- private void updateSieveStatus(SieveApplyOrderAddRequestHuada sieveApplyOrderAddRequestHuada, Integer userId, SieveApplyOrderHuadaModel sieveApplyOrderHuadaModel, String hospitalId) {
1349		- SieveQuery sieveQuery = new SieveQuery();
1350		- sieveQuery.setYn(YnEnums.YES.getId());
1351		- sieveQuery.setParentId(sieveApplyOrderAddRequestHuada.getParentId());
1352		- List<SieveModel> sieveModels = sieveService.queryList(sieveQuery);
1353		- if (CollectionUtils.isNotEmpty(sieveModels))
1354		- {
1355		- SieveModel sieveModel = sieveModels.get(0);
1356		- sieveModel.setReviceStatus(1);
1357		- sieveModel.setSieveHospitalId(sieveApplyOrderAddRequestHuada.getSieveHospitalId());
1358		- sieveModel.setApplyHospitalId(hospitalId);
1359		- sieveModel.setApplyTime(sieveApplyOrderHuadaModel.getApplyTime());
1360		- sieveModel.setStatus(2);
1361		- if (StringUtils.isNotEmpty(sieveApplyOrderHuadaModel.getCheckDate())) {
1362		- sieveModel.setApplyDate(DateUtil.parseYMD(sieveApplyOrderHuadaModel.getCheckDate()));
1363		- }
1364		- int days = DateUtil.daysBetween(sieveModel.getLastMenses(), sieveModel.getApplyDate());
1365		- sieveModel.setDueWeek(days);
1366		- SieveService.handOrder(sieveModel);
1367		- sieveService.updateOneChanQianDiaSieve(sieveModel);
1368		- operateLogFacade.addModifyOptLog(userId, Integer.parseInt(hospitalId), sieveModels.get(0), sieveModel, OptActionEnums.UPDATE.getId(), "增加产前筛查");
1369		- }
1370		- }
	1299	+ }
	1300	+ }
	1301	+ if (NumberUtils.isNumber(zhuanru)) {
	1302	+ try {
	1303	+ Organization zhuanc1 = organizationService.getOrganization(Integer.valueOf(zhuanru));
	1304	+ if (null != zhuanc1) {
	1305	+ zhuanRname = zhuanc1.getName();
	1306	+ }
	1307	+ } catch (Exception e) {
	1308	+ }
	1309	+ }
	1310	+ if (NumberUtils.isNumber(applyOrderModel.getApplyDoctor())) {
	1311	+ Users users = usersService.getUsers(NumberUtils.toInt(applyOrderModel.getApplyDoctor()));
	1312	+ if (null != users) {
	1313	+ babyApplyOrderResult.setApplyDoctor(users.getName());
	1314	+ }
	1315	+ }
	1316	+ if (NumberUtils.isNumber(applyOrderModel.getRecDoctor())) {
	1317	+ Users users = usersService.getUsers(NumberUtils.toInt(applyOrderModel.getRecDoctor()));
	1318	+ if (null != users) {
	1319	+ babyApplyOrderResult.setRecDoctor(users.getName());
	1320	+ }
	1321	+ }
	1322	+ babyApplyOrderResult.convert(applyOrderModel, zhuanCName, zhuanRname);
1371	1323
1372		-
1373		- public boolean huadaSaveSampleInfo(Object o){
1374		- try {
1375		- ArrayList<AllParamsRequest> paramsList = new ArrayList();
1376		- AllParamsRequest paramsRequest = new AllParamsRequest();
1377		- paramsRequest.setProductLine("3");
1378		- paramsRequest.setSampleInfo(o);
1379		- paramsRequest.setIdentifying("");
1380		- paramsList.add(paramsRequest);
1381		- String jsonString = JSON.toJSONString(paramsList.toArray());
1382		- HashMap<String, String> map = new HashMap<>();
1383		- map.put("params", jsonString);
1384		-
1385		- Map<String, Object> signParams = getSignParams(SYSCODE, SECRET);
1386		- String timestamp = signParams.get("timestamp").toString();
1387		- timestamp = timestamp.replaceAll(" ", "%20");//空格替换成 %20
1388		- String syscode = signParams.get("syscode").toString();
1389		- String sign = signParams.get("sign").toString();
1390		- String s = HttpClientUtil.sendPost(HUADA_URL + "/intf?method=saveSampleInfo&"+ "timestamp=" + timestamp + "&syscode=" + syscode + "&sign=" + sign, map);
1391		- JSONObject jsonObject = JSONObject.parseObject(s);
1392		- JSONObject rows = JSONObject.parseObject(jsonObject.get("rows").toString());
1393		- JSONArray jsonArray = JSONArray.parseArray(rows.get("successedList").toString());
1394		- if (jsonArray.isEmpty()){
1395		- return false;
	1324	+ BabyModel babyModel = babyService.getOneBabyById(applyOrderModel.getParentId());
	1325	+ if (null != babyModel) {
	1326	+ babyApplyOrderResult.setVcCardNo(babyModel.getVcCardNo());
	1327	+ if (StringUtils.isNotEmpty(babyModel.getParentId())) {
	1328	+ Patients patients = patientsService.findOnePatientById(babyModel.getParentId());
	1329	+ if (null != patients) {
	1330	+ babyApplyOrderResult.setmCardNo(patients.getCardNo());
	1331	+ }
	1332	+ }
	1333	+ }
	1334	+ String diagnose = "";
	1335	+ List<String> diagnoseList = applyOrderModel.getrRisk();
	1336	+ if (CollectionUtils.isNotEmpty(diagnoseList)) {
	1337	+ diagnose = "";
	1338	+ for (String obj : diagnoseList) {
	1339	+ diagnose += obj + " ";
	1340	+ }
	1341	+ babyApplyOrderResult.sethRisk(diagnose);
	1342	+ }
	1343	+ babyApplyOrderResults.add(babyApplyOrderResult);
	1344	+ }
1396	1345	}
1397		- return true;
1398		- } catch (Exception e) {
1399		- e.printStackTrace();
	1346	+ return new BaseObjectResponse().setData(babyApplyOrderResults).setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("成功");
1400	1347	}
1401		- return false;
1402	1348	}
1403	1349
1404		- /**
1405		- * 获取签名map
1406		- * @param syscode 系统编码
1407		- * @param secret 系统秘钥
1408		- * @return
1409		- */
1410		- public static Map<String, Object> getSignParams(String syscode,String secret) {
1411		- Map<String, Object> signParams=new HashMap<>();
1412		- signParams.put("syscode", syscode);
1413		- SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
1414		- signParams.put("timestamp", sdf.format(new Date()));
1415		- String unencryptedStr=getUnencryptedStr(signParams);
1416		- String sign2=MD5.getMD5(secret+unencryptedStr+secret);//获取数字签名
1417		- System.out.println("sign2 "+sign2);
1418		- signParams.put("sign", sign2);
1419		- return signParams;
1420		- }
1421		- /**
1422		- * 获取待加密字符串
1423		- * @param signParams
1424		- * @return
1425		- */
1426		- public static String getUnencryptedStr(Map<String, Object> signParams) {
1427		- List<String> paramsList = new ArrayList<>();
1428		- for (String key : signParams.keySet()) {
1429		- if ("sign".equals(key)) {
1430		- continue;
1431		- }
1432		- String value = (String) signParams.get(key);
1433		- paramsList.add(key + value);//将参数转换成key+value格式
	1350	+ public BaseResponse auditMessages(Integer userId, String id, String state) {
	1351	+ ReferralApplyOrderModel referralApplyOrderModel = applyOrderService.findByIdReferralApplyOrder(id);
	1352	+ String hospital = autoMatchFacade.getHospitalId(userId);
	1353	+ if (null != referralApplyOrderModel) {
	1354	+ ReferralApplyOrderQuery referralApplyOrderQuery = new ReferralApplyOrderQuery();
	1355	+ referralApplyOrderQuery.setId(id);
	1356	+ referralApplyOrderModel.setStatus(Integer.parseInt(state));
	1357	+ applyOrderService.updateByParentId(referralApplyOrderQuery, referralApplyOrderModel);
1434	1358	}
1435		- Object[] paramsArray = (Object[]) paramsList.toArray();
1436		- Arrays.sort(paramsArray);//ascii码排序
1437		- String unencryptedStr = "";//待加密字符串
1438		- for (Object paramStr : paramsArray) {
1439		- unencryptedStr += paramStr;
1440		- }
1441		- return unencryptedStr;
	1359	+ return new BaseObjectResponse().setData("").setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("成功");
1442	1360	}
1443	1361
1444		- public BaseResponse callbackLyms(net.sf.json.JSONObject jsonObject) {
1445		- System.out.println(jsonObject);
1446		- return null;
1447		- }
1448		-/拼json使用/
1449		- class AllParamsRequest{
1450		- private String productLine;
1451		- private String identifying;
1452		- private Object sampleInfo;
1453		-
1454		- public String getIdentifying() {
1455		- return identifying;
1456		- }
1457		-
1458		- public void setIdentifying(String identifying) {
1459		- this.identifying = identifying;
1460		- }
1461		-
1462		- public String getProductLine() {
1463		- return productLine;
1464		- }
1465		-
1466		- public void setProductLine(String productLine) {
1467		- this.productLine = productLine;
1468		- }
1469		-
1470		- public Object getSampleInfo() {
1471		- return sampleInfo;
1472		- }
1473		-
1474		- public void setSampleInfo(Object sampleInfo) {
1475		- this.sampleInfo = sampleInfo;
1476		- }
1477		- }
1478	1362	}

...	...	@@ -348,6 +348,10 @@
348	348	//查询孕妇基本信息
349	349	Patients patients = patientsService.findOnePatientById(diagnosisModel.getParentId());
350	350
	351	+ if(patients == null){
	352	+ continue;
	353	+ }
	354	+
351	355	SieveQuery sieveQuery = new SieveQuery();
352	356	sieveQuery.setParentId(diagnosisModel.getParentId());
353	357	//查询产筛list
...	...	@@ -552,6 +556,9 @@
552	556	}
553	557	//查询孕妇基本信息
554	558	Patients patients = patientsService.findOnePatientById(diagnosisModel.getParentId());
	559	+ if (patients == null) {
	560	+ continue;
	561	+ }
555	562
556	563	SieveQuery sieveQuery = new SieveQuery();
557	564	sieveQuery.setParentId(diagnosisModel.getParentId());

...	...	@@ -2152,6 +2152,15 @@
2152	2152
2153	2153	matdeliverFollowListResult.setTaoCheng(isTaocheng);
2154	2154
	2155	+ // 推送时间
	2156	+ String pushTime = "";
	2157	+ List<MatdeliverFollowModel> deliverId = mongoTemplate.find(Query.query(Criteria.where("deliverId").is(deliverModel.getId())), MatdeliverFollowModel.class);
	2158	+ if (CollectionUtils.isNotEmpty(deliverId)) {
	2159	+ MatdeliverFollowModel model = deliverId.get(deliverId.size() - 1);
	2160	+ pushTime = DateUtil.getyyyy_MM_dd(model.getCreateDate());
	2161	+ }
	2162	+ matdeliverFollowListResult.setPushTime(pushTime);
	2163	+
2155	2164	matdeliverFollowListResults.add(matdeliverFollowListResult);
2156	2165	}
2157	2166	listResponse.setPageInfo(matDeliverQuery.getPageInfo());

...	...	@@ -718,13 +718,16 @@
718	718	pushModel.setCreateTime(new Date());
719	719	pushModel.setUsername(patients.getUsername());
720	720	pushModel.setDueDate(DateUtil.parseYMD(deliverModel.getDueDate()));
	721	+ pushModel.setPhone(patients.getPhone());
	722	+ pushModel.setCreateDoctor(userId.toString());
	723	+ pushModel.setYn(YnEnums.YES.getId());
	724	+ pushModel.setHospitalId(hospitalId);
	725	+ mongoTemplate.insert(pushModel);
721	726	}
722	727	}
723		- mongoTemplate.insert(pushModel);
724	728
725	729
726	730	// 推送到指定用户中
727		- Patients patients = mongoTemplate.findOne(Query.query(Criteria.where("_id").is(parentid)), Patients.class);
728	731	Organization organization = organizationService.getOrganization(Integer.parseInt(hospitalId));
729	732	Users users = usersService.getUsers(userId);
730	733	MsgListRequest msgListRequest = new MsgListRequest();
...	...	@@ -732,11 +735,7 @@
732	735	// 1 推送服务， 2 推送和短信服务 3短信服务
733	736	MsgRequest request = new MsgRequest();
734	737
735		- SmsConfigModel model = mongoTemplate.findOne(Query.query(Criteria.where("hospitalId").is(hospitalId)), SmsConfigModel.class);
736		- String messagePrefix = "";
737		- if (model != null) {
738		- messagePrefix = smsConfigFacade.getSmsPrefix(model, userId.toString());
739		- }
	738	+ String messagePrefix = organization.getName();
740	739	request.setFirst(String.format("【%s】为了更好的掌握您产后健康情况，保障新产妇生命安全，请当天将您的身心状态反馈给医生，以便后续健康指导。\n" +
741	740	"请您依据实际情况进行产后信息反馈以免影响医生判断。点击“详情”按钮，进入问卷反馈，提交健康信息，\n" +
742	741	"您的医生将用心分析各项信息为您提供必要的指导帮助或上门访视", messagePrefix));
...	...	@@ -745,7 +744,7 @@
745	744	request.setPhone(phone);
746	745	request.setTimeType(SmsTimeTypeEnums.ONTIME.getId());
747	746	request.setPlanTime(DateUtil.getyyyy_MM_dd_hms(new Date()));
748		- request.setSubTypeId(SmsServiceEnums.FWKT.getId());
	747	+ request.setSubTypeId(SmsServiceEnums.CHWJTX.getId());
749	748	request.setStatus(SmsStatusEnums.WFS.getId());
750	749	request.setHospitalId(hospitalId);
751	750	request.setPatientId(parentid);
...	...	@@ -754,7 +753,7 @@
754	753
755	754	request.setTypeId(0);
756	755
757		- request.setKeyword1(users.getName());
	756	+ request.setKeyword1(String.format(" %s--%s", messagePrefix, users.getName()));
758	757	request.setKeyword2(DateUtil.getyyyy_MM_dd(new Date()));
759	758
760	759	// 参数传递医院id + 产后访视主键
761	760
...	...	@@ -796,15 +795,10 @@
796	795	update.set(entry.getKey(), entryValue.toString());
797	796	}
798	797	}
	798	+ update.set("visitStatus", 2);
	799	+ update.set("visitDate", new Date());
799	800	Query query = Query.query(Criteria.where("id").is(id));
800	801	mongoTemplate.updateFirst(query, update, MatdeliverFollowModel.class);
801		-
802		- MatdeliverFollowModel model = mongoTemplate.findOne(query, MatdeliverFollowModel.class);
803		- if (model != null) {
804		- MaternalDeliverModel deliverModel = mongoTemplate.findOne(Query.query(Criteria.where("_id").is(model.getDeliverId())), MaternalDeliverModel.class);
805		-
806		- }
807		-
808	802	return baseResponse;
809	803	}
810	804	baseResponse.setErrorcode(ErrorCodeConstants.PARAMETER_ERROR);
...	...	@@ -828,8 +822,9 @@
828	822	// 查询号
829	823	String queryNo = param.getQueryNo();
830	824	if (StringUtils.isNotEmpty(queryNo)) {
831		- query.addCriteria(new Criteria().orOperator(Criteria.where("phone").is(queryNo)).orOperator(Criteria.where("username").is(queryNo)).
832		- orOperator(Criteria.where("cardNo").is(queryNo)).orOperator(Criteria.where("vcCardNo").is(queryNo)));
	825	+ query.addCriteria(new Criteria().orOperator(Criteria.where("phone").is(queryNo),
	826	+ Criteria.where("username").is(queryNo), Criteria.where("cardNo").is(queryNo),
	827	+ Criteria.where("vcCardNo").is(queryNo)));
833	828	}
834	829
835	830	// 分娩时间
836	831
...	...	@@ -879,9 +874,20 @@
879	874	query.with(new Sort(new Sort.Order(Sort.Direction.DESC, "createTime")));
880	875
881	876	List<MatdeliverFollowPushModel> models = mongoTemplate.find(query, MatdeliverFollowPushModel.class);
	877	+ List<Map<String, String>> mapList = new ArrayList<>();
	878	+ for (MatdeliverFollowPushModel model : models) {
	879	+ Map<String, String> map = BeanUtils.objectToStringMap(model);
	880	+ map.put("birthStr", model.getBirth() == null ? "" : DateUtil.getyyyy_MM_dd(model.getBirth()));
	881	+ map.put("dueDateStr", model.getDueDate() == null ? "" : DateUtil.getyyyy_MM_dd(model.getDueDate()));
	882	+ map.put("sendTimeStr", model.getSendTime() == null ? "" : DateUtil.getyyyy_MM_dd(model.getSendTime()));
	883	+ map.put("writeTimeStr", model.getWriteTime() == null ? "" : DateUtil.getyyyy_MM_dd(model.getWriteTime()));
	884	+ map.put("confirmTimeStr", model.getConfirmTime() == null ? "" : DateUtil.getyyyy_MM_dd(model.getConfirmTime()));
	885	+ map.put("confirmDoctorStr", model.getConfirmDoctor() == null ? "" : usersService.getUsers(Integer.parseInt(model.getConfirmDoctor())).getName());
	886	+ mapList.add(map);
	887	+ }
882	888	BaseListResponse baseListResponse = new BaseListResponse();
883	889	baseListResponse.setPageInfo(param.getPageInfo());
884		- baseListResponse.setData(models);
	890	+ baseListResponse.setData(mapList);
885	891	return baseListResponse;
886	892	}
887	893	}

...	...	@@ -155,6 +155,19 @@
155	155	*/
156	156	private String causeFailure;
157	157
	158	+ /**
	159	+ * 推送时间
	160	+ */
	161	+ private String pushTime;
	162	+
	163	+ public String getPushTime() {
	164	+ return pushTime;
	165	+ }
	166	+
	167	+ public void setPushTime(String pushTime) {
	168	+ this.pushTime = pushTime;
	169	+ }
	170	+
158	171	public List<Map<String, Object>> getHighRiskLevels() {
159	172	return highRiskLevels;
160	173	}