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 7009513..078a95a 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,8 +36,6 @@ public class HospitalDoctService {
 
     private Integer syncStatus;
 
-    private BigDecimal devicePrice;
-    private Integer deviceCon;//0 无 1全程
     private BigDecimal weekPrice;
 
     public BigDecimal getWeekPrice() {
@@ -48,21 +46,6 @@ public class HospitalDoctService {
         this.weekPrice = weekPrice;
     }
 
-    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 f368777..72fd499 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,8 +36,6 @@ public class HospitalDoctServiceQuery extends BaseQuery {
     private Integer status;
     private Integer syncStatus;
 
-    private BigDecimal devicePrice;
-    private Integer deviceCon;//0 无 1全程
     private BigDecimal weekPrice;
 
     public BigDecimal getWeekPrice() {
@@ -48,21 +46,7 @@ public class HospitalDoctServiceQuery extends BaseQuery {
         this.weekPrice = weekPrice;
     }
 
-    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/HospitalServiceContent.java b/platform-biz-service/src/main/java/com/lyms/platform/permission/model/HospitalServiceContent.java
index abdf110..071dd07 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
@@ -52,6 +52,26 @@ public class HospitalServiceContent {
     //单周服务价格
     private  BigDecimal weekPrice;
 
+
+    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 BigDecimal getWeekPrice() {
         return weekPrice;
     }
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 795a769..a96cb06 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
@@ -44,6 +44,25 @@ public class HospitalServiceContentQuery extends BaseQuery {
     //单周服务价格
     private  BigDecimal weekPrice;
 
+    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 BigDecimal getWeekPrice() {
         return weekPrice;
     }
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 9d40d4c..fc105b9 100644
--- a/platform-biz-service/src/main/resources/mainOrm/master/HospitalDoctService.xml
+++ b/platform-biz-service/src/main/resources/mainOrm/master/HospitalDoctService.xml
@@ -8,8 +8,6 @@
         <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"/>
         <result column="weekPrice" property="weekPrice" jdbcType="DECIMAL"/>
@@ -17,8 +15,8 @@
 
 
     <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,devicePrice,deviceCon,weekPrice) values
-(#{id},#{hospServiceId},#{doctId},#{hospId},#{doctPrice},#{status},#{syncStatus},#{devicePrice},#{deviceCon},#{weekPrice})
+insert into hospital_doct_service (id,hosp_service_id,doct_id,hosp_id,doct_price,status,sync_status,devicePrice) values
+(#{id},#{hospServiceId},#{doctId},#{hospId},#{doctPrice},#{status},#{syncStatus},#{devicePrice})
 </insert>
 
 
@@ -37,18 +35,14 @@ 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="weekPrice != null">
                 weekPrice = #{weekPrice,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>
@@ -63,7 +57,7 @@ delete from hospital_doct_service where id = #{id,jdbcType=VARCHAR}
 
 
     <select id="getHospitalDoctService" resultMap="HospitalDoctServiceResultMap" parameterType="java.lang.String">
-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,weekPrice
  from hospital_doct_service where id = #{id,jdbcType=VARCHAR}
 </select>
 
@@ -96,9 +90,7 @@ 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="weekPrice != null">
                 and weekPrice = #{weekPrice,jdbcType=DECIMAL}
             </if>
@@ -109,16 +101,13 @@ select id,hosp_service_id,doct_id,hosp_id,doct_price,status,sync_status
               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,devicePrice,deviceCon,weekPrice
+        select id,hosp_service_id,doct_id,hosp_id,doct_price,status,sync_status,weekPrice
         from hospital_doct_service
         <include refid="HospitalDoctServiceCondition"/>
         <include refid="orderAndLimit"/>
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 10e4889..9265a6f 100644
--- a/platform-biz-service/src/main/resources/mainOrm/master/HospitalServiceContent.xml
+++ b/platform-biz-service/src/main/resources/mainOrm/master/HospitalServiceContent.xml
@@ -14,12 +14,14 @@
         <result column="sync_status" property="syncStatus" jdbcType="INTEGER"/>
 
         <result column="weekPrice" property="weekPrice" jdbcType="DECIMAL"/>
+        <result column="devicePrice" property="devicePrice" jdbcType="DECIMAL"/>
+        <result column="deviceCon" property="deviceCon" jdbcType="INTEGER"/>
     </resultMap>
 
 
     <insert id="addHospitalServiceContent" parameterType="com.lyms.platform.permission.model.HospitalServiceContent">
-insert into hospital_service_content (id,hospital_id,ser_type,ser_price,create_date,create_user,status,sync_status,weekPrice) values
-(#{id},#{hospitalId},#{serType},#{serPrice},#{createDate},#{createUser},#{status},#{syncStatus},#{weekPrice})
+insert into hospital_service_content (id,hospital_id,ser_type,ser_price,create_date,create_user,status,sync_status,weekPrice,deviceCon,weekPrice) values
+(#{id},#{hospitalId},#{serType},#{serPrice},#{createDate},#{createUser},#{status},#{syncStatus},#{weekPrice},#{deviceCon},#{weekPrice})
 </insert>
 
 
@@ -38,6 +40,13 @@ insert into hospital_service_content (id,hospital_id,ser_type,ser_price,create_d
             <if test="weekPrice != null">
                 weekPrice = #{weekPrice,jdbcType=DECIMAL},
             </if>
+            <if test="deviceCon != null and deviceCon >= 0">
+                deviceCon = #{deviceCon,jdbcType=INTEGER},
+            </if>
+            <if test="devicePrice != null">
+                devicePrice = #{devicePrice,jdbcType=DECIMAL},
+            </if>
+
             <if test="createDate != null">
                 create_date = #{createDate,jdbcType=TIMESTAMP},
             </if>
@@ -94,6 +103,12 @@ select id,hospital_id,ser_type,ser_price,create_date,create_user,status,sync_sta
             <if test="weekPrice != null">
                 and weekPrice = #{weekPrice,jdbcType=DECIMAL}
             </if>
+            <if test="devicePrice != null">
+                and devicePrice = #{devicePrice,jdbcType=DECIMAL}
+            </if>
+            <if test="deviceCon != null and deviceCon >= 0">
+                and  deviceCon = #{deviceCon,jdbcType=INTEGER}
+            </if>
             <if test="createDate != null">
                 and create_date = #{createDate,jdbcType=TIMESTAMP}
             </if>
@@ -112,7 +127,7 @@ select id,hospital_id,ser_type,ser_price,create_date,create_user,status,sync_sta
 
     <select id="queryGroupHospitalServiceContent" resultMap="HospitalServiceContentResultMap"
             parameterType="com.lyms.platform.permission.model.HospitalServiceContentQuery">
-        select hospital_id,group_concat(ser_type) as ser_types,create_date,create_user,sync_status,weekPrice from hospital_service_content
+        select hospital_id,group_concat(ser_type) as ser_types,create_date,create_user,sync_status,weekPrice,devicePrice,deviceCon from hospital_service_content
         <include refid="HospitalServiceContentCondition"/>
         group by hospital_id
         <include refid="orderAndLimit"/>
@@ -128,7 +143,7 @@ select id,hospital_id,ser_type,ser_price,create_date,create_user,status,sync_sta
 
     <select id="queryHospitalServiceContent" resultMap="HospitalServiceContentResultMap"
             parameterType="com.lyms.platform.permission.model.HospitalServiceContentQuery">
-        select id,hospital_id,ser_type,ser_price,create_date,create_user,status,sync_status,weekPrice
+        select id,hospital_id,ser_type,ser_price,create_date,create_user,status,sync_status,weekPrice,devicePrice,deviceCon
         from hospital_service_content
         <include refid="HospitalServiceContentCondition"/>
         <include refid="orderAndLimit"/>
diff --git a/platform-common/src/main/java/com/lyms/platform/common/enums/PatientSerEnums.java b/platform-common/src/main/java/com/lyms/platform/common/enums/PatientSerEnums.java
index bbdd0cf..05dd1c6 100644
--- a/platform-common/src/main/java/com/lyms/platform/common/enums/PatientSerEnums.java
+++ b/platform-common/src/main/java/com/lyms/platform/common/enums/PatientSerEnums.java
@@ -22,7 +22,7 @@ public class PatientSerEnums {
         xy(4, "血压管理"),
         zjzx(5, "专家咨询"),
         tw(7, "体温管理"),
-        YFDC(8, "孕妇单次服务"),
+        //YFDC(8, "孕妇单次服务"),
         babyjzzz(10, "精准医疗指导"),
         babyBzfw(11, "儿保小助理");//以前是：标准服务
         private Integer id;
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 d0e8cdf..8564720 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
@@ -128,6 +128,9 @@ public class ConfigServiceFacade {
             hospitalServiceContent.setStatus(ps.getStatus());
             hospitalServiceContent.setSerPrice(ps.getSerPrice());
             hospitalServiceContent.setWeekPrice(ps.getWeekPrice());
+
+            hospitalServiceContent.setDeviceCon(ps.getDeviceCon());
+            hospitalServiceContent.setDevicePrice(ps.getDevicePrice());
             hospitalServiceContentService.updateHospitalServiceContent(hospitalServiceContent);
         } else {
             ps.setId(UUID.randomUUID().toString().replace("-", ""));
@@ -240,8 +243,6 @@ public class ConfigServiceFacade {
             result.setDoctId(hs.getDoctId());
             result.setDoctPrice(hs.getDoctPrice());
             result.setStatus(hs.getStatus());
-            result.setDeviceCon(hs.getDeviceCon());
-            result.setDevicePrice(hs.getDevicePrice());
 
             result.setWeekPrice(hs.getWeekPrice());
             if (StringUtils.isNum(hs.getDoctId())) {
@@ -321,6 +322,8 @@ public class ConfigServiceFacade {
         result.setSerType(hs.getSerType());
         result.setCreateDate(DateUtil.getyyyy_MM_dd(hs.getCreateDate()));
         result.setWeekPrice(hs.getWeekPrice());
+        result.setDeviceCon(hs.getDeviceCon());
+        result.setDevicePrice(hs.getDevicePrice());
         if (hs.getStatus() != null) {
             result.setStatus(HospitalSerStatusEnums.getNameById(hs.getStatus()));
         }
@@ -377,8 +380,6 @@ public class ConfigServiceFacade {
                     oldHosDoct.setStatus(hds.getStatus());
                     oldHosDoct.setDoctPrice(hds.getDoctPrice());
                     oldHosDoct.setSyncStatus(0);
-                    oldHosDoct.setDeviceCon(hds.getDeviceCon());
-                    oldHosDoct.setDevicePrice(hds.getDevicePrice());
                     oldHosDoct.setWeekPrice(hds.getWeekPrice());
                     hospitalDoctService.updateHospitalDoctService(oldHosDoct);
                 }
@@ -392,8 +393,6 @@ public class ConfigServiceFacade {
                     hospitalDoctSer.setStatus(hds.getStatus());
                     hospitalDoctSer.setDoctPrice(hds.getDoctPrice());
                     hospitalDoctSer.setSyncStatus(0);
-                    hospitalDoctSer.setDeviceCon(hds.getDeviceCon());
-                    hospitalDoctSer.setDevicePrice(hds.getDevicePrice());
                     hospitalDoctSer.setWeekPrice(hds.getWeekPrice());
                     hospitalDoctService.updateHospitalDoctService(hospitalDoctSer);
                 } else {
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 efc6d5c..6974533 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
@@ -154,8 +154,7 @@ public class PatientServiceFacade {
                 Map dmap = new HashMap();
                 dmap.put("doctorId", docId);
                 dmap.put("doctorPrice", hds.getDoctPrice());
-                dmap.put("devicePrice", hds.getDevicePrice());
-                dmap.put("deviceCon", hds.getDeviceCon());
+
                 dmap.put("weekPrice", hds.getWeekPrice());
                 hsc.getDoctIds().add(dmap);
             }
@@ -1149,6 +1148,8 @@ public class PatientServiceFacade {
         map.put("ser_type", serviceContent.getSerType());
         map.put("status", serviceContent.getStatus());
         map.put("weekPrice", serviceContent.getWeekPrice());
+        map.put("devicePrice", serviceContent.getDevicePrice());
+        map.put("deviceCon", serviceContent.getDeviceCon());
         return map;
     }
 
@@ -1160,8 +1161,7 @@ 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());
+
         map.put("weekPrice", hospitalDoctService.getWeekPrice());
         return map;
     }
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 58b0033..fa6d20f 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
@@ -61,6 +61,25 @@ public class HospitalServiceContentResult {
     private  BigDecimal weekPrice;
 
 
+    private BigDecimal devicePrice;
+    private Integer deviceCon;//0 无 1全程
+
+    public Integer getDeviceCon() {
+        return deviceCon;
+    }
+
+    public void setDeviceCon(Integer deviceCon) {
+        this.deviceCon = deviceCon;
+    }
+
+    public BigDecimal getDevicePrice() {
+        return devicePrice;
+    }
+
+    public void setDevicePrice(BigDecimal devicePrice) {
+        this.devicePrice = devicePrice;
+    }
+
     public BigDecimal getWeekPrice() {
         return weekPrice;
     }