From caf2d1db3cfb45f496aed530d96cc80f2cbbc981 Mon Sep 17 00:00:00 2001 From: liquanyu Date: Thu, 14 Feb 2019 11:52:26 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9C=8D=E5=8A=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../platform/permission/model/PatientService.java | 10 +++ .../operate/web/facade/OperateLogFacade.java | 82 +++++++++++----------- .../operate/web/facade/PatientServiceFacade.java | 12 ++-- 3 files changed, 58 insertions(+), 46 deletions(-) diff --git a/platform-biz-service/src/main/java/com/lyms/platform/permission/model/PatientService.java b/platform-biz-service/src/main/java/com/lyms/platform/permission/model/PatientService.java index b5ed935..7eaf745 100644 --- a/platform-biz-service/src/main/java/com/lyms/platform/permission/model/PatientService.java +++ b/platform-biz-service/src/main/java/com/lyms/platform/permission/model/PatientService.java @@ -100,6 +100,16 @@ public class PatientService { */ private Integer isOld; + private Integer serviceWeek; + + public Integer getServiceWeek() { + return serviceWeek; + } + + public void setServiceWeek(Integer serviceWeek) { + this.serviceWeek = serviceWeek; + } + public Integer getPerType() { return perType; } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/OperateLogFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/OperateLogFacade.java index 75f6480..cfbb340 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/OperateLogFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/OperateLogFacade.java @@ -60,42 +60,42 @@ public class OperateLogFacade { final String operateRemark) { - commonThreadPool.execute(new Runnable() { - @Override - public void run() { - OperateLogModel model = new OperateLogModel(); - UsersQuery usersQuery = new UsersQuery(); - usersQuery.setId(userId); - List list = usersService.queryUsers(usersQuery); - if (CollectionUtils.isNotEmpty(list)) - { - Users users = list.get(0); - model.setOperateId(users.getId()); - model.setOperateAccount(users.getAccount()); - model.setOperateName(users.getName()); - } - - model.setOperateAction(operateAction); - - model.setOperateBeforeContent(JsonUtil.obj2Str(operateBeforeContent)); - model.setOperateAfterContent(JsonUtil.obj2Str(operateAfterContent)); - model.setOperateRemark(operateRemark); - - if (operateAfterContent != null && operateBeforeContent != null) - { - String json = JsonUtil.obj2Str(getChangeItems(operateBeforeContent,operateAfterContent)); - model.setModifyContent(json); - } - if (operateAfterContent != null) - { - model.set_class(operateAfterContent.getClass().getName()); - } - - model.setOperateHospitalId(hospitalId); - model.setCreated(new Date()); - operateLogService.addOptLog(model); - } - }); +// commonThreadPool.execute(new Runnable() { +// @Override +// public void run() { +// OperateLogModel model = new OperateLogModel(); +// UsersQuery usersQuery = new UsersQuery(); +// usersQuery.setId(userId); +// List list = usersService.queryUsers(usersQuery); +// if (CollectionUtils.isNotEmpty(list)) +// { +// Users users = list.get(0); +// model.setOperateId(users.getId()); +// model.setOperateAccount(users.getAccount()); +// model.setOperateName(users.getName()); +// } +// +// model.setOperateAction(operateAction); +// +// model.setOperateBeforeContent(JsonUtil.obj2Str(operateBeforeContent)); +// model.setOperateAfterContent(JsonUtil.obj2Str(operateAfterContent)); +// model.setOperateRemark(operateRemark); +// +// if (operateAfterContent != null && operateBeforeContent != null) +// { +// String json = JsonUtil.obj2Str(getChangeItems(operateBeforeContent,operateAfterContent)); +// model.setModifyContent(json); +// } +// if (operateAfterContent != null) +// { +// model.set_class(operateAfterContent.getClass().getName()); +// } +// +// model.setOperateHospitalId(hospitalId); +// model.setCreated(new Date()); +// operateLogService.addOptLog(model); +// } +// }); } @@ -114,11 +114,11 @@ public class OperateLogFacade { String operateRemark) { - addModifyOptLog( userId, hospitalId, - null, - operateAfterContent, - operateAction, - operateRemark); +// addModifyOptLog( userId, hospitalId, +// null, +// operateAfterContent, +// operateAction, +// operateRemark); } 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 1fc6f26..76dcc99 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 @@ -337,11 +337,11 @@ public class PatientServiceFacade { patient.setServiceStatus(ServiceStatusEnums.ADD_OPEN.getId()); bookbuildingFacade.updatePatientSerById(ps.getParentid(), patient); - Patients patients = patientsService.findOnePatientById(ps.getParentid()); - if (patients != null) - { - saveServiceTimeRecord(4, patients); - } +// Patients patients = patientsService.findOnePatientById(ps.getParentid()); +// if (patients != null) +// { +// saveServiceTimeRecord(4, patients); +// } }else if(PatientSerEnums.SerTypeEnums.bzfw.getId().intValue() == Integer.parseInt(serInfo.get("serType"))){ PatientServiceQuery query = new PatientServiceQuery(); @@ -1035,6 +1035,8 @@ public class PatientServiceFacade { map.put("hosp_id", hospitalDoctService.getHospId()); map.put("hosp_service_id", hospitalDoctService.getHospServiceId()); map.put("status", hospitalDoctService.getStatus()); + map.put("devicePrice", hospitalDoctService.getDevicePrice()); + map.put("deviceCon", hospitalDoctService.getDeviceCon()); return map; } -- 1.8.3.1