jiangjiazhi / regional-platform

Commit 5e5d8217e1c6ac349a89630282c5ea653aad86b2

Authored by liquanyu about 9 years ago

Exists in master and in 8 other branches

code update

Showing 4 changed files with 105 additions and 9 deletions

platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/PuerperaManageController.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/PatientFacade.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/RiskPatientsQueryRequest.java

...	...	@@ -18,6 +18,7 @@
18	18	import org.springframework.web.bind.annotation.*;
19	19
20	20	import javax.servlet.http.HttpServletRequest;
	21	+import javax.servlet.http.HttpServletResponse;
21	22	import javax.validation.Valid;
22	23	import java.util.ArrayList;
23	24	import java.util.HashMap;
...	...	@@ -91,7 +92,7 @@
91	92	@TokenRequired
92	93	public BaseResponse queryHighRiskPuerpera(@Valid RiskPatientsQueryRequest patientsQueryRequest,HttpServletRequest request) {
93	94	LoginContext loginState = (LoginContext) request.getAttribute("loginContext");
94		- return patientFacade.queryHighRisk(patientsQueryRequest, Boolean.TRUE, 1,loginState.getId());
	95	+ return patientFacade.queryHighRisk(patientsQueryRequest, Boolean.TRUE, 1, loginState.getId(),"true");
95	96	}
96	97	/**
97	98	*全部孕妇管理
98	99
99	100
...	...	@@ -104,10 +105,25 @@
104	105	@TokenRequired
105	106	public BaseResponse queryAllPuerpera(@Valid RiskPatientsQueryRequest patientsQueryRequest,HttpServletRequest request) {
106	107	LoginContext loginState = (LoginContext) request.getAttribute("loginContext");
107		- return patientFacade.queryHighRisk(patientsQueryRequest,null,1,loginState.getId());
	108	+ return patientFacade.queryHighRisk(patientsQueryRequest,null,1,loginState.getId(),"true");
108	109	}
109	110
	111	+
110	112	/**
	113	+ * 导出孕产妇数据
	114	+ * @param patientsQueryRequest
	115	+ * @param request
	116	+ * @return
	117	+ */
	118	+ @RequestMapping(value = "/exportData", method = RequestMethod.GET)
	119	+ @TokenRequired
	120	+ public void exportAllPuer(@Valid RiskPatientsQueryRequest patientsQueryRequest,HttpServletRequest request,HttpServletResponse response) {
	121	+ LoginContext loginState = (LoginContext) request.getAttribute("loginContext");
	122	+ patientFacade.exportAllPuer(patientsQueryRequest,loginState.getId(),response);
	123	+ }
	124	+
	125	+
	126	+ /**
111	127	* 全部产妇
112	128	*
113	129	* @return
...	...	@@ -117,7 +133,7 @@
117	133	@TokenRequired
118	134	public BaseResponse queryAllPatients(@Valid RiskPatientsQueryRequest patientsQueryRequest,HttpServletRequest request){
119	135	LoginContext loginState = (LoginContext) request.getAttribute("loginContext");
120		- return patientFacade.queryHighRisk(patientsQueryRequest, null, 3,loginState.getId());
	136	+ return patientFacade.queryHighRisk(patientsQueryRequest, null, 3,loginState.getId(),"true");
121	137	}
122	138
123	139	@RequestMapping(value = "/apatients/enums", method = RequestMethod.GET)

...	...	@@ -437,7 +437,8 @@
437	437	MessageListRequest smsList = new MessageListRequest();
438	438	List<MessageRequest> messages = new ArrayList<>();
439	439	MessageRequest mr = new MessageRequest();
440		- Date dueDate = DateUtil.addWeek(patient.getLastMenses(),42);
	440	+ Date dueDate = DateUtil.addDay(patient.getLastMenses(), 7);
	441	+ dueDate = DateUtil.addMonth(patient.getLastMenses(), 9);
441	442	String content = StringUtils.replaceEL(patient.getUsername(),dueDate,templateModel.getContent());
442	443
443	444	mr.setContent("【"+messagePrefix+"】"+content);

...	...	@@ -8,6 +8,7 @@
8	8	import com.lyms.platform.common.result.BaseResponse;
9	9	import com.lyms.platform.common.utils.Assert;
10	10	import com.lyms.platform.common.utils.DateUtil;
	11	+import com.lyms.platform.common.utils.ExcelUtil;
11	12	import com.lyms.platform.common.utils.JsonUtil;
12	13	import com.lyms.platform.operate.web.request.*;
13	14	import com.lyms.platform.operate.web.result.*;
...	...	@@ -24,9 +25,10 @@
24	25	import org.springframework.data.domain.Sort;
25	26	import org.springframework.stereotype.Component;
26	27
27		-import java.util.ArrayList;
28		-import java.util.Date;
29		-import java.util.List;
	28	+import javax.servlet.http.HttpServletResponse;
	29	+import java.io.IOException;
	30	+import java.io.OutputStream;
	31	+import java.util.*;
30	32
31	33	/**
32	34	* Created by Administrator on 2016/4/22 0022.
...	...	@@ -196,7 +198,7 @@
196	198	* @param type 控制类型 1孕妇 3产妇
197	199	* @return
198	200	*/
199		- public BaseResponse queryHighRisk(RiskPatientsQueryRequest riskPatientsQueryRequest, Boolean isHighRisk, int type, Integer userId) {
	201	+ public BaseResponse queryHighRisk(RiskPatientsQueryRequest riskPatientsQueryRequest, Boolean isHighRisk, int type, Integer userId,String needPage) {
200	202	PatientsQuery patientsQuery = new PatientsQuery();
201	203	patientsQuery.setPhone(riskPatientsQueryRequest.getPhone());
202	204	patientsQuery.setCardNo(riskPatientsQueryRequest.getCardNo());
...	...	@@ -246,7 +248,7 @@
246	248	buildType.add(2);
247	249	patientsQuery.setBuildTypeList(buildType);
248	250	patientsQuery.setHospitalId(autoMatchFacade.getHospitalId(userId));
249		- patientsQuery.setNeed("1");
	251	+ patientsQuery.setNeed(needPage);
250	252	//查询符合条件的孕妇
251	253	List<Patients> patientses = patientsService.queryPatient1(patientsQuery,"modified");
252	254	List data = new ArrayList<>();
...	...	@@ -569,6 +571,71 @@
569	571	}
570	572	}
571	573	return new BaseResponse().setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("成功");
	574	+ }
	575	+
	576	+ public void exportAllPuer(RiskPatientsQueryRequest patientsQueryRequest,Integer userId,
	577	+ HttpServletResponse response) {
	578	+ response.setContentType("application/octet-stream");
	579	+ response.setHeader("Content-Disposition", "attachment;fileName=" + "datas.xls");
	580	+ try {
	581	+ BaseListResponse listResponse = null;
	582	+ List<Map<String,Object>> datas = new ArrayList<>();
	583	+ if (patientsQueryRequest.getQueryType() != null)
	584	+ {
	585	+ // 0 高危孕妇 1 全部孕妇 2全部产妇
	586	+ if (patientsQueryRequest.getQueryType() == 0)
	587	+ {
	588	+ listResponse = (BaseListResponse)queryHighRisk(patientsQueryRequest, Boolean.TRUE, 1, userId,"true");
	589	+ List list = listResponse.getData();
	590	+ for (Object obj : list)
	591	+ {
	592	+ Map<String,Object> data = new HashMap<>();
	593	+ RiskPatientsResult rp = (RiskPatientsResult)obj;
	594	+ data.put("name", rp.getName());
	595	+ data.put("age",rp.getAge());
	596	+ data.put("dueWeek",rp.getDueWeek());
	597	+ data.put("rLevel", rp.getrLevel());
	598	+ data.put("rFactor", rp.getrFactor());
	599	+ data.put("hScore", rp.gethScore());
	600	+ data.put("cTimes", rp.getcTime());
	601	+ data.put("cHTimes",rp.getcHTimes());
	602	+ data.put("cTime",rp.getcTime());
	603	+ data.put("dueDate",rp.getDueDate());
	604	+ data.put("checkDoctor",rp.getCheckDoctor());
	605	+ data.put("lName",rp.getlName());
	606	+ data.put("phone",rp.getPhone());
	607	+ }
	608	+
	609	+ Map<String,String> cnames = new HashMap<>();
	610	+ cnames.put("name", "姓名");
	611	+ cnames.put("age","当前年龄");
	612	+ cnames.put("dueWeek","当前孕周");
	613	+ cnames.put("rLevel", "高危等级");
	614	+ cnames.put("rFactor", "高危风险因素");
	615	+ cnames.put("hScore", "高危评分");
	616	+ cnames.put("cTimes", "总产检次数");
	617	+ cnames.put("cHTimes","本院产检次数");
	618	+ cnames.put("cTime","预约产检日期");
	619	+ cnames.put("dueDate","预产期");
	620	+ cnames.put("checkDoctor","产检医生");
	621	+ cnames.put("lName","登记人");
	622	+ cnames.put("phone","联系方式");
	623	+
	624	+ OutputStream out = response.getOutputStream();
	625	+ ExcelUtil.toExcel(out, datas, cnames);
	626	+ }
	627	+ else if (patientsQueryRequest.getQueryType() == 1)
	628	+ {
	629	+ listResponse = (BaseListResponse)queryHighRisk(patientsQueryRequest,null,1,userId,"true");
	630	+ }
	631	+ else if (patientsQueryRequest.getQueryType() == 2)
	632	+ {
	633	+ listResponse = (BaseListResponse)queryHighRisk(patientsQueryRequest, null, 3,userId,"true");
	634	+ }
	635	+ }
	636	+ }catch (IOException e) {
	637	+ e.printStackTrace();
	638	+ }
572	639	}
573	640	}

...	...	@@ -62,6 +62,18 @@
62	62	@FormParam
63	63	private Integer expVip;
64	64
	65	+
	66	+ // 0 高危孕妇 1 全部孕妇 2全部产妇
	67	+ private Integer queryType;
	68	+
	69	+ public Integer getQueryType() {
	70	+ return queryType;
	71	+ }
	72	+
	73	+ public void setQueryType(Integer queryType) {
	74	+ this.queryType = queryType;
	75	+ }
	76	+
65	77	public Integer getEndHScore() {
66	78	return endHScore;
67	79	}