From 71cf75f2a7e203f310e7d961c7da99f854319efe Mon Sep 17 00:00:00 2001 From: liquanyu Date: Sat, 16 Feb 2019 11:54:43 +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/HospitalDoctService.java | 9 +++++++++ .../permission/model/HospitalDoctServiceQuery.java | 9 +++++++++ .../permission/model/HospitalServiceContent.java | 11 +++++++++++ .../permission/model/HospitalServiceContentQuery.java | 11 +++++++++++ .../resources/mainOrm/master/HospitalDoctService.xml | 13 ++++++++++--- .../mainOrm/master/HospitalServiceContent.xml | 18 +++++++++++++----- .../operate/web/facade/ConfigServiceFacade.java | 5 +++++ .../operate/web/facade/PatientServiceFacade.java | 2 ++ .../operate/web/result/HospitalDoctSerResult.java | 10 ++++++++++ .../web/result/HospitalServiceContentResult.java | 12 ++++++++++++ 10 files changed, 92 insertions(+), 8 deletions(-) diff --git a/platform-biz-service/src/main/java/com/lyms/platform/permission/model/HospitalDoctService.java b/platform-biz-service/src/main/java/com/lyms/platform/permission/model/HospitalDoctService.java index b083ec8..7009513 100644 --- a/platform-biz-service/src/main/java/com/lyms/platform/permission/model/HospitalDoctService.java +++ b/platform-biz-service/src/main/java/com/lyms/platform/permission/model/HospitalDoctService.java @@ -38,6 +38,15 @@ public class HospitalDoctService { private BigDecimal devicePrice; private Integer deviceCon;//0 无 1全程 + private BigDecimal weekPrice; + + public BigDecimal getWeekPrice() { + return weekPrice; + } + + public void setWeekPrice(BigDecimal weekPrice) { + this.weekPrice = weekPrice; + } public BigDecimal getDevicePrice() { return devicePrice; diff --git a/platform-biz-service/src/main/java/com/lyms/platform/permission/model/HospitalDoctServiceQuery.java b/platform-biz-service/src/main/java/com/lyms/platform/permission/model/HospitalDoctServiceQuery.java index 9910953..f368777 100644 --- a/platform-biz-service/src/main/java/com/lyms/platform/permission/model/HospitalDoctServiceQuery.java +++ b/platform-biz-service/src/main/java/com/lyms/platform/permission/model/HospitalDoctServiceQuery.java @@ -38,6 +38,15 @@ public class HospitalDoctServiceQuery extends BaseQuery { private BigDecimal devicePrice; private Integer deviceCon;//0 无 1全程 + private BigDecimal weekPrice; + + public BigDecimal getWeekPrice() { + return weekPrice; + } + + public void setWeekPrice(BigDecimal weekPrice) { + this.weekPrice = weekPrice; + } public BigDecimal getDevicePrice() { return devicePrice; 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 e17c0ac..abdf110 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 @@ -49,6 +49,17 @@ public class HospitalServiceContent { private List doctIds = new ArrayList<>(); private Integer syncStatus; + //单周服务价格 + private BigDecimal weekPrice; + + public BigDecimal getWeekPrice() { + return weekPrice; + } + + public void setWeekPrice(BigDecimal weekPrice) { + this.weekPrice = weekPrice; + } + public Integer getSyncStatus() { return syncStatus; } diff --git a/platform-biz-service/src/main/java/com/lyms/platform/permission/model/HospitalServiceContentQuery.java b/platform-biz-service/src/main/java/com/lyms/platform/permission/model/HospitalServiceContentQuery.java index b11cfc4..795a769 100644 --- a/platform-biz-service/src/main/java/com/lyms/platform/permission/model/HospitalServiceContentQuery.java +++ b/platform-biz-service/src/main/java/com/lyms/platform/permission/model/HospitalServiceContentQuery.java @@ -41,6 +41,17 @@ public class HospitalServiceContentQuery extends BaseQuery { private Integer status; private Integer syncStatus; + //单周服务价格 + private BigDecimal weekPrice; + + public BigDecimal getWeekPrice() { + return weekPrice; + } + + public void setWeekPrice(BigDecimal weekPrice) { + this.weekPrice = weekPrice; + } + public Integer getSyncStatus() { return syncStatus; } diff --git a/platform-biz-service/src/main/resources/mainOrm/master/HospitalDoctService.xml b/platform-biz-service/src/main/resources/mainOrm/master/HospitalDoctService.xml index 095c3da..9d40d4c 100644 --- a/platform-biz-service/src/main/resources/mainOrm/master/HospitalDoctService.xml +++ b/platform-biz-service/src/main/resources/mainOrm/master/HospitalDoctService.xml @@ -12,12 +12,13 @@ + -insert into hospital_doct_service (id,hosp_service_id,doct_id,hosp_id,doct_price,status,sync_status,devicePrice,deviceCon) values -(#{id},#{hospServiceId},#{doctId},#{hospId},#{doctPrice},#{status},#{syncStatus},#{devicePrice},#{deviceCon}) +insert into hospital_doct_service (id,hosp_service_id,doct_id,hosp_id,doct_price,status,sync_status,devicePrice,deviceCon,weekPrice) values +(#{id},#{hospServiceId},#{doctId},#{hospId},#{doctPrice},#{status},#{syncStatus},#{devicePrice},#{deviceCon},#{weekPrice}) @@ -39,6 +40,9 @@ insert into hospital_doct_service (id,hosp_service_id,doct_id,hosp_id,doct_price devicePrice = #{devicePrice,jdbcType=DECIMAL}, + + weekPrice = #{weekPrice,jdbcType=DECIMAL}, + status = #{status,jdbcType=INTEGER}, @@ -95,6 +99,9 @@ select id,hosp_service_id,doct_id,hosp_id,doct_price,status,sync_status and devicePrice = #{devicePrice,jdbcType=DECIMAL} + + and weekPrice = #{weekPrice,jdbcType=DECIMAL} + and status = #{status,jdbcType=INTEGER} @@ -111,7 +118,7 @@ select id,hosp_service_id,doct_id,hosp_id,doct_price,status,sync_status -select id,hospital_id,ser_type,ser_price,create_date,create_user,status,sync_status +select id,hospital_id,ser_type,ser_price,create_date,create_user,status,sync_status,weekPrice from hospital_service_content where id = #{id,jdbcType=VARCHAR} @@ -86,6 +91,9 @@ select id,hospital_id,ser_type,ser_price,create_date,create_user,status,sync_sta and ser_price = #{serPrice,jdbcType=DECIMAL} + + and weekPrice = #{weekPrice,jdbcType=DECIMAL} + and create_date = #{createDate,jdbcType=TIMESTAMP} @@ -104,7 +112,7 @@ select id,hospital_id,ser_type,ser_price,create_date,create_user,status,sync_sta - select id,hospital_id,ser_type,ser_price,create_date,create_user,status,sync_status + select id,hospital_id,ser_type,ser_price,create_date,create_user,status,sync_status,weekPrice from hospital_service_content diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ConfigServiceFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ConfigServiceFacade.java index 1356532..9d0ee29 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ConfigServiceFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ConfigServiceFacade.java @@ -241,6 +241,8 @@ public class ConfigServiceFacade { result.setStatus(hs.getStatus()); result.setDeviceCon(hs.getDeviceCon()); result.setDevicePrice(hs.getDevicePrice()); + + result.setWeekPrice(hs.getWeekPrice()); if (StringUtils.isNum(hs.getDoctId())) { result.setDoctName(docterMap.get(Integer.parseInt(hs.getDoctId()))); } @@ -317,6 +319,7 @@ public class ConfigServiceFacade { result.setSerPrice(hs.getSerPrice()); result.setSerType(hs.getSerType()); result.setCreateDate(DateUtil.getyyyy_MM_dd(hs.getCreateDate())); + result.setWeekPrice(hs.getWeekPrice()); if (hs.getStatus() != null) { result.setStatus(HospitalSerStatusEnums.getNameById(hs.getStatus())); } @@ -375,6 +378,7 @@ public class ConfigServiceFacade { oldHosDoct.setSyncStatus(0); oldHosDoct.setDeviceCon(hds.getDeviceCon()); oldHosDoct.setDevicePrice(hds.getDevicePrice()); + oldHosDoct.setWeekPrice(hds.getWeekPrice()); hospitalDoctService.updateHospitalDoctService(oldHosDoct); } } else { @@ -389,6 +393,7 @@ public class ConfigServiceFacade { hospitalDoctSer.setSyncStatus(0); hospitalDoctSer.setDeviceCon(hds.getDeviceCon()); hospitalDoctSer.setDevicePrice(hds.getDevicePrice()); + hospitalDoctSer.setWeekPrice(hds.getWeekPrice()); hospitalDoctService.updateHospitalDoctService(hospitalDoctSer); } else { hds.setId(UUID.randomUUID().toString().replace("-", "")); 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 2bb17ed..7372ef5 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 @@ -1148,6 +1148,7 @@ public class PatientServiceFacade { map.put("ser_price", serviceContent.getSerPrice()); map.put("ser_type", serviceContent.getSerType()); map.put("status", serviceContent.getStatus()); + map.put("weekPrice", serviceContent.getWeekPrice()); return map; } @@ -1161,6 +1162,7 @@ public class PatientServiceFacade { map.put("status", hospitalDoctService.getStatus()); map.put("devicePrice", hospitalDoctService.getDevicePrice()); map.put("deviceCon", hospitalDoctService.getDeviceCon()); + map.put("weekPrice", hospitalDoctService.getWeekPrice()); return map; } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/HospitalDoctSerResult.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/HospitalDoctSerResult.java index 2af82ef..661e7c0 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/HospitalDoctSerResult.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/HospitalDoctSerResult.java @@ -50,6 +50,16 @@ public class HospitalDoctSerResult { private BigDecimal devicePrice; private Integer deviceCon;//0 无 1全程 + private BigDecimal weekPrice; + + public BigDecimal getWeekPrice() { + return weekPrice; + } + + public void setWeekPrice(BigDecimal weekPrice) { + this.weekPrice = weekPrice; + } + public BigDecimal getDevicePrice() { return devicePrice; } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/HospitalServiceContentResult.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/HospitalServiceContentResult.java index 86253ff..58b0033 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/HospitalServiceContentResult.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/HospitalServiceContentResult.java @@ -57,6 +57,18 @@ public class HospitalServiceContentResult { */ private List hospitalDoctServices = new ArrayList<>(); + //单周服务价格 + private BigDecimal weekPrice; + + + public BigDecimal getWeekPrice() { + return weekPrice; + } + + public void setWeekPrice(BigDecimal weekPrice) { + this.weekPrice = weekPrice; + } + public List getHospitalDoctServices() { return hospitalDoctServices; } -- 1.8.3.1