jiangjiazhi / regional-platform

Commit a261e9f8399bbe7552430f43cd310991b8026b16

Authored by gengxiaokai over 6 years ago

Exists in master and in 6 other branches

产前诊断

Showing 2 changed files with 43 additions and 9 deletions

platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/DiagnosisController.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/DiagnosisFacaed.java

1	1	package com.lyms.platform.operate.web.controller;
2	2
	3	+import com.lyms.platform.common.base.LoginContext;
	4	+import com.lyms.platform.common.result.BaseObjectResponse;
3	5	import com.lyms.platform.common.result.BaseResponse;
4	6	import com.lyms.platform.operate.web.facade.DiagnosisFacaed;
5	7	import com.lyms.platform.operate.web.request.DiagnosisAddRequest;
6	8	import com.lyms.platform.operate.web.result.DiagnosisManagerResult;
	9	+import org.apache.commons.lang.StringUtils;
7	10	import org.springframework.beans.factory.annotation.Autowired;
8	11	import org.springframework.stereotype.Controller;
9	12	import org.springframework.web.bind.annotation.RequestBody;
...	...	@@ -13,6 +16,8 @@
13	16
14	17	import javax.servlet.http.HttpServletRequest;
15	18	import javax.validation.Valid;
	19	+import java.util.ArrayList;
	20	+import java.util.List;
16	21
17	22	/**
18	23	* 产前诊断
...	...	@@ -98,7 +103,7 @@
98	103	*/
99	104	@ResponseBody
100	105	@RequestMapping(value = "/getDiagnosisList",method = RequestMethod.GET)
101		- public DiagnosisManagerResult getDiagnosisList(DiagnosisAddRequest dataresult,HttpServletRequest request){
	106	+ public DiagnosisManagerResult getDiagnosisList(@RequestBody @Valid DiagnosisAddRequest dataresult,HttpServletRequest request){
102	107	//LoginContext loginState = (LoginContext) request.getAttribute("loginContext");
103	108	dataresult.setHospitalId("1000000185");
104	109	return diagnosisFacaed.queryDiagnosisList(dataresult);
105	110
...	...	@@ -113,10 +118,33 @@
113	118	*/
114	119	@ResponseBody
115	120	@RequestMapping(value = "/getDiagnosisLab",method = RequestMethod.GET)
116		- public DiagnosisManagerResult getDiagnosisLab(DiagnosisAddRequest dataresult,HttpServletRequest request){
	121	+ public DiagnosisManagerResult getDiagnosisLab(@RequestBody @Valid DiagnosisAddRequest dataresult,HttpServletRequest request){
117	122	//LoginContext loginState = (LoginContext) request.getAttribute("loginContext");
118	123	dataresult.setHospitalId("1000000185");
119	124	return diagnosisFacaed.queryDiagnosisLab(dataresult);
	125	+ }
	126	+
	127	+
	128	+ /**
	129	+ * 产前诊断管理(接收按钮接口)
	130	+ * @param id
	131	+ * @param request
	132	+ * @return
	133	+ */
	134	+ @ResponseBody
	135	+ @RequestMapping(value = "/getDiagnosisLab",method = RequestMethod.GET)
	136	+ public List<BaseResponse> getDiagnosisLab(String id,HttpServletRequest request){
	137	+ //LoginContext loginState = (LoginContext) request.getAttribute("loginContext");
	138	+ List<BaseResponse> bList = new ArrayList<BaseResponse>();
	139	+ if(StringUtils.isNotEmpty(id)){
	140	+ String[] ary = id.split(",");
	141	+ for(String item : ary){
	142	+ LoginContext loginState = (LoginContext) request.getAttribute("loginContext");
	143	+ bList.add(diagnosisFacaed.updateDiaStarts(item,loginState.getId()));
	144	+ }
	145	+ return bList;
	146	+ }
	147	+ return null;
120	148	}
121	149
122	150	}

...	...	@@ -190,13 +190,15 @@
190	190	*/
191	191	public BaseResponse addOrUpdateDiagnosis(DiagnosisAddRequest dataresult,Integer userId){
192	192	DiagnosisModel diagnosisModel = dataresult.convertToDataModel();
193		- diagnosisModel.setCreated(new Date());
194	193	diagnosisModel.setModified(new Date());
195	194	String hospital = autoMatchFacade.getHospitalId(userId);
196	195	if(StringUtils.isNotEmpty(diagnosisModel.getId())){//更新数据
197	196	DiagnosisQuery diagnosisQuery = new DiagnosisQuery();
198	197	diagnosisQuery.setId(diagnosisModel.getId());
199	198	List<DiagnosisModel> list = diagnosisService.queryDiagnosis(diagnosisQuery);
	199	+ if(StringUtils.isNotEmpty(dataresult.getDiaResult())){
	200	+ diagnosisModel.setDiaStatus("3");//已诊断状态
	201	+ }
200	202	//更新数据
201	203	diagnosisService.updateDiagnosisById(diagnosisModel,diagnosisModel.getId());
202	204	//添加记录
...	...	@@ -207,6 +209,7 @@
207	209	objectResponse.setErrormsg("成功");
208	210	return objectResponse;
209	211	}else{//新增数据
	212	+ diagnosisModel.setCreated(new Date());
210	213	diagnosisModel.setDiaStatus("1");//已申请状态
211	214	diagnosisModel.setStatus("1");
212	215	diagnosisModel.setRefStatus("0");
213	216
...	...	@@ -372,14 +375,17 @@
372	375	public BaseObjectResponse updateDiaStarts(String id,Integer userId){
373	376	BaseObjectResponse br = new BaseObjectResponse();
374	377	String hospital = autoMatchFacade.getHospitalId(userId);
375		- DiagnosisQuery diagnosisQuery = new DiagnosisQuery();
376	378	DiagnosisModel dia = new DiagnosisModel();
377	379	dia = diagnosisService.findOneDiagnosisById(id);
378		-
379		- diagnosisQuery.setDiaStatus("2");
380		-
381		-
382		- return null;
	380	+ DiagnosisModel diagnosisModel = new DiagnosisModel();
	381	+ diagnosisModel.setDiaStatus("2");
	382	+ //更新数据
	383	+ diagnosisService.updateDiagnosisById(diagnosisModel, id);
	384	+ //添加记录
	385	+ operateLogFacade.addModifyOptLog(userId, Integer.parseInt(hospital), dia, diagnosisModel, OptActionEnums.UPDATE.getId(), "产前诊断接收修改完成");
	386	+ br.setData(dia.getId());
	387	+ br.setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg(ErrorCodeConstants.SUCCESS_DESCRIPTION);
	388	+ return br;
383	389	}
384	390
385	391