From 661bff8ccb6028b2afec182c190028e83931ae9a Mon Sep 17 00:00:00 2001
From: liquanyu <liquanyu@lymsh.com>
Date: Thu, 14 Feb 2019 11:01:54 +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

---
 .../permission/model/HospitalDoctService.java       | 19 +++++++++++++++++++
 .../permission/model/HospitalDoctServiceQuery.java  | 19 +++++++++++++++++++
 .../mainOrm/master/HospitalDoctService.xml          | 21 ++++++++++++++++++---
 .../operate/web/facade/ConfigServiceFacade.java     |  9 ++++++++-
 .../operate/web/result/HospitalDoctSerResult.java   | 19 +++++++++++++++++++
 5 files changed, 83 insertions(+), 4 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 183a358..b083ec8 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
@@ -36,6 +36,25 @@ public class HospitalDoctService {
 
     private Integer syncStatus;
 
+    private BigDecimal devicePrice;
+    private Integer deviceCon;//0 无 1全程
+
+    public BigDecimal getDevicePrice() {
+        return devicePrice;
+    }
+
+    public void setDevicePrice(BigDecimal devicePrice) {
+        this.devicePrice = devicePrice;
+    }
+
+    public Integer getDeviceCon() {
+        return deviceCon;
+    }
+
+    public void setDeviceCon(Integer deviceCon) {
+        this.deviceCon = deviceCon;
+    }
+
     public Integer getSyncStatus() {
         return syncStatus;
     }
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 9bdcbf1..9910953 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
@@ -36,6 +36,25 @@ public class HospitalDoctServiceQuery extends BaseQuery {
     private Integer status;
     private Integer syncStatus;
 
+    private BigDecimal devicePrice;
+    private Integer deviceCon;//0 无 1全程
+
+    public BigDecimal getDevicePrice() {
+        return devicePrice;
+    }
+
+    public void setDevicePrice(BigDecimal devicePrice) {
+        this.devicePrice = devicePrice;
+    }
+
+    public Integer getDeviceCon() {
+        return deviceCon;
+    }
+
+    public void setDeviceCon(Integer deviceCon) {
+        this.deviceCon = deviceCon;
+    }
+
     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 fb63222..095c3da 100644
--- a/platform-biz-service/src/main/resources/mainOrm/master/HospitalDoctService.xml
+++ b/platform-biz-service/src/main/resources/mainOrm/master/HospitalDoctService.xml
@@ -8,14 +8,16 @@
         <result column="doct_id" property="doctId" jdbcType="VARCHAR"/>
         <result column="hosp_id" property="hospId" jdbcType="VARCHAR"/>
         <result column="doct_price" property="doctPrice" jdbcType="DECIMAL"/>
+        <result column="devicePrice" property="devicePrice" jdbcType="DECIMAL"/>
+        <result column="deviceCon" property="deviceCon" jdbcType="INTEGER"/>
         <result column="status" property="status" jdbcType="INTEGER"/>
         <result column="sync_status" property="syncStatus" jdbcType="INTEGER"/>
     </resultMap>
 
 
     <insert id="addHospitalDoctService" parameterType="com.lyms.platform.permission.model.HospitalDoctService">
-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})
+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>
 
 
@@ -34,9 +36,15 @@ insert into hospital_doct_service (id,hosp_service_id,doct_id,hosp_id,doct_price
             <if test="doctPrice != null">
                 doct_price = #{doctPrice,jdbcType=DECIMAL},
             </if>
+            <if test="devicePrice != null">
+                devicePrice = #{devicePrice,jdbcType=DECIMAL},
+            </if>
             <if test="status != null and status >= 0">
                 status = #{status,jdbcType=INTEGER},
             </if>
+            <if test="deviceCon != null and deviceCon >= 0">
+                deviceCon = #{deviceCon,jdbcType=INTEGER},
+            </if>
             <if test="syncStatus != null and syncStatus >= 0">
                 sync_status = #{syncStatus,jdbcType=INTEGER},
             </if>
@@ -84,19 +92,26 @@ select id,hosp_service_id,doct_id,hosp_id,doct_price,status,sync_status
             <if test="doctPrice != null">
                 and doct_price = #{doctPrice,jdbcType=DECIMAL}
             </if>
+            <if test="devicePrice != null">
+                and devicePrice = #{devicePrice,jdbcType=DECIMAL}
+            </if>
             <if test="status != null and status >= 0">
                 and status = #{status,jdbcType=INTEGER}
             </if>
             <if test="syncStatus != null and syncStatus >= 0">
               and  sync_status = #{syncStatus,jdbcType=INTEGER}
             </if>
+
+            <if test="deviceCon != null and deviceCon >= 0">
+                and  deviceCon = #{deviceCon,jdbcType=INTEGER}
+            </if>
         </where>
     </sql>
 
 
     <select id="queryHospitalDoctService" resultMap="HospitalDoctServiceResultMap"
             parameterType="com.lyms.platform.permission.model.HospitalDoctServiceQuery">
-        select id,hosp_service_id,doct_id,hosp_id,doct_price,status,sync_status
+        select id,hosp_service_id,doct_id,hosp_id,doct_price,status,sync_status,devicePrice,deviceCon
         from hospital_doct_service
         <include refid="HospitalDoctServiceCondition"/>
         <include refid="orderAndLimit"/>
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 42ec42c..1356532 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
@@ -239,6 +239,8 @@ public class ConfigServiceFacade {
             result.setDoctId(hs.getDoctId());
             result.setDoctPrice(hs.getDoctPrice());
             result.setStatus(hs.getStatus());
+            result.setDeviceCon(hs.getDeviceCon());
+            result.setDevicePrice(hs.getDevicePrice());
             if (StringUtils.isNum(hs.getDoctId())) {
                 result.setDoctName(docterMap.get(Integer.parseInt(hs.getDoctId())));
             }
@@ -363,13 +365,16 @@ public class ConfigServiceFacade {
     public BaseResponse addOrUpdateHosDoctService(HospitalDoctService hds, Integer id) {
         BaseResponse baseResponse = new BaseResponse();
         try {
-            if (StringUtils.isNotEmpty(hds.getId())) {//修改
+            //修改
+            if (StringUtils.isNotEmpty(hds.getId())) {
                 HospitalDoctService oldHosDoct = hospitalDoctService.getHospitalDoctService(hds.getId());
                 //修改
                 if (oldHosDoct != null) {
                     oldHosDoct.setStatus(hds.getStatus());
                     oldHosDoct.setDoctPrice(hds.getDoctPrice());
                     oldHosDoct.setSyncStatus(0);
+                    oldHosDoct.setDeviceCon(hds.getDeviceCon());
+                    oldHosDoct.setDevicePrice(hds.getDevicePrice());
                     hospitalDoctService.updateHospitalDoctService(oldHosDoct);
                 }
             } else {
@@ -382,6 +387,8 @@ public class ConfigServiceFacade {
                     hospitalDoctSer.setStatus(hds.getStatus());
                     hospitalDoctSer.setDoctPrice(hds.getDoctPrice());
                     hospitalDoctSer.setSyncStatus(0);
+                    hospitalDoctSer.setDeviceCon(hds.getDeviceCon());
+                    hospitalDoctSer.setDevicePrice(hds.getDevicePrice());
                     hospitalDoctService.updateHospitalDoctService(hospitalDoctSer);
                 } else {
                     hds.setId(UUID.randomUUID().toString().replace("-", ""));
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 652638b..2af82ef 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
@@ -47,6 +47,25 @@ public class HospitalDoctSerResult {
      */
     private Integer status;
 
+    private BigDecimal devicePrice;
+    private Integer deviceCon;//0 无 1全程
+
+    public BigDecimal getDevicePrice() {
+        return devicePrice;
+    }
+
+    public void setDevicePrice(BigDecimal devicePrice) {
+        this.devicePrice = devicePrice;
+    }
+
+    public Integer getDeviceCon() {
+        return deviceCon;
+    }
+
+    public void setDeviceCon(Integer deviceCon) {
+        this.deviceCon = deviceCon;
+    }
+
     public String getDoctName() {
         return doctName;
     }
-- 
1.8.3.1