jiangjiazhi / regional-platform

Commit 8e3fa117e46b999159072279d7a39ffc80466a87

Authored by gengxiaokai almost 7 years ago

Exists in master and in 6 other branches

威海产后观察

Showing 3 changed files with 147 additions and 10 deletions

platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/PostpartumRecordsController.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PostpartumRecordsFacade.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/PostpartumRecordsQueryRequest.java

...	...	@@ -45,6 +45,25 @@
45	45
46	46
47	47	/**
	48	+ * 根据ID获取一条记录
	49	+ * @param id
	50	+ * @param request
	51	+ * @return
	52	+ */
	53	+ @RequestMapping(value = "/getOneRecordsById",method = RequestMethod.GET)
	54	+ @ResponseBody
	55	+ @TokenRequired
	56	+ public BaseResponse getOneRecordsById(String id,
	57	+ HttpServletRequest request){
	58	+ LoginContext loginState = (LoginContext) request.getAttribute("loginContext");
	59	+ PostpartumRecordsQueryRequest PostpartumRecordsQueryRequest = new PostpartumRecordsQueryRequest();
	60	+ PostpartumRecordsQueryRequest.setId(id);
	61	+ return postpartumRecordsFacade.queryPostpartumRecords(PostpartumRecordsQueryRequest,loginState.getId());
	62	+ }
	63	+
	64	+
	65	+
	66	+ /**
48	67	* 产后观察管理
49	68	* @param postpartumRecordsAddRequest
50	69	* @param request
...	...	@@ -72,7 +91,38 @@
72	91	public BaseResponse addorUpdateRecords(@Valid @RequestBody PostpartumRecordsAddRequest postpartumRecordsAddRequest,
73	92	HttpServletRequest request){
74	93	LoginContext loginState = (LoginContext) request.getAttribute("loginContext");
75		- return postpartumRecordsFacade.addOrUpdatePostpartumRecords(postpartumRecordsAddRequest,loginState.getId());
	94	+ return postpartumRecordsFacade.addOrUpdatePostpartumRecords(postpartumRecordsAddRequest, loginState.getId());
	95	+ }
	96	+
	97	+ /**
	98	+ * 删除其中一条记录详情
	99	+ * @param id
	100	+ * @param request
	101	+ * @return
	102	+ */
	103	+ @RequestMapping(value = "/deleteOneRecords",method = RequestMethod.GET)
	104	+ @ResponseBody
	105	+ @TokenRequired
	106	+ public BaseResponse deleteOneRecords(String id,
	107	+ HttpServletRequest request){
	108	+ LoginContext loginState = (LoginContext) request.getAttribute("loginContext");
	109	+ return postpartumRecordsFacade.deleteRecordes(id, loginState.getId());
	110	+ }
	111	+
	112	+
	113	+ /**
	114	+ * 修改产妇观察状态
	115	+ * @param id
	116	+ * @param request
	117	+ * @return
	118	+ */
	119	+ @RequestMapping(value = "/updateOneRecords",method = RequestMethod.GET)
	120	+ @ResponseBody
	121	+ @TokenRequired
	122	+ public BaseResponse updateOneRecords(String id,
	123	+ HttpServletRequest request){
	124	+ LoginContext loginState = (LoginContext) request.getAttribute("loginContext");
	125	+ return postpartumRecordsFacade.updateZt(id, loginState.getId());
76	126	}
77	127
78	128	}

...	...	@@ -75,15 +75,21 @@
75	75	PostpartumRecordsResult postpartumRecordsResult = new PostpartumRecordsResult();
76	76	String hospital = autoMatchFacade.getHospitalId(userId);
77	77	PostpartumRecordsQuery prQuery = new PostpartumRecordsQuery();
	78	+ List<PostpartumRecords> prList = null;
78	79	PatientsQuery patientsQuery = new PatientsQuery();
79		- if(StringUtils.isNotEmpty(prQueryRequest.getCardNo()) \|\| StringUtils.isNotEmpty(prQueryRequest.getVcCardNo())){
	80	+ if(StringUtils.isNotEmpty(prQueryRequest.getCardNo()) \|\| StringUtils.isNotEmpty(prQueryRequest.getVcCardNo())
	81	+ \|\| StringUtils.isNotEmpty(prQueryRequest.getId())){
80	82	String parentId = null;
81	83	String maternalDeliverId = null;
82		- if(prQueryRequest.getCardNo() !=null){
	84	+ if(StringUtils.isNotEmpty(prQueryRequest.getCardNo())){
83	85	patientsQuery.setCardNo(prQueryRequest.getCardNo());
84	86	}
85		- else if(prQueryRequest.getVcCardNo() != null){
	87	+ else if(StringUtils.isNotEmpty(prQueryRequest.getVcCardNo())){
86	88	patientsQuery.setVcCardNo(prQueryRequest.getVcCardNo());
	89	+ }else if(StringUtils.isNotEmpty(prQueryRequest.getId())){
	90	+ prQuery.setId(prQueryRequest.getId());
	91	+ prQuery.setIsDelete("1");
	92	+ prList = postpartumRecordsService.getPostpartumRecordsQuery(prQuery);
87	93	}
88	94	//patientsQuery.setHospitalId(hospital);
89	95	//查询孕妇
...	...	@@ -99,8 +105,13 @@
99	105	if(CollectionUtils.isNotEmpty(mdList)){
100	106	MaternalDeliverModel maternalDeliverModel = mdList.get(0);
101	107	prQuery.setParentId(parentId);
102		- prQuery.setHospitalId(hospital);
103		- List<PostpartumRecords> prList = postpartumRecordsService.getPostpartumRecordsQuery(prQuery);
	108	+ prQuery.setIsDelete("1");
	109	+ prQuery.setId(null);
	110	+ //prQuery.setHospitalId(hospital);
	111	+ if(CollectionUtils.isEmpty(prList)){
	112	+ prList = postpartumRecordsService.getPostpartumRecordsQuery(prQuery);
	113	+ }
	114	+
104	115	PostpartumRecords postpartumRecords = new PostpartumRecords();
105	116	if(CollectionUtils.isNotEmpty(prList)){
106	117	postpartumRecords = prList.get(0);
107	118
...	...	@@ -113,8 +124,8 @@
113	124	if(CollectionUtils.isNotEmpty(recordList)){
114	125	postpartumRecordsResult.setRecords(recordList);
115	126	}
	127	+ postpartumRecordsResult.convertToResult(postpartumRecords);
116	128	}
117		- postpartumRecordsResult.convertToResult(postpartumRecords);
118	129	postpartumRecordsResult.setName(patients.getUsername());
119	130	postpartumRecordsResult.setBhnum(maternalDeliverModel.getBhNum());
120	131	postpartumRecordsResult.setOneCxl(maternalDeliverModel.getTotalOneCxl());
...	...	@@ -208,7 +219,6 @@
208	219	}
209	220	postpartumRecordsResult.setJsys(deliverDoctor);
210	221
211		-
212	222	}else{
213	223	return new BaseObjectResponse().setErrormsg("孕妇未填写分娩记录,不能进行产后观察！").setErrorcode(ErrorCodeConstants.NO_DATA);
214	224	}
...	...	@@ -219,6 +229,7 @@
219	229
220	230	}else{
221	231	return new BaseObjectResponse().setErrormsg("请输入查询条件！").setErrorcode(ErrorCodeConstants.PARAMETER_ERROR);
	232	+
222	233	}
223	234	return new BaseObjectResponse().setErrormsg("成功！").setErrorcode(ErrorCodeConstants.SUCCESS).setData(postpartumRecordsResult);
224	235	}
...	...	@@ -336,7 +347,6 @@
336	347	pRecords.setTwoCxl(postpartumRecordsAddRequest.getOneCxl());
337	348	pRecords.setTwoCxl(postpartumRecordsAddRequest.getTwoCxl());
338	349	pRecords.setDoctor(String.valueOf(userId));
339		- pRecords.setGcStatus("0");//正在观察
340	350	pRecords.setIsDelete("1");//有效数据
341	351	pRecords.setModified(DateUtil.getyyyy_MM_dd_hms(new Date()));
342	352
...	...	@@ -348,6 +358,14 @@
348	358	ptRecordsQuery.setId(postpartumRecordsAddRequest.getId());
349	359	ptRecordsQuery.setIsDelete("1");
350	360	List<PostpartumRecords> pOldRecords = postpartumRecordsService.getPostpartumRecordsQuery(ptRecordsQuery);
	361	+ pRecords.setGcStatus(pOldRecords.get(0).getGcStatus());
	362	+ pRecords.setHospitalId(hospitalId);
	363	+ pRecords.setIsDelete("1");
	364	+ pRecords.setParentId(pOldRecords.get(0).getParentId());
	365	+ pRecords.setMaternalDeliverId(pOldRecords.get(0).getMaternalDeliverId());
	366	+ pRecords.setDoctor(String.valueOf(userId));
	367	+ pRecords.setOneCxl(postpartumRecordsAddRequest.getOneCxl());
	368	+ pRecords.setTwoCxl(postpartumRecordsAddRequest.getTwoCxl());
351	369	postpartumRecordsService.updatePostpartumRecords(pRecords,pRecords.getId());
352	370	if(CollectionUtils.isNotEmpty(pOldRecords)){
353	371	operateLogFacade.addModifyOptLog(userId, Integer.parseInt(hospitalId), pRecords, pOldRecords.get(0), OptActionEnums.UPDATE.getId(), "修改产后观察");
354	372
355	373
...	...	@@ -355,15 +373,18 @@
355	373	if(CollectionUtils.isNotEmpty(postpartumRecordsAddRequest.getRecords())){
356	374	List<PostpartumRecordsAddRequest.Records> rdsList = postpartumRecordsAddRequest.getRecords();
357	375	for(PostpartumRecordsAddRequest.Records rd : rdsList){
358		- Records records = null;
	376	+ Records records = new Records();
359	377	if(StringUtils.isNotEmpty(rd.getId())){
360	378	//更新详情数据
361	379	records = rd.convertToDataModel();
	380	+ records.setPostId(rd.getId());
362	381	records.setIsDelete("1");
363	382	RecordsQuery recordsQuery = new RecordsQuery();
364	383	recordsQuery.setId(rd.getId());
365	384	recordsQuery.setIsDelete("1");
366	385	List<Records> oldRecordsList = recordsService.getRecordsListQuery(recordsQuery);
	386	+ records.setModified(DateUtil.getyyyy_MM_dd_hms(new Date()));
	387	+ records.setCreated(oldRecordsList.get(0).getCreated());
367	388	recordsService.updateRecordsById(records,records.getId());
368	389	if(CollectionUtils.isNotEmpty(oldRecordsList)){
369	390	operateLogFacade.addModifyOptLog(userId, Integer.parseInt(hospitalId), records, oldRecordsList.get(0), OptActionEnums.UPDATE.getId(), "修改产后观察记录详情");
...	...	@@ -371,6 +392,7 @@
371	392	}else{
372	393	//新增详情数据
373	394	records = rd.convertToDataModel();
	395	+ records.setPostId(rd.getId());
374	396	records.setIsDelete("1");
375	397	records.setCreated(DateUtil.getyyyy_MM_dd_hms(new Date()));
376	398	records.setModified(DateUtil.getyyyy_MM_dd_hms(new Date()));
377	399
378	400
...	...	@@ -380,9 +402,65 @@
380	402	}
381	403	}else{
382	404	//新增数据
	405	+ pRecords.setGcStatus("0");
383	406	pRecords.setCreated(DateUtil.getyyyy_MM_dd_hms(new Date()));
384	407	postpartumRecordsService.savePostpartumRecords(pRecords);
	408	+ if(StringUtils.isNotEmpty(pRecords.getId())){
	409	+ List<PostpartumRecordsAddRequest.Records> rdsList = postpartumRecordsAddRequest.getRecords();
	410	+ if(CollectionUtils.isNotEmpty(rdsList)){
	411	+ for(PostpartumRecordsAddRequest.Records r : rdsList){
	412	+ Records records = new Records();
	413	+ records = r.convertToDataModel();
	414	+ records.setPostId(r.getId());
	415	+ records.setIsDelete("1");
	416	+ records.setCreated(DateUtil.getyyyy_MM_dd_hms(new Date()));
	417	+ records.setModified(DateUtil.getyyyy_MM_dd_hms(new Date()));
	418	+ recordsService.saveRecords(records);
	419	+ }
	420	+ }
	421	+ }
385	422	}
	423	+ baseResponse.setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("成功");
	424	+ baseResponse.setObject(pRecords);
	425	+ return baseResponse;
	426	+ }
	427	+
	428	+
	429	+ public BaseResponse deleteRecordes(String id,Integer userId){
	430	+ String hospitalId = autoMatchFacade.getHospitalId(userId);
	431	+ BaseResponse baseResponse = new BaseResponse();
	432	+ RecordsQuery recordsQuery = new RecordsQuery();
	433	+ recordsQuery.setId(id);
	434	+ recordsQuery.setIsDelete("1");
	435	+ List<Records> oldRecordsList = recordsService.getRecordsListQuery(recordsQuery);
	436	+ Records records = null;
	437	+ if(CollectionUtils.isNotEmpty(oldRecordsList)){
	438	+ records = oldRecordsList.get(0);
	439	+ records.setIsDelete("0");
	440	+ recordsService.updateRecordsById(records, records.getId());
	441	+ operateLogFacade.addModifyOptLog(userId, Integer.parseInt(hospitalId), records, oldRecordsList.get(0), OptActionEnums.UPDATE.getId(), "删除产后观察记录详情");
	442	+ }
	443	+ baseResponse.setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("成功");
	444	+ baseResponse.setObject(records);
	445	+ return baseResponse;
	446	+ }
	447	+
	448	+
	449	+ public BaseResponse updateZt(String id,Integer userId){
	450	+ String hospitalId = autoMatchFacade.getHospitalId(userId);
	451	+ BaseResponse baseResponse = new BaseResponse();
	452	+ PostpartumRecordsQuery prQuery = new PostpartumRecordsQuery();
	453	+ prQuery.setId(id);
	454	+ prQuery.setIsDelete("1");
	455	+ List<PostpartumRecords> pList = postpartumRecordsService.getPostpartumRecordsQuery(prQuery);
	456	+ PostpartumRecords pRecords = null;
	457	+ if(CollectionUtils.isNotEmpty(pList)){
	458	+ pRecords = pList.get(0);
	459	+ pRecords.setGcStatus("1");
	460	+ postpartumRecordsService.updatePostpartumRecords(pRecords, pRecords.getId());
	461	+ operateLogFacade.addModifyOptLog(userId, Integer.parseInt(hospitalId), pRecords, pList.get(0), OptActionEnums.UPDATE.getId(), "修改产后观察记录状态");
	462	+ }
	463	+
386	464	baseResponse.setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("成功");
387	465	baseResponse.setObject(pRecords);
388	466	return baseResponse;

...	...	@@ -6,8 +6,17 @@
6	6	*/
7	7	public class PostpartumRecordsQueryRequest {
8	8
	9	+ private String id;//主键ID
9	10	private String cardNo;//身份证号
10	11	private String vcCardNo;//就诊卡号
	12	+
	13	+ public String getId() {
	14	+ return id;
	15	+ }
	16	+
	17	+ public void setId(String id) {
	18	+ this.id = id;
	19	+ }
11	20
12	21	public String getCardNo() {
13	22	return cardNo;