diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/PostpartumRecordsController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/PostpartumRecordsController.java index e16a4e7..03188a3 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/PostpartumRecordsController.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/PostpartumRecordsController.java @@ -45,6 +45,25 @@ public class PostpartumRecordsController extends BaseController { /** + * 根据ID获取一条记录 + * @param id + * @param request + * @return + */ + @RequestMapping(value = "/getOneRecordsById",method = RequestMethod.GET) + @ResponseBody + @TokenRequired + public BaseResponse getOneRecordsById(String id, + HttpServletRequest request){ + LoginContext loginState = (LoginContext) request.getAttribute("loginContext"); + PostpartumRecordsQueryRequest PostpartumRecordsQueryRequest = new PostpartumRecordsQueryRequest(); + PostpartumRecordsQueryRequest.setId(id); + return postpartumRecordsFacade.queryPostpartumRecords(PostpartumRecordsQueryRequest,loginState.getId()); + } + + + + /** * 产后观察管理 * @param postpartumRecordsAddRequest * @param request @@ -72,7 +91,38 @@ public class PostpartumRecordsController extends BaseController { public BaseResponse addorUpdateRecords(@Valid @RequestBody PostpartumRecordsAddRequest postpartumRecordsAddRequest, HttpServletRequest request){ LoginContext loginState = (LoginContext) request.getAttribute("loginContext"); - return postpartumRecordsFacade.addOrUpdatePostpartumRecords(postpartumRecordsAddRequest,loginState.getId()); + return postpartumRecordsFacade.addOrUpdatePostpartumRecords(postpartumRecordsAddRequest, loginState.getId()); + } + + /** + * 删除其中一条记录详情 + * @param id + * @param request + * @return + */ + @RequestMapping(value = "/deleteOneRecords",method = RequestMethod.GET) + @ResponseBody + @TokenRequired + public BaseResponse deleteOneRecords(String id, + HttpServletRequest request){ + LoginContext loginState = (LoginContext) request.getAttribute("loginContext"); + return postpartumRecordsFacade.deleteRecordes(id, loginState.getId()); + } + + + /** + * 修改产妇观察状态 + * @param id + * @param request + * @return + */ + @RequestMapping(value = "/updateOneRecords",method = RequestMethod.GET) + @ResponseBody + @TokenRequired + public BaseResponse updateOneRecords(String id, + HttpServletRequest request){ + LoginContext loginState = (LoginContext) request.getAttribute("loginContext"); + return postpartumRecordsFacade.updateZt(id, loginState.getId()); } } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PostpartumRecordsFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PostpartumRecordsFacade.java index 5863dcb..53bbf18 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PostpartumRecordsFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PostpartumRecordsFacade.java @@ -75,15 +75,21 @@ public class PostpartumRecordsFacade { PostpartumRecordsResult postpartumRecordsResult = new PostpartumRecordsResult(); String hospital = autoMatchFacade.getHospitalId(userId); PostpartumRecordsQuery prQuery = new PostpartumRecordsQuery(); + List prList = null; PatientsQuery patientsQuery = new PatientsQuery(); - if(StringUtils.isNotEmpty(prQueryRequest.getCardNo()) || StringUtils.isNotEmpty(prQueryRequest.getVcCardNo())){ + if(StringUtils.isNotEmpty(prQueryRequest.getCardNo()) || StringUtils.isNotEmpty(prQueryRequest.getVcCardNo()) + || StringUtils.isNotEmpty(prQueryRequest.getId())){ String parentId = null; String maternalDeliverId = null; - if(prQueryRequest.getCardNo() !=null){ + if(StringUtils.isNotEmpty(prQueryRequest.getCardNo())){ patientsQuery.setCardNo(prQueryRequest.getCardNo()); } - else if(prQueryRequest.getVcCardNo() != null){ + else if(StringUtils.isNotEmpty(prQueryRequest.getVcCardNo())){ patientsQuery.setVcCardNo(prQueryRequest.getVcCardNo()); + }else if(StringUtils.isNotEmpty(prQueryRequest.getId())){ + prQuery.setId(prQueryRequest.getId()); + prQuery.setIsDelete("1"); + prList = postpartumRecordsService.getPostpartumRecordsQuery(prQuery); } //patientsQuery.setHospitalId(hospital); //查询孕妇 @@ -99,8 +105,13 @@ public class PostpartumRecordsFacade { if(CollectionUtils.isNotEmpty(mdList)){ MaternalDeliverModel maternalDeliverModel = mdList.get(0); prQuery.setParentId(parentId); - prQuery.setHospitalId(hospital); - List prList = postpartumRecordsService.getPostpartumRecordsQuery(prQuery); + prQuery.setIsDelete("1"); + prQuery.setId(null); + //prQuery.setHospitalId(hospital); + if(CollectionUtils.isEmpty(prList)){ + prList = postpartumRecordsService.getPostpartumRecordsQuery(prQuery); + } + PostpartumRecords postpartumRecords = new PostpartumRecords(); if(CollectionUtils.isNotEmpty(prList)){ postpartumRecords = prList.get(0); @@ -113,8 +124,8 @@ public class PostpartumRecordsFacade { if(CollectionUtils.isNotEmpty(recordList)){ postpartumRecordsResult.setRecords(recordList); } + postpartumRecordsResult.convertToResult(postpartumRecords); } - postpartumRecordsResult.convertToResult(postpartumRecords); postpartumRecordsResult.setName(patients.getUsername()); postpartumRecordsResult.setBhnum(maternalDeliverModel.getBhNum()); postpartumRecordsResult.setOneCxl(maternalDeliverModel.getTotalOneCxl()); @@ -208,7 +219,6 @@ public class PostpartumRecordsFacade { } postpartumRecordsResult.setJsys(deliverDoctor); - }else{ return new BaseObjectResponse().setErrormsg("孕妇未填写分娩记录,不能进行产后观察！").setErrorcode(ErrorCodeConstants.NO_DATA); } @@ -219,6 +229,7 @@ public class PostpartumRecordsFacade { }else{ return new BaseObjectResponse().setErrormsg("请输入查询条件！").setErrorcode(ErrorCodeConstants.PARAMETER_ERROR); + } return new BaseObjectResponse().setErrormsg("成功！").setErrorcode(ErrorCodeConstants.SUCCESS).setData(postpartumRecordsResult); } @@ -336,7 +347,6 @@ public class PostpartumRecordsFacade { pRecords.setTwoCxl(postpartumRecordsAddRequest.getOneCxl()); pRecords.setTwoCxl(postpartumRecordsAddRequest.getTwoCxl()); pRecords.setDoctor(String.valueOf(userId)); - pRecords.setGcStatus("0");//正在观察 pRecords.setIsDelete("1");//有效数据 pRecords.setModified(DateUtil.getyyyy_MM_dd_hms(new Date())); @@ -348,6 +358,14 @@ public class PostpartumRecordsFacade { ptRecordsQuery.setId(postpartumRecordsAddRequest.getId()); ptRecordsQuery.setIsDelete("1"); List pOldRecords = postpartumRecordsService.getPostpartumRecordsQuery(ptRecordsQuery); + pRecords.setGcStatus(pOldRecords.get(0).getGcStatus()); + pRecords.setHospitalId(hospitalId); + pRecords.setIsDelete("1"); + pRecords.setParentId(pOldRecords.get(0).getParentId()); + pRecords.setMaternalDeliverId(pOldRecords.get(0).getMaternalDeliverId()); + pRecords.setDoctor(String.valueOf(userId)); + pRecords.setOneCxl(postpartumRecordsAddRequest.getOneCxl()); + pRecords.setTwoCxl(postpartumRecordsAddRequest.getTwoCxl()); postpartumRecordsService.updatePostpartumRecords(pRecords,pRecords.getId()); if(CollectionUtils.isNotEmpty(pOldRecords)){ operateLogFacade.addModifyOptLog(userId, Integer.parseInt(hospitalId), pRecords, pOldRecords.get(0), OptActionEnums.UPDATE.getId(), "修改产后观察"); @@ -355,15 +373,18 @@ public class PostpartumRecordsFacade { if(CollectionUtils.isNotEmpty(postpartumRecordsAddRequest.getRecords())){ List rdsList = postpartumRecordsAddRequest.getRecords(); for(PostpartumRecordsAddRequest.Records rd : rdsList){ - Records records = null; + Records records = new Records(); if(StringUtils.isNotEmpty(rd.getId())){ //更新详情数据 records = rd.convertToDataModel(); + records.setPostId(rd.getId()); records.setIsDelete("1"); RecordsQuery recordsQuery = new RecordsQuery(); recordsQuery.setId(rd.getId()); recordsQuery.setIsDelete("1"); List oldRecordsList = recordsService.getRecordsListQuery(recordsQuery); + records.setModified(DateUtil.getyyyy_MM_dd_hms(new Date())); + records.setCreated(oldRecordsList.get(0).getCreated()); recordsService.updateRecordsById(records,records.getId()); if(CollectionUtils.isNotEmpty(oldRecordsList)){ operateLogFacade.addModifyOptLog(userId, Integer.parseInt(hospitalId), records, oldRecordsList.get(0), OptActionEnums.UPDATE.getId(), "修改产后观察记录详情"); @@ -371,6 +392,7 @@ public class PostpartumRecordsFacade { }else{ //新增详情数据 records = rd.convertToDataModel(); + records.setPostId(rd.getId()); records.setIsDelete("1"); records.setCreated(DateUtil.getyyyy_MM_dd_hms(new Date())); records.setModified(DateUtil.getyyyy_MM_dd_hms(new Date())); @@ -380,12 +402,68 @@ public class PostpartumRecordsFacade { } }else{ //新增数据 + pRecords.setGcStatus("0"); pRecords.setCreated(DateUtil.getyyyy_MM_dd_hms(new Date())); postpartumRecordsService.savePostpartumRecords(pRecords); + if(StringUtils.isNotEmpty(pRecords.getId())){ + List rdsList = postpartumRecordsAddRequest.getRecords(); + if(CollectionUtils.isNotEmpty(rdsList)){ + for(PostpartumRecordsAddRequest.Records r : rdsList){ + Records records = new Records(); + records = r.convertToDataModel(); + records.setPostId(r.getId()); + records.setIsDelete("1"); + records.setCreated(DateUtil.getyyyy_MM_dd_hms(new Date())); + records.setModified(DateUtil.getyyyy_MM_dd_hms(new Date())); + recordsService.saveRecords(records); + } + } + } } baseResponse.setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("成功"); baseResponse.setObject(pRecords); return baseResponse; } + + public BaseResponse deleteRecordes(String id,Integer userId){ + String hospitalId = autoMatchFacade.getHospitalId(userId); + BaseResponse baseResponse = new BaseResponse(); + RecordsQuery recordsQuery = new RecordsQuery(); + recordsQuery.setId(id); + recordsQuery.setIsDelete("1"); + List oldRecordsList = recordsService.getRecordsListQuery(recordsQuery); + Records records = null; + if(CollectionUtils.isNotEmpty(oldRecordsList)){ + records = oldRecordsList.get(0); + records.setIsDelete("0"); + recordsService.updateRecordsById(records, records.getId()); + operateLogFacade.addModifyOptLog(userId, Integer.parseInt(hospitalId), records, oldRecordsList.get(0), OptActionEnums.UPDATE.getId(), "删除产后观察记录详情"); + } + baseResponse.setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("成功"); + baseResponse.setObject(records); + return baseResponse; + } + + + public BaseResponse updateZt(String id,Integer userId){ + String hospitalId = autoMatchFacade.getHospitalId(userId); + BaseResponse baseResponse = new BaseResponse(); + PostpartumRecordsQuery prQuery = new PostpartumRecordsQuery(); + prQuery.setId(id); + prQuery.setIsDelete("1"); + List pList = postpartumRecordsService.getPostpartumRecordsQuery(prQuery); + PostpartumRecords pRecords = null; + if(CollectionUtils.isNotEmpty(pList)){ + pRecords = pList.get(0); + pRecords.setGcStatus("1"); + postpartumRecordsService.updatePostpartumRecords(pRecords, pRecords.getId()); + operateLogFacade.addModifyOptLog(userId, Integer.parseInt(hospitalId), pRecords, pList.get(0), OptActionEnums.UPDATE.getId(), "修改产后观察记录状态"); + } + + baseResponse.setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("成功"); + baseResponse.setObject(pRecords); + return baseResponse; + } + } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/PostpartumRecordsQueryRequest.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/PostpartumRecordsQueryRequest.java index 6132c51..3c06249 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/PostpartumRecordsQueryRequest.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/PostpartumRecordsQueryRequest.java @@ -6,9 +6,18 @@ package com.lyms.platform.operate.web.request; */ public class PostpartumRecordsQueryRequest { + private String id;//主键ID private String cardNo;//身份证号 private String vcCardNo;//就诊卡号 + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + public String getCardNo() { return cardNo; }