From 48ea00e29a56897f107fb1c16b05b2380efa2fc9 Mon Sep 17 00:00:00 2001 From: yangfei Date: Wed, 27 Dec 2017 16:50:47 +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 --- .../operate/web/facade/BabyBookbuildingFacade.java | 9 ++++--- .../operate/web/facade/PatientServiceFacade.java | 31 +++++++++++++++++++--- 2 files changed, 32 insertions(+), 8 deletions(-) diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyBookbuildingFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyBookbuildingFacade.java index 670924e..7ee1e4c 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyBookbuildingFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyBookbuildingFacade.java @@ -5,7 +5,6 @@ import com.lyms.hospitalapi.fnfy.FnfyHisService; import com.lyms.hospitalapi.qhdfy.QhdfyHisService; import com.lyms.hospitalapi.qinglongxian.QingLongXianHisService; import com.lyms.hospitalapi.v2.HisService; -import com.lyms.platform.beans.MsgListRequest; import com.lyms.platform.beans.MsgRequest; import com.lyms.platform.biz.service.*; import com.lyms.platform.common.constants.ErrorCodeConstants; @@ -22,7 +21,6 @@ import com.lyms.platform.operate.web.request.BookbuildingQueryRequest; import com.lyms.platform.operate.web.result.*; import com.lyms.platform.operate.web.utils.BabyListTask; import com.lyms.platform.operate.web.utils.GrowthCountTask; -import com.lyms.platform.operate.web.utils.MessageCenterService; import com.lyms.platform.operate.web.utils.MongoUtil; import com.lyms.platform.permission.model.Organization; import com.lyms.platform.permission.model.OrganizationQuery; @@ -321,6 +319,9 @@ public class BabyBookbuildingFacade { * @return */ public boolean updateBabySerInfo(BabyBookbuildingAddRequest request){ + if(StringUtils.isEmpty(request.getId())){ + return false; + } BabyModelQuery babyQuery = new BabyModelQuery(); babyQuery.setYn(YnEnums.YES.getId()); babyQuery.setId(request.getId()); @@ -706,6 +707,7 @@ public class BabyBookbuildingFacade { // String hospitalName = organizationService.getOrganization(Integer.valueOf(request.getHospitalId())).getName(); operateLogFacade.addAddOptLog(userId, Integer.valueOf(hid), model, OptActionEnums.ADD.getId(), "儿童建档"); + model = babyBookbuildingService.addBabyBookbuilding(model); //建档开通增值服务 if (CollectionUtils.isNotEmpty(request.getSerInfos())) { @@ -716,6 +718,7 @@ public class BabyBookbuildingFacade { //开通日期与建档日期一致 patientService.setCreateDate(DateUtil.parseYMD(request.getBuildDate())); patientService.setParentid(model.getId()); + patientService.setPid(model.getPid()); try { patientServiceFacade.addPatientService(patientService, userId); } catch (Exception e) { @@ -724,8 +727,6 @@ public class BabyBookbuildingFacade { } } - operateLogFacade.addAddOptLog(userId, Integer.valueOf(request.getHospitalId()), model, OptActionEnums.ADD.getId(), "儿童建档"); - model = babyBookbuildingService.addBabyBookbuilding(model); final String bId = model.getId(); if (model == null || bId == null) { diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientServiceFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientServiceFacade.java index d478cc4..98b1c91 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientServiceFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientServiceFacade.java @@ -293,8 +293,9 @@ public class PatientServiceFacade { patientServiceService.updatePatientService(ps); if (before.getPerType() != null && before.getPerType() == 2) {//儿童建档服务数据处理 + BabyBookbuildingAddRequest babyBookbuildingAddRequest = new BabyBookbuildingAddRequest(); + babyBookbuildingAddRequest.setId(ps.getParentid()); if(PatientSerEnums.SerTypeEnums.babyjzzz.getId() == ps.getSerType()){ - BabyBookbuildingAddRequest babyBookbuildingAddRequest = new BabyBookbuildingAddRequest(); babyBookbuildingAddRequest.setServiceType(ServiceTypeEnums.ADD_SERVICE.getId()); if (ps.getSerStatus() == PatientSerEnums.SerStatusEnums.kt.getId()) { babyBookbuildingAddRequest.setServiceStatus(ServiceStatusEnums.ADD_OPEN.getId()); @@ -305,11 +306,22 @@ public class PatientServiceFacade { } else if (ps.getSerStatus() == PatientSerEnums.SerStatusEnums.zt.getId()) { babyBookbuildingAddRequest.setServiceStatus(ServiceStatusEnums.SUSPEND.getId()); } - babyBookbuildingFacade.updateBabySerInfo(babyBookbuildingAddRequest); + }else if(PatientSerEnums.SerTypeEnums.babyBzfw.getId() == ps.getSerType()){ + babyBookbuildingAddRequest.setServiceType(ServiceTypeEnums.STANDARD_SERVICE.getId()); + if (ps.getSerStatus() == PatientSerEnums.SerStatusEnums.kt.getId()) { + babyBookbuildingAddRequest.setServiceStatus(ServiceStatusEnums.STANDARD_OPEN.getId()); + } else if (ps.getSerStatus() == PatientSerEnums.SerStatusEnums.td.getId()) { + babyBookbuildingAddRequest.setServiceStatus(ServiceStatusEnums.NO_OPEN.getId()); + } else if (ps.getSerStatus() == PatientSerEnums.SerStatusEnums.gq.getId()) { + babyBookbuildingAddRequest.setServiceStatus(ServiceStatusEnums.STANDARD_OVERDUE.getId()); + } else if (ps.getSerStatus() == PatientSerEnums.SerStatusEnums.zt.getId()) { + babyBookbuildingAddRequest.setServiceStatus(ServiceStatusEnums.STANDARD_OVERDUE.getId()); + } } + babyBookbuildingFacade.updateBabySerInfo(babyBookbuildingAddRequest); } else {//孕妇建档服务数据处理 + YunBookbuildingAddRequest yunBookbuildingAddRequest = new YunBookbuildingAddRequest(); if (PatientSerEnums.SerTypeEnums.yqjzzd.getId() == ps.getSerType()) {//孕期精准指导同步到建档 - YunBookbuildingAddRequest yunBookbuildingAddRequest = new YunBookbuildingAddRequest(); yunBookbuildingAddRequest.setServiceType(ServiceTypeEnums.ADD_SERVICE.getId()); if (ps.getSerStatus() == PatientSerEnums.SerStatusEnums.kt.getId()) { yunBookbuildingAddRequest.setServiceStatus(ServiceStatusEnums.ADD_OPEN.getId()); @@ -320,8 +332,19 @@ public class PatientServiceFacade { } else if (ps.getSerStatus() == PatientSerEnums.SerStatusEnums.zt.getId()) { yunBookbuildingAddRequest.setServiceStatus(ServiceStatusEnums.SUSPEND.getId()); } - bookbuildingFacade.updatePregnantById(ps.getParentid(), yunBookbuildingAddRequest, userId); + }else if(PatientSerEnums.SerTypeEnums.bzfw.getId() == ps.getSerType()){ + yunBookbuildingAddRequest.setServiceType(ServiceTypeEnums.STANDARD_SERVICE.getId()); + if (ps.getSerStatus() == PatientSerEnums.SerStatusEnums.kt.getId()) { + yunBookbuildingAddRequest.setServiceStatus(ServiceStatusEnums.STANDARD_OPEN.getId()); + } else if (ps.getSerStatus() == PatientSerEnums.SerStatusEnums.td.getId()) { + yunBookbuildingAddRequest.setServiceStatus(ServiceStatusEnums.NO_OPEN.getId()); + } else if (ps.getSerStatus() == PatientSerEnums.SerStatusEnums.gq.getId()) { + yunBookbuildingAddRequest.setServiceStatus(ServiceStatusEnums.STANDARD_OVERDUE.getId()); + } else if (ps.getSerStatus() == PatientSerEnums.SerStatusEnums.zt.getId()) { + yunBookbuildingAddRequest.setServiceStatus(ServiceStatusEnums.NO_OPEN.getId()); + } } + bookbuildingFacade.updatePregnantById(ps.getParentid(), yunBookbuildingAddRequest, userId); } PatientService after = patientServiceService.getPatientService(ps.getId()); operateLogFacade.addModifyOptLog(userId, Integer.valueOf(hospitalId), before, after, OptActionEnums.UPDATE.getId(), "修改服务"); -- 1.8.3.1