From ef23f415da8358de41b03aefbde1db8c08595e0f Mon Sep 17 00:00:00 2001 From: yangfei Date: Fri, 9 Mar 2018 17:26:16 +0800 Subject: [PATCH] =?UTF-8?q?=E8=87=AA=E5=8A=A8=E7=94=9F=E6=88=90=E8=BF=BD?= =?UTF-8?q?=E8=AE=BF=E4=BF=A1=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../operate/web/facade/BookbuildingFacade.java | 9 +++-- .../operate/web/facade/PatientServiceFacade.java | 42 +++++++++++----------- 2 files changed, 25 insertions(+), 26 deletions(-) diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BookbuildingFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BookbuildingFacade.java index e3ae700..dbbf741 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BookbuildingFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BookbuildingFacade.java @@ -280,7 +280,7 @@ public class BookbuildingFacade { Patients p = yunBookbuildingService.addPregnantBookbuilding(patient); //添加追访信息 - addTrackDownInfo(userId, p, yunRequest); + addTrackDownInfo(userId, p); operateLogFacade.addAddOptLog(userId, Integer.valueOf(yunRequest.getHospitalId()), p, OptActionEnums.ADD.getId(), "孕妇建档"); @@ -387,9 +387,8 @@ public class BookbuildingFacade { * 添加或更新追访信息 * @param userId * @param patient - * @param yunRequest */ - public void addTrackDownInfo(Integer userId, Patients patient, YunBookbuildingAddRequest yunRequest) { + public void addTrackDownInfo(Integer userId, Patients patient) { //添加产检追访信息 TrackDownRecord trackDownRecord = patient.build(); //根据patient查询是否存在追访信息 @@ -547,7 +546,7 @@ public class BookbuildingFacade { //添加追访信息 - addTrackDownInfo(userId, p, yunRequest); + addTrackDownInfo(userId, p); operateLogFacade.addAddOptLog(userId, Integer.valueOf(patient.getHospitalId()), patient, OptActionEnums.ADD.getId(), "孕妇建档"); @@ -826,7 +825,7 @@ public class BookbuildingFacade { yunBookbuildingService.updatePregnant(patient, id); //更新产后追访信息 - addTrackDownInfo(userId,patient,yunRequest); + addTrackDownInfo(userId,patient); operateLogFacade.addModifyOptLog(userId, Integer.valueOf(beforePatient.getHospitalId()), beforePatient, patient, OptActionEnums.UPDATE.getId(), "孕妇建档修改"); 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 28106cc..86c6be8 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 @@ -12,7 +12,6 @@ import com.lyms.platform.common.utils.DateUtil; import com.lyms.platform.common.utils.StringUtils; import com.lyms.platform.operate.web.request.BabyBookbuildingAddRequest; import com.lyms.platform.operate.web.request.BasePageQueryRequest; -import com.lyms.platform.operate.web.request.YunBookbuildingAddRequest; import com.lyms.platform.operate.web.result.PatientSerResult; import com.lyms.platform.permission.model.*; import com.lyms.platform.permission.service.*; @@ -272,10 +271,11 @@ public class PatientServiceFacade { } else {//孕妇建档服务数据处理 if (PatientSerEnums.SerTypeEnums.yqjzzd.getId() == Integer.parseInt(serInfo.get("serType"))) {//孕期精准指导同步到建档 - YunBookbuildingAddRequest yunBookbuildingAddRequest = new YunBookbuildingAddRequest(); - yunBookbuildingAddRequest.setServiceType(ServiceTypeEnums.ADD_SERVICE.getId()); - yunBookbuildingAddRequest.setServiceStatus(ServiceStatusEnums.ADD_OPEN.getId()); - bookbuildingFacade.updatePregnantById(ps.getParentid(), yunBookbuildingAddRequest, userId); + Patients patient = new Patients(); + patient.setServiceType(ServiceTypeEnums.ADD_SERVICE.getId()); + patient.setServiceStatus(ServiceStatusEnums.ADD_OPEN.getId()); + bookbuildingFacade.updatePatientSerById(ps.getParentid(), patient); + }else if(PatientSerEnums.SerTypeEnums.bzfw.getId().intValue() == Integer.parseInt(serInfo.get("serType"))){ PatientServiceQuery query = new PatientServiceQuery(); query.setParentid(ps.getParentid()); @@ -283,10 +283,10 @@ public class PatientServiceFacade { int count = patientServiceService.queryPatientServiceCount(query); //是否有增值服务--没有则处理标准服务 if (count == 0) { - YunBookbuildingAddRequest yunBookbuildingAddRequest = new YunBookbuildingAddRequest(); - yunBookbuildingAddRequest.setServiceType(ServiceTypeEnums.STANDARD_SERVICE.getId()); - yunBookbuildingAddRequest.setServiceStatus(ServiceStatusEnums.STANDARD_OPEN.getId()); - bookbuildingFacade.updatePregnantById(ps.getParentid(), yunBookbuildingAddRequest, userId); + Patients patient = new Patients(); + patient.setServiceType(ServiceTypeEnums.STANDARD_SERVICE.getId()); + patient.setServiceStatus(ServiceStatusEnums.STANDARD_OPEN.getId()); + bookbuildingFacade.updatePatientSerById(ps.getParentid(), patient); } } } @@ -362,17 +362,17 @@ public class PatientServiceFacade { } babyBookbuildingFacade.updateBabySerInfo(babyBookbuildingAddRequest); } else {//孕妇建档服务数据处理 - YunBookbuildingAddRequest yunBookbuildingAddRequest = new YunBookbuildingAddRequest(); + Patients patient = new Patients(); if (PatientSerEnums.SerTypeEnums.yqjzzd.getId().intValue() == ps.getSerType().intValue()) {//孕期精准指导同步到建档 - yunBookbuildingAddRequest.setServiceType(ServiceTypeEnums.ADD_SERVICE.getId()); + patient.setServiceType(ServiceTypeEnums.ADD_SERVICE.getId()); if (ps.getSerStatus().intValue() == PatientSerEnums.SerStatusEnums.kt.getId().intValue()) { - yunBookbuildingAddRequest.setServiceStatus(ServiceStatusEnums.ADD_OPEN.getId()); + patient.setServiceStatus(ServiceStatusEnums.ADD_OPEN.getId()); } else if (ps.getSerStatus().intValue() == PatientSerEnums.SerStatusEnums.td.getId().intValue()) { - yunBookbuildingAddRequest.setServiceStatus(ServiceStatusEnums.UNSUBSCRIBE.getId()); + patient.setServiceStatus(ServiceStatusEnums.UNSUBSCRIBE.getId()); } else if (ps.getSerStatus().intValue() == PatientSerEnums.SerStatusEnums.gq.getId().intValue()) { - yunBookbuildingAddRequest.setServiceStatus(ServiceStatusEnums.ADD_OVERDUE.getId()); + patient.setServiceStatus(ServiceStatusEnums.ADD_OVERDUE.getId()); } else if (ps.getSerStatus().intValue() == PatientSerEnums.SerStatusEnums.zt.getId().intValue()) { - yunBookbuildingAddRequest.setServiceStatus(ServiceStatusEnums.SUSPEND.getId()); + patient.setServiceStatus(ServiceStatusEnums.SUSPEND.getId()); } }else if(PatientSerEnums.SerTypeEnums.bzfw.getId().intValue() == ps.getSerType().intValue()){ PatientServiceQuery query = new PatientServiceQuery(); @@ -381,19 +381,19 @@ public class PatientServiceFacade { int count = patientServiceService.queryPatientServiceCount(query); //是否有增值服务--没有则处理标准服务 if (count == 0) { - yunBookbuildingAddRequest.setServiceType(ServiceTypeEnums.STANDARD_SERVICE.getId()); + patient.setServiceType(ServiceTypeEnums.STANDARD_SERVICE.getId()); if (ps.getSerStatus().intValue() == PatientSerEnums.SerStatusEnums.kt.getId().intValue()) { - yunBookbuildingAddRequest.setServiceStatus(ServiceStatusEnums.ADD_OPEN.getId()); + patient.setServiceStatus(ServiceStatusEnums.ADD_OPEN.getId()); } else if (ps.getSerStatus().intValue() == PatientSerEnums.SerStatusEnums.td.getId().intValue()) { - yunBookbuildingAddRequest.setServiceStatus(ServiceStatusEnums.UNSUBSCRIBE.getId()); + patient.setServiceStatus(ServiceStatusEnums.UNSUBSCRIBE.getId()); } else if (ps.getSerStatus().intValue() == PatientSerEnums.SerStatusEnums.gq.getId().intValue()) { - yunBookbuildingAddRequest.setServiceStatus(ServiceStatusEnums.ADD_OVERDUE.getId()); + patient.setServiceStatus(ServiceStatusEnums.ADD_OVERDUE.getId()); } else if (ps.getSerStatus().intValue() == PatientSerEnums.SerStatusEnums.zt.getId().intValue()) { - yunBookbuildingAddRequest.setServiceStatus(ServiceStatusEnums.SUSPEND.getId()); + patient.setServiceStatus(ServiceStatusEnums.SUSPEND.getId()); } } } - bookbuildingFacade.updatePregnantById(ps.getParentid(), yunBookbuildingAddRequest, userId); + bookbuildingFacade.updatePatientSerById(ps.getParentid(), patient); } operateLogFacade.addModifyOptLog(userId, Integer.valueOf(hospitalId), before, after, OptActionEnums.UPDATE.getId(), "修改服务"); -- 1.8.3.1