From b733801b1d3ceb06fe1230e429b4e5773c3a3f05 Mon Sep 17 00:00:00 2001 From: yangfei Date: Fri, 1 Dec 2017 00:39:03 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9C=8D=E5=8A=A1=E5=90=8C=E6=AD=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../biz/service/MatDeliverFollowService.java | 2 +- .../operate/web/facade/MatDeliverFacade.java | 4 ++++ .../operate/web/facade/MatdeliverFollowFacade.java | 26 +++++++++++++--------- .../web/result/MatdeliverFollowListResult.java | 13 ++++++++++- 4 files changed, 32 insertions(+), 13 deletions(-) diff --git a/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/MatDeliverFollowService.java b/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/MatDeliverFollowService.java index 0f267d9..7b8da56 100644 --- a/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/MatDeliverFollowService.java +++ b/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/MatDeliverFollowService.java @@ -31,7 +31,7 @@ public class MatDeliverFollowService { } public List query(MatDeliverFollowQuery deliverQuery){ - return iMatdeliverFollowModelDao.queryMatdeliverFollowModel(deliverQuery.convertToQuery().addOrder(Sort.Direction.DESC, "updateDate")); + return iMatdeliverFollowModelDao.queryMatdeliverFollowModel(deliverQuery.convertToQuery().addOrder(Sort.Direction.ASC, "updateDate")); } public void deleteOne(String id){ iMatdeliverFollowModelDao.deleteMatdeliverFollowModel(id); diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MatDeliverFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MatDeliverFacade.java index 124de0c..2153918 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MatDeliverFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MatDeliverFacade.java @@ -1217,6 +1217,10 @@ public class MatDeliverFacade { for(MaternalDeliverModel deliverModel : maternalDeliverModelList){ MatdeliverFollowListResult matdeliverFollowListResult = patientsMap.get(deliverModel.getParentId()); + + //最后一次随访Id + matdeliverFollowListResult.setMatFollowId(deliverModel.getMatFollowId()); + matdeliverFollowListResult.setId(deliverModel.getId()); //机构信息 Organization organization = organizationService.getOrganization(Integer.valueOf(deliverModel.getFmHospital())); diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MatdeliverFollowFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MatdeliverFollowFacade.java index ff7fc2c..32fe43a 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MatdeliverFollowFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MatdeliverFollowFacade.java @@ -141,23 +141,25 @@ public class MatdeliverFollowFacade { //如果修改的是最后一次随访记录，则进行同步修改分娩记录里的随访信息 if (matDeliverFollowAddRequest.getId().equals(maternalDeliverModel.getMatFollowId())) { - //获取随访详情 - MatdeliverFollowModel matdeliverFollowModel = matDeliverFollowService.getOneMatDeliverFollow(matDeliverFollowAddRequest.getId()); //在分娩记录上记录随访部分信息 - maternalDeliverModel.setMatFollowId(matdeliverFollowModel.getId()); - maternalDeliverModel.setContactResult(matdeliverFollowModel.getContactResult()); - maternalDeliverModel.setContactReason(matdeliverFollowModel.getContactReason()); - maternalDeliverModel.setVisitAffirm(matdeliverFollowModel.getVisitAffirm()); - maternalDeliverModel.setVisitStatus(matdeliverFollowModel.getVisitStatus()); - maternalDeliverModel.setMakeType(matdeliverFollowModel.getMakeType()); - maternalDeliverModel.setVisitResult(matdeliverFollowModel.getVisitResult()); - maternalDeliverModel.setNextVisitDate(matdeliverFollowModel.getNextVisitDate()); - maternalDeliverModel.setIsClose(matdeliverFollowModel.getIsClose()); + maternalDeliverModel.setContactResult(matDeliverFollowAddRequest.getContactResult()); + maternalDeliverModel.setContactReason(matDeliverFollowAddRequest.getContactReason()); + maternalDeliverModel.setVisitAffirm(matDeliverFollowAddRequest.getVisitAffirm()); + maternalDeliverModel.setVisitStatus(matDeliverFollowAddRequest.getVisitStatus()); + maternalDeliverModel.setMakeType(matDeliverFollowAddRequest.getMakeType()); + maternalDeliverModel.setVisitResult(matDeliverFollowAddRequest.getVisitResult()); + maternalDeliverModel.setNextVisitDate(matDeliverFollowAddRequest.getNextVisitDate()); + maternalDeliverModel.setIsClose(matDeliverFollowAddRequest.getIsClose()); //修改分娩记录 matDeliverService.updateOne(maternalDeliverModel, maternalDeliverModel.getId()); + baseResponse.setObject(matDeliverFollowAddRequest.getId()); } + //获取随访详情 + MatdeliverFollowModel matdeliverFollowModel = matDeliverFollowService.getOneMatDeliverFollow(matDeliverFollowAddRequest.getId()); + } else {//新增随访记录，并同步更新分娩记录里的随访信息 + matDeliverFollowAddRequest.setId(null); //新增随访记录 MatdeliverFollowModel matdeliverFollowModel = matDeliverFollowService.addMatDeliverFollow(matDeliverFollowAddRequest.convertToDataModel()); @@ -179,7 +181,9 @@ public class MatdeliverFollowFacade { }else{ log.error("分娩记录随访没有找到随访记录，传入随访id："+matDeliverFollowAddRequest.getDeliverId()); } + baseResponse.setObject(matdeliverFollowModel.getId()); } + baseResponse.setErrorcode(ErrorCodeConstants.SUCCESS); baseResponse.setErrormsg(ErrorCodeConstants.SUCCESS_DESCRIPTION); return baseResponse; diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/MatdeliverFollowListResult.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/MatdeliverFollowListResult.java index b30e71b..3e22f74 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/MatdeliverFollowListResult.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/MatdeliverFollowListResult.java @@ -14,7 +14,10 @@ public class MatdeliverFollowListResult { private String patientId; private String pid; - + /** + * 最后一次随访id + */ + private String matFollowId; /** * @discription 姓名 */ @@ -78,6 +81,14 @@ public class MatdeliverFollowListResult { */ private Integer isClose; + public String getMatFollowId() { + return matFollowId; + } + + public void setMatFollowId(String matFollowId) { + this.matFollowId = matFollowId; + } + public String getId() { return id; } -- 1.8.3.1