From 08970fc22b8ed96cf6e0b34f4a5c9af06c7a5c80 Mon Sep 17 00:00:00 2001 From: yangfei Date: Fri, 17 Nov 2017 14:22:19 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9C=8D=E5=8A=A1=E7=AE=A1=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dao/master/HospitalServiceContentMapper.java | 4 + .../permission/model/HospitalServiceContent.java | 14 +- .../service/HospitalServiceContentService.java | 4 + .../impl/HospitalServiceContentServiceImpl.java | 13 ++ .../mainOrm/master/HospitalServiceContent.xml | 15 ++ .../common/enums/HospitalSerStatusEnums.java | 64 ++++++ .../web/controller/ConfigServiceController.java | 105 ++++++++++ .../operate/web/facade/ConfigServiceFacade.java | 226 +++++++++++++++++++++ .../operate/web/result/HospitalDoctSerResult.java | 84 ++++++++ .../web/result/HospitalServiceContentResult.java | 123 +++++++++++ 10 files changed, 651 insertions(+), 1 deletion(-) create mode 100644 platform-common/src/main/java/com/lyms/platform/common/enums/HospitalSerStatusEnums.java create mode 100644 platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/ConfigServiceController.java create mode 100644 platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ConfigServiceFacade.java create mode 100644 platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/HospitalDoctSerResult.java create mode 100644 platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/HospitalServiceContentResult.java diff --git a/platform-biz-service/src/main/java/com/lyms/platform/permission/dao/master/HospitalServiceContentMapper.java b/platform-biz-service/src/main/java/com/lyms/platform/permission/dao/master/HospitalServiceContentMapper.java index 91f859f..49aa6e2 100644 --- a/platform-biz-service/src/main/java/com/lyms/platform/permission/dao/master/HospitalServiceContentMapper.java +++ b/platform-biz-service/src/main/java/com/lyms/platform/permission/dao/master/HospitalServiceContentMapper.java @@ -18,4 +18,8 @@ public interface HospitalServiceContentMapper { public List queryHospitalServiceContent(HospitalServiceContentQuery query); + public List queryGroupHospitalServiceContent(HospitalServiceContentQuery query); + + public int queryGroupHospitalServiceContentCount(HospitalServiceContentQuery query); + } \ No newline at end of file diff --git a/platform-biz-service/src/main/java/com/lyms/platform/permission/model/HospitalServiceContent.java b/platform-biz-service/src/main/java/com/lyms/platform/permission/model/HospitalServiceContent.java index 4eda13d..47c1af4 100644 --- a/platform-biz-service/src/main/java/com/lyms/platform/permission/model/HospitalServiceContent.java +++ b/platform-biz-service/src/main/java/com/lyms/platform/permission/model/HospitalServiceContent.java @@ -22,6 +22,10 @@ public class HospitalServiceContent { */ private Integer serType; /** + * 服务类型集合 + */ + private String serTypes; + /** * 服务价格 */ private BigDecimal serPrice; @@ -34,7 +38,7 @@ public class HospitalServiceContent { */ private String createUser; /** - * 状态:0-有效、1-暂停、2-删除 + * 状态:1-有效、2-暂停、3-删除 */ private Integer status; @@ -43,6 +47,14 @@ public class HospitalServiceContent { */ private List doctIds = new ArrayList<>(); + public String getSerTypes() { + return serTypes; + } + + public void setSerTypes(String serTypes) { + this.serTypes = serTypes; + } + public List getDoctIds() { return doctIds; } diff --git a/platform-biz-service/src/main/java/com/lyms/platform/permission/service/HospitalServiceContentService.java b/platform-biz-service/src/main/java/com/lyms/platform/permission/service/HospitalServiceContentService.java index 9dde34e..b7d0218 100644 --- a/platform-biz-service/src/main/java/com/lyms/platform/permission/service/HospitalServiceContentService.java +++ b/platform-biz-service/src/main/java/com/lyms/platform/permission/service/HospitalServiceContentService.java @@ -18,4 +18,8 @@ public interface HospitalServiceContentService { public List queryHospitalServiceContent(HospitalServiceContentQuery query); + public List queryGroupHospitalServiceContent(HospitalServiceContentQuery query); + + public int queryGroupHospitalServiceContentCount(HospitalServiceContentQuery query); + } \ No newline at end of file diff --git a/platform-biz-service/src/main/java/com/lyms/platform/permission/service/impl/HospitalServiceContentServiceImpl.java b/platform-biz-service/src/main/java/com/lyms/platform/permission/service/impl/HospitalServiceContentServiceImpl.java index 2d787e1..a6a2245 100644 --- a/platform-biz-service/src/main/java/com/lyms/platform/permission/service/impl/HospitalServiceContentServiceImpl.java +++ b/platform-biz-service/src/main/java/com/lyms/platform/permission/service/impl/HospitalServiceContentServiceImpl.java @@ -48,4 +48,17 @@ public class HospitalServiceContentServiceImpl implements HospitalServiceContent return hospitalServiceContentMapper.queryHospitalServiceContent(query); } + @Override + public List queryGroupHospitalServiceContent(HospitalServiceContentQuery query) { + if (query.getNeed() != null) { + query.mysqlBuild(hospitalServiceContentMapper.queryGroupHospitalServiceContentCount(query)); + } + return hospitalServiceContentMapper.queryGroupHospitalServiceContent(query); + } + + @Override + public int queryGroupHospitalServiceContentCount(HospitalServiceContentQuery query) { + return hospitalServiceContentMapper.queryGroupHospitalServiceContentCount(query); + } + } \ No newline at end of file diff --git a/platform-biz-service/src/main/resources/mainOrm/master/HospitalServiceContent.xml b/platform-biz-service/src/main/resources/mainOrm/master/HospitalServiceContent.xml index 54e1bfe..ccf530f 100644 --- a/platform-biz-service/src/main/resources/mainOrm/master/HospitalServiceContent.xml +++ b/platform-biz-service/src/main/resources/mainOrm/master/HospitalServiceContent.xml @@ -6,6 +6,7 @@ + @@ -93,6 +94,20 @@ select id,hospital_id,ser_type,ser_price,create_date,create_user,status + + + + +