shiyang / regional-platform

Commit 81348cf0b7dac36d1ff4bbb20d3a5d11a9caa914

Authored by liquanyu over 8 years ago

产筛修改

Showing 3 changed files with 83 additions and 8 deletions

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/SieveFacade.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/SieveListResult.java

...	...	@@ -193,5 +193,20 @@
193	193	LoginContext loginState = (LoginContext) request.getAttribute("loginContext");
194	194	sieveFacade.exportCqsieves(cqSieveQueryRequest, loginState.getId(),response);
195	195	}
	196	+
	197	+
	198	+ /**
	199	+ * 产筛备注保存
	200	+ * @param cqId 产筛id
	201	+ * @param qsTypeId 备注类型Id
	202	+ * @param detail 详情
	203	+ * @return
	204	+ */
	205	+ @ResponseBody
	206	+ @RequestMapping(value = "/saveCqRemark",method = RequestMethod.GET)
	207	+ @TokenRequired
	208	+ public BaseResponse saveCqRemark(@RequestParam(required = true)String cqId,@RequestParam(required = true)String qsTypeId,@RequestParam(required = false)String detail) {
	209	+ return sieveFacade.saveCqRemark(cqId,qsTypeId,detail);
	210	+ }
196	211	}

...	...	@@ -189,10 +189,10 @@
189	189	sieveQuery.setDueWeekEnd(7 * Integer.valueOf(cqSieveQueryRequest.getDueWeekEnd()) + 6);
190	190	}
191	191	if(null!=cqSieveQueryRequest.getcDueWeekStart()){
192		- sieveQuery.setLastMensesEnd(DateUtil.addDay(DateUtil.parseYMD(DateUtil.getyyyy_MM_dd(new Date())), -(cqSieveQueryRequest.getcDueWeekStart()*7)));
	192	+ sieveQuery.setLastMensesEnd(DateUtil.addDay(DateUtil.parseYMD(DateUtil.getyyyy_MM_dd(new Date())), -(cqSieveQueryRequest.getcDueWeekStart() * 7)));
193	193	}
194	194	if(null!=cqSieveQueryRequest.getcDueWeekEnd()){
195		- sieveQuery.setLastMensesStart(DateUtil.addDay(DateUtil.parseYMD(DateUtil.getyyyy_MM_dd(new Date())), -(cqSieveQueryRequest.getcDueWeekEnd()*7)-6));
	195	+ sieveQuery.setLastMensesStart(DateUtil.addDay(DateUtil.parseYMD(DateUtil.getyyyy_MM_dd(new Date())), -(cqSieveQueryRequest.getcDueWeekEnd() * 7) - 6));
196	196	}
197	197
198	198	sieveQuery.setZtfx(cqSieveQueryRequest.getZtfx());
...	...	@@ -203,7 +203,7 @@
203	203	String hospitalId = autoMatchFacade.getHospitalId(userId);
204	204	sieveQuery.setHospitalId(hospitalId);
205	205	//查询产筛list
206		- List<SieveModel> list = sieveService.queryList1(sieveQuery,"status");
	206	+ List<SieveModel> list = sieveService.queryList1(sieveQuery, "status");
207	207	List<SieveListResult> data = new ArrayList<>();
208	208	if (CollectionUtils.isNotEmpty(list)) {
209	209	for (SieveModel sieveModel : list) {
210	210
211	211
...	...	@@ -259,13 +259,16 @@
259	259	Map<String, Object> data = new HashMap<>();
260	260	data.put("name", sive.getName());
261	261	data.put("cDueWeek", sive.getcDueWeek());
	262	+ data.put("statusText", sive.getStatusText());
	263	+ data.put("ztfxText", sive.getZtfxText());
262	264	data.put("tireNumber", sive.getTireNumber());
263	265	data.put("dueWeek", sive.getDueWeek());
264		- data.put("ztfxText", sive.getZtfxText());
265		- data.put("phone", sive.getRealPhone());
266	266	data.put("cqStatus", sive.getCqStatus());
267	267	data.put("cqResult", sive.getCqResult());
268	268	data.put("renShenResult", sive.getRenShenResult());
	269	+ data.put("phone", sive.getRealPhone());
	270	+ data.put("remarkTypeText", sive.getCsRemarkTypeText());
	271	+ data.put("detail", sive.getDetail());
269	272	datas.add(data);
270	273	}
271	274	}
272	275
273	276
274	277
275	278
...	...	@@ -273,20 +276,40 @@
273	276	Map<String, String> cnames = new LinkedHashMap<>();
274	277	cnames.put("name", "姓名");
275	278	cnames.put("cDueWeek", "当前孕周");
	279	+ cnames.put("statusText", "当前状态");
	280	+ cnames.put("ztfxText", "整体风险");
276	281	cnames.put("tireNumber", "胎数");
277	282	cnames.put("dueWeek", "申请孕周");
278		- cnames.put("ztfxText", "整体风险");
279		- cnames.put("phone", "联系方式");
280	283	cnames.put("cqStatus", "产前诊断");
281	284	cnames.put("cqResult", "产前诊断结果");
282	285	cnames.put("renShenResult", "妊娠结局");
	286	+ cnames.put("phone", "联系方式");
	287	+ cnames.put("remarkTypeText", "备注");
	288	+ cnames.put("detail", "详情");
283	289	response.setContentType("application/octet-stream");
284	290	response.setCharacterEncoding("UTF-8");
285		- response.setHeader("Content-Disposition", "attachment;fileName=" + "childDatas.xls");
	291	+ response.setHeader("Content-Disposition", "attachment;fileName=" + "csdata.xls");
286	292	ExcelUtil.toExcel(out, datas, cnames);
287	293	} catch (Exception e) {
288	294
289	295	}
	296	+ }
	297	+
	298	+ /**
	299	+ * 修改产筛备注
	300	+ * @param csId
	301	+ * @param qsTypeId
	302	+ * @param detail
	303	+ * @return
	304	+ */
	305	+ public BaseResponse saveCqRemark(String csId, String qsTypeId, String detail) {
	306	+
	307	+ SieveModel sieve = new SieveModel();
	308	+ sieve.setId(csId);
	309	+ sieve.setCsRemarkTypeId(qsTypeId);
	310	+ sieve.setDetail(detail);
	311	+ sieveService.updateOneChanQianDiaSieve(sieve);
	312	+ return new BaseResponse().setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("成功");
290	313	}
291	314	}

...	...	@@ -37,6 +37,37 @@
37	37	//1 孕妇 0 产妇
38	38	private String isGravida="1";
39	39
	40	+ //备注类型ID
	41	+ private String csRemarkTypeId;
	42	+ //备注类型文本
	43	+ private String csRemarkTypeText;
	44	+ //详情
	45	+ private String detail;
	46	+
	47	+ public String getCsRemarkTypeId() {
	48	+ return csRemarkTypeId;
	49	+ }
	50	+
	51	+ public void setCsRemarkTypeId(String csRemarkTypeId) {
	52	+ this.csRemarkTypeId = csRemarkTypeId;
	53	+ }
	54	+
	55	+ public String getCsRemarkTypeText() {
	56	+ return csRemarkTypeText;
	57	+ }
	58	+
	59	+ public void setCsRemarkTypeText(String csRemarkTypeText) {
	60	+ this.csRemarkTypeText = csRemarkTypeText;
	61	+ }
	62	+
	63	+ public String getDetail() {
	64	+ return detail;
	65	+ }
	66	+
	67	+ public void setDetail(String detail) {
	68	+ this.detail = detail;
	69	+ }
	70	+
40	71	public String getIsGravida() {
41	72	return isGravida;
42	73	}
...	...	@@ -247,6 +278,12 @@
247	278	}
248	279	setStatus(destModel.getStatus());
249	280	setStatusText(SieveStatusEnums.getStrById(destModel.getStatus()));
	281	+ setCsRemarkTypeId(destModel.getCsRemarkTypeId());
	282	+ if (destModel.getCsRemarkTypeId() != null)
	283	+ {
	284	+ setCsRemarkTypeText(CsRemarkTypeEnums.getTitleById(Integer.parseInt(destModel.getCsRemarkTypeId())));
	285	+ }
	286	+ setDetail(destModel.getDetail());
250	287	//整体风险枚举
251	288	// SieveEnums.
252	289	//妊娠结局