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 2693a2c..ca2173b 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
@@ -27,6 +27,20 @@ public class HospitalDoctService {
      */
     private BigDecimal doctPrice;
 
+    /**
+     * 状态：0-有效、1-暂停、2-删除
+     */
+    private Integer status;
+
+    public Integer getStatus() {
+        return status;
+    }
+
+    public void setStatus(Integer status) {
+        this.status = status;
+    }
+
+
     public String getId() {
         return id;
     }
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 a8d4256..aaa21e2 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
@@ -30,6 +30,20 @@ public class HospitalDoctServiceQuery extends BaseQuery {
      */
     private BigDecimal doctPrice;
 
+    /**
+     * 状态：0-有效、1-暂停、2-删除
+     */
+    private Integer status;
+
+    public Integer getStatus() {
+        return status;
+    }
+
+    public void setStatus(Integer status) {
+        this.status = status;
+    }
+
+
     public String getId() {
         return id;
     }
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 27a4296..4eda13d 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
@@ -1,7 +1,9 @@
 package com.lyms.platform.permission.model;
 
 import java.math.BigDecimal;
+import java.util.ArrayList;
 import java.util.Date;
+import java.util.List;
 
 /**
  * 医院服务配置
@@ -31,6 +33,31 @@ public class HospitalServiceContent {
      * 操作人
      */
     private String createUser;
+    /**
+     * 状态：0-有效、1-暂停、2-删除
+     */
+    private Integer status;
+
+    /**
+     * 医生集合
+     */
+    private List<String> doctIds = new ArrayList<>();
+
+    public List<String> getDoctIds() {
+        return doctIds;
+    }
+
+    public void setDoctIds(List<String> doctIds) {
+        this.doctIds = doctIds;
+    }
+
+    public Integer getStatus() {
+        return status;
+    }
+
+    public void setStatus(Integer status) {
+        this.status = status;
+    }
 
     public String getId() {
         return id;
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 099eb5a..2aabba9 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
@@ -35,6 +35,20 @@ public class HospitalServiceContentQuery extends BaseQuery {
      */
     private String createUser;
 
+    /**
+     * 状态：0-有效、1-暂停、2-删除
+     */
+    private Integer status;
+
+    public Integer getStatus() {
+        return status;
+    }
+
+    public void setStatus(Integer status) {
+        this.status = status;
+    }
+
+
     public String getId() {
         return id;
     }
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 8e0d9de..f051dd0 100644
--- a/platform-biz-service/src/main/resources/mainOrm/master/HospitalDoctService.xml
+++ b/platform-biz-service/src/main/resources/mainOrm/master/HospitalDoctService.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
-<mapper namespace="com.lyms.platform.permission.dao.HospitalDoctServiceMapper">
+<mapper namespace="com.lyms.platform.permission.dao.master.HospitalDoctServiceMapper">
 
     <resultMap id="HospitalDoctServiceResultMap" type="com.lyms.platform.permission.model.HospitalDoctService">
         <id column="id" property="id" jdbcType="VARCHAR"/>
@@ -8,11 +8,12 @@
         <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="status" property="status" 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) values (#{id},#{hospServiceId},#{doctId},#{hospId},#{doctPrice})
+insert into hospital_doct_service (id,hosp_service_id,doct_id,hosp_id,doct_price,status) values (#{id},#{hospServiceId},#{doctId},#{hospId},#{doctPrice},#{status})
 </insert>
 
 
@@ -31,6 +32,9 @@ 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="status != null and status >= 0">
+                status = #{status,jdbcType=INTEGER},
+            </if>
         </set>
         where id = #{id,jdbcType=VARCHAR}
     </update>
@@ -42,7 +46,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
+select id,hosp_service_id,doct_id,hosp_id,doct_price,status
  from hospital_doct_service where id = #{id,jdbcType=VARCHAR}
 </select>
 
@@ -75,13 +79,16 @@ select id,hosp_service_id,doct_id,hosp_id,doct_price
             <if test="doctPrice != null">
                 and doct_price = #{doctPrice,jdbcType=DECIMAL}
             </if>
+            <if test="status != null and status >= 0">
+                and status = #{status,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
+        select id,hosp_service_id,doct_id,hosp_id,doct_price,status
         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 b33bf41..54e1bfe 100644
--- a/platform-biz-service/src/main/resources/mainOrm/master/HospitalServiceContent.xml
+++ b/platform-biz-service/src/main/resources/mainOrm/master/HospitalServiceContent.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
-<mapper namespace="com.lyms.platform.permission.dao.HospitalServiceContentMapper">
+<mapper namespace="com.lyms.platform.permission.dao.master.HospitalServiceContentMapper">
 
     <resultMap id="HospitalServiceContentResultMap" type="com.lyms.platform.permission.model.HospitalServiceContent">
         <id column="id" property="id" jdbcType="VARCHAR"/>
@@ -9,11 +9,12 @@
         <result column="ser_price" property="serPrice" jdbcType="DECIMAL"/>
         <result column="create_date" property="createDate" jdbcType="TIMESTAMP"/>
         <result column="create_user" property="createUser" jdbcType="VARCHAR"/>
+        <result column="status" property="status" 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) values (#{id},#{hospitalId},#{serType},#{serPrice},#{createDate},#{createUser})
+insert into hospital_service_content (id,hospital_id,ser_type,ser_price,create_date,create_user,status) values (#{id},#{hospitalId},#{serType},#{serPrice},#{createDate},#{createUser},#{status})
 </insert>
 
 
@@ -35,6 +36,9 @@ insert into hospital_service_content (id,hospital_id,ser_type,ser_price,create_d
             <if test="createUser != null and createUser != ''">
                 create_user = #{createUser,jdbcType=VARCHAR},
             </if>
+            <if test="status != null and status >= 0">
+                status = #{status,jdbcType=INTEGER},
+            </if>
         </set>
         where id = #{id,jdbcType=VARCHAR}
     </update>
@@ -46,7 +50,7 @@ delete from hospital_service_content where id = #{id,jdbcType=VARCHAR}
 
 
     <select id="getHospitalServiceContent" resultMap="HospitalServiceContentResultMap" parameterType="java.lang.String">
-select id,hospital_id,ser_type,ser_price,create_date,create_user
+select id,hospital_id,ser_type,ser_price,create_date,create_user,status
  from hospital_service_content where id = #{id,jdbcType=VARCHAR}
 </select>
 
@@ -82,13 +86,16 @@ select id,hospital_id,ser_type,ser_price,create_date,create_user
             <if test="createUser != null and createUser != ''">
                 and create_user = #{createUser,jdbcType=VARCHAR}
             </if>
+            <if test="status != null and status >= 0">
+                and status = #{status,jdbcType=INTEGER}
+            </if>
         </where>
     </sql>
 
 
     <select id="queryHospitalServiceContent" resultMap="HospitalServiceContentResultMap"
             parameterType="com.lyms.platform.permission.model.HospitalServiceContentQuery">
-        select id,hospital_id,ser_type,ser_price,create_date,create_user
+        select id,hospital_id,ser_type,ser_price,create_date,create_user,status
         from hospital_service_content
         <include refid="HospitalServiceContentCondition"/>
         <include refid="orderAndLimit"/>
diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/PatientServiceController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/PatientServiceController.java
index f067468..22f06dc 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/PatientServiceController.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/PatientServiceController.java
@@ -36,8 +36,10 @@ public class PatientServiceController extends BaseController {
     @ResponseBody
     @TokenRequired
     @RequestMapping(value = "/patSer/init", method = RequestMethod.GET)
-    public BaseResponse patientServiceInit() {
-        return patientServiceFacade.patientServiceInit();
+    public BaseResponse patientServiceInit( HttpServletRequest request) {
+        LoginContext loginState = (LoginContext) request.getAttribute("loginContext");
+
+        return patientServiceFacade.patientServiceInit(loginState.getId());
     }
 
     /**
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 42b8e45..fab8874 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
@@ -16,13 +16,8 @@ import com.lyms.platform.common.utils.DateUtil;
 import com.lyms.platform.common.utils.StringUtils;
 import com.lyms.platform.operate.web.request.BasePageQueryRequest;
 import com.lyms.platform.operate.web.result.PatientSerResult;
-import com.lyms.platform.permission.model.Organization;
-import com.lyms.platform.permission.model.PatientService;
-import com.lyms.platform.permission.model.PatientServiceQuery;
-import com.lyms.platform.permission.model.Users;
-import com.lyms.platform.permission.service.OrganizationService;
-import com.lyms.platform.permission.service.PatientServiceService;
-import com.lyms.platform.permission.service.UsersService;
+import com.lyms.platform.permission.model.*;
+import com.lyms.platform.permission.service.*;
 import com.lyms.platform.pojo.Patients;
 import com.lyms.platform.query.PatientsQuery;
 import net.sf.json.JSONArray;
@@ -56,19 +51,52 @@ public class PatientServiceFacade {
     private CommonService commonService;
     @Autowired
     private AntenatalExaminationService antenatalExaminationService;
-
+    @Autowired
+    private HospitalDoctServiceService hospitalDoctService;
+    @Autowired
+    private HospitalServiceContentService hospitalServiceContentService;
 
     @Autowired
     private OperateLogFacade operateLogFacade;
 
     public static String patSer_sync_url = Config.getItem("patSer_sync_url", "0");
 
-    public BaseResponse patientServiceInit() {
+    public BaseResponse patientServiceInit(Integer id) {
+        //根据用户id获取医院ID
+        String hospitalId = autoMatchFacade.getHospitalId(id);
+
         Map map = new HashMap();
         //服务类型
         map.put("serTypes", PatientSerEnums.getSerType());
         //服务状态
         map.put("serStatus", PatientSerEnums.getSerStatus());
+
+        HospitalServiceContentQuery hscQuery = new HospitalServiceContentQuery();
+
+        hscQuery.setHospitalId(hospitalId);
+        //状态 1--有效
+        hscQuery.setStatus(1);
+
+        List<HospitalServiceContent> hospitalServiceContents = hospitalServiceContentService.queryHospitalServiceContent(hscQuery);
+        Map<String,HospitalServiceContent> hscMap = new HashMap<>();
+        for(HospitalServiceContent hsc:hospitalServiceContents){
+            hscMap.put(hsc.getId(),hsc);
+        }
+        HospitalDoctServiceQuery hospitalDoctServiceQuery = new HospitalDoctServiceQuery();
+        //状态 1--有效
+        hospitalDoctServiceQuery.setStatus(1);
+        hospitalDoctServiceQuery.setHospId(hospitalId);
+        List<HospitalDoctService> hospitalDoctServiceList = hospitalDoctService.queryHospitalDoctService(hospitalDoctServiceQuery);
+        //给医院服务加入医生的服务价格信息
+        for(HospitalDoctService hds:hospitalDoctServiceList){
+            HospitalServiceContent hsc = hscMap.get(hds.getHospServiceId());
+            if(hsc!=null){
+                hsc.getDoctIds().add(hds.getDoctId());
+            }
+        }
+
+        map.put("hospSer",hospitalServiceContents);
+
         return new BaseObjectResponse().setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg(ErrorCodeConstants.SUCCESS_DESCRIPTION).setData(map);
     }
 
@@ -128,10 +156,10 @@ public class PatientServiceFacade {
     public BaseResponse addPatientService(PatientService ps, Integer id) throws Exception {
         //根据用户id获取医院ID
         String hospitalId = autoMatchFacade.getHospitalId(id);
-        List<Map<String,String>> serInfos = ps.getSerInfos();
+        List<Map<String, String>> serInfos = ps.getSerInfos();
 
         List<PatientService> patientServiceList = new ArrayList<>();
-        for (Map<String,String> serInfo : serInfos) {
+        for (Map<String, String> serInfo : serInfos) {
             //先根据孕妇id和开通服务类型、开通医生进行查询，如果已经开通过则开通失败
             PatientServiceQuery patientQuery = new PatientServiceQuery();
             patientQuery.setHospitalId(hospitalId);
@@ -155,7 +183,7 @@ public class PatientServiceFacade {
             ps.setSerStatus(PatientSerEnums.SerStatusEnums.kt.getId());
             //服务类型
             ps.setSerType(Integer.parseInt(serInfo.get("serType")));
-            if(serInfo.containsKey(serInfo.get("serDoct"))){
+            if (serInfo.containsKey(serInfo.get("serDoct"))) {
                 ps.setSerDoct(serInfo.get("serDoct"));
             }
             //默认已经领取
@@ -485,7 +513,7 @@ public class PatientServiceFacade {
                 jsonObject.put("serStatus", ps.getSerStatus());
                 jsonObject.put("hospitalId", ps.getHospitalId());
                 //领取状态
-                jsonObject.put("status",ps.getStatus());
+                jsonObject.put("status", ps.getStatus());
                 jsonObject.put("createDate", DateUtil.getyyyy_MM_dd_hms(ps.getCreateDate()));
                 jsonArray.add(jsonObject);
             }
@@ -494,7 +522,7 @@ public class PatientServiceFacade {
             baseResponse.setErrorcode(ErrorCodeConstants.SUCCESS);
             baseResponse.setErrormsg("成功");
             return baseResponse;
-        } catch (Exception e){
+        } catch (Exception e) {
             baseResponse.setErrorcode(ErrorCodeConstants.SYSTEM_ERROR);
             baseResponse.setErrormsg(e.getMessage());
             return baseResponse;