From ad6dd8c607a67813b49e34e496ea090793ed93ec Mon Sep 17 00:00:00 2001 From: jiangjiazhi Date: Thu, 23 Nov 2017 20:37:54 +0800 Subject: [PATCH] =?UTF-8?q?=E5=85=A8=E9=83=A8=E5=AD=95=E5=A6=87=E7=AE=A1?= =?UTF-8?q?=E7=90=86=E5=A2=9E=E5=8A=A0=E6=8C=89=E7=85=A7=E6=8E=92=E5=BA=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../permission/model/HospitalDoctService.java | 12 ++++ .../permission/model/HospitalDoctServiceQuery.java | 8 +++ .../permission/model/HospitalServiceContent.java | 8 +++ .../model/HospitalServiceContentQuery.java | 8 +++ .../mainOrm/master/HospitalDoctService.xml | 14 +++- .../mainOrm/master/HospitalServiceContent.xml | 16 +++-- .../operate/web/facade/PatientServiceFacade.java | 84 ++++++++++++++++++++++ 7 files changed, 143 insertions(+), 7 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 ca2173b..e31a26c 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 @@ -22,6 +22,8 @@ public class HospitalDoctService { * 医院id */ private String hospId; + + /** * 医生价格 */ @@ -32,6 +34,16 @@ public class HospitalDoctService { */ private Integer status; + private Integer syncStatus; + + public Integer getSyncStatus() { + return syncStatus; + } + + public void setSyncStatus(Integer syncStatus) { + this.syncStatus = syncStatus; + } + public Integer getStatus() { return status; } 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 aaa21e2..9bdcbf1 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 @@ -34,7 +34,15 @@ public class HospitalDoctServiceQuery extends BaseQuery { * 状态：0-有效、1-暂停、2-删除 */ private Integer status; + private Integer syncStatus; + public Integer getSyncStatus() { + return syncStatus; + } + + public void setSyncStatus(Integer syncStatus) { + this.syncStatus = syncStatus; + } public Integer getStatus() { return status; } 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 666ddeb..6dc8624 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 @@ -46,7 +46,15 @@ public class HospitalServiceContent { * 医生集合 */ private List doctIds = new ArrayList<>(); + private Integer syncStatus; + public Integer getSyncStatus() { + return syncStatus; + } + + public void setSyncStatus(Integer syncStatus) { + this.syncStatus = 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 2aabba9..b11cfc4 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 @@ -39,7 +39,15 @@ public class HospitalServiceContentQuery extends BaseQuery { * 状态：0-有效、1-暂停、2-删除 */ private Integer status; + private Integer syncStatus; + public Integer getSyncStatus() { + return syncStatus; + } + + public void setSyncStatus(Integer syncStatus) { + this.syncStatus = syncStatus; + } public Integer getStatus() { return status; } 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 f051dd0..fb63222 100644 --- a/platform-biz-service/src/main/resources/mainOrm/master/HospitalDoctService.xml +++ b/platform-biz-service/src/main/resources/mainOrm/master/HospitalDoctService.xml @@ -9,11 +9,13 @@ + -insert into hospital_doct_service (id,hosp_service_id,doct_id,hosp_id,doct_price,status) values (#{id},#{hospServiceId},#{doctId},#{hospId},#{doctPrice},#{status}) +insert into hospital_doct_service (id,hosp_service_id,doct_id,hosp_id,doct_price,status,sync_status) values +(#{id},#{hospServiceId},#{doctId},#{hospId},#{doctPrice},#{status},#{syncStatus}) @@ -35,6 +37,9 @@ insert into hospital_doct_service (id,hosp_service_id,doct_id,hosp_id,doct_price status = #{status,jdbcType=INTEGER}, + + sync_status = #{syncStatus,jdbcType=INTEGER}, + where id = #{id,jdbcType=VARCHAR} @@ -46,7 +51,7 @@ delete from hospital_doct_service where id = #{id,jdbcType=VARCHAR} @@ -82,13 +87,16 @@ select id,hosp_service_id,doct_id,hosp_id,doct_price,status and status = #{status,jdbcType=INTEGER} + + and sync_status = #{syncStatus,jdbcType=INTEGER} + -select id,hospital_id,ser_type,ser_price,create_date,create_user,status +select id,hospital_id,ser_type,ser_price,create_date,create_user,status,sync_status from hospital_service_content where id = #{id,jdbcType=VARCHAR} @@ -90,13 +95,16 @@ select id,hospital_id,ser_type,ser_price,create_date,create_user,status and status = #{status,jdbcType=INTEGER} + + and sync_status = #{syncStatus,jdbcType=INTEGER} + - select id,hospital_id,ser_type,ser_price,create_date,create_user,status + select id,hospital_id,ser_type,ser_price,create_date,create_user,status,sync_status from hospital_service_content 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 76b1afd..c9d018a 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 @@ -590,4 +590,88 @@ public class PatientServiceFacade { baseResponse.setErrormsg("成功"); return baseResponse; } + + + /** + * 同步医院医生服务价格配置 + * + * @return + */ + public BaseResponse syncHospitalService(){ + HospitalServiceContentQuery hospitalServiceContentQuery = new HospitalServiceContentQuery(); + hospitalServiceContentQuery.setStatus(1); + hospitalServiceContentQuery.setSyncStatus(0); + hospitalServiceContentQuery.setPage(1); + hospitalServiceContentQuery.setLimit(10); + //查询未同步的数据 + List hospitalServiceContents= hospitalServiceContentService.queryGroupHospitalServiceContent(hospitalServiceContentQuery); + List hospitalService=new ArrayList(); + List hospitalDoctService=new ArrayList(); + //判断是否有数据 + if(CollectionUtils.isNotEmpty(hospitalServiceContents)){ + for(HospitalServiceContent hospitalServiceContent:hospitalServiceContents){ + hospitalService.add(convert(hospitalServiceContent)); + } + } + + HospitalDoctServiceQuery hospitalDoctServiceQuery = new HospitalDoctServiceQuery(); + hospitalDoctServiceQuery.setLimit(10); + hospitalDoctServiceQuery.setPage(1); + hospitalDoctServiceQuery.setStatus(1); + hospitalDoctServiceQuery.setSyncStatus(0); + + List hospitalDoctServices=hospitalDoctServiceService.queryHospitalDoctService(hospitalDoctServiceQuery); + //判断是否有数据 + if(CollectionUtils.isNotEmpty(hospitalServiceContents)) { + for(HospitalDoctService hospitalServiceContent:hospitalDoctServices){ + hospitalDoctService.add(convert(hospitalServiceContent)); + } + } + + Map map1 = new HashMap(); + map1.put("hospitalDoctService",hospitalDoctService); + map1.put("hospitalService",hospitalService); + + BaseObjectResponse baseObjectResponse = new BaseObjectResponse(); + baseObjectResponse.setData(map1); + baseObjectResponse.setErrorcode(ErrorCodeConstants.SUCCESS); + baseObjectResponse.setErrormsg("成功"); + return baseObjectResponse; + } + + private Map convert(HospitalServiceContent serviceContent){ + Map map =new HashMap(); + map.put("create_date",serviceContent.getCreateDate().getTime()); + map.put("hospital_id",serviceContent.getHospitalId()); + map.put("id",serviceContent.getId()); + map.put("ser_price",serviceContent.getSerPrice()); + map.put("ser_type",serviceContent.getSerType()); + map.put("status",serviceContent.getStatus()); + /* "create_date": "", + "hospital_id": 1, + "id": 1, + "ser_price": 1, + "ser_type": 1*/ + return map; + } + + private Map convert(HospitalDoctService hospitalDoctService){ + Map map =new HashMap(); + map.put("doct_id",hospitalDoctService.getDoctId()); + map.put("doct_price",hospitalDoctService.getDoctPrice()); + map.put("id",hospitalDoctService.getId()); + map.put("hosp_id",hospitalDoctService.getHospId()); + map.put("hosp_service_id",hospitalDoctService.getHospServiceId()); + map.put("status",hospitalDoctService.getStatus()); + /*{ + "doct_id": 54545, + "doct_price": 10, + "hosp_service_id": 2, + "id": 1 + }*/ + return map; + } + + @Autowired + private HospitalDoctServiceService hospitalDoctServiceService; } -- 1.8.3.1