From 8ce0e3ca474e03fa24ded8bf11af57b40ce84895 Mon Sep 17 00:00:00 2001
From: yangfei <yangfei@lymsh.com>
Date: Mon, 11 Dec 2017 10:46:46 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BA=A7=E5=90=8E=E9=9A=8F=E8=AE=BF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../platform/permission/model/PatientService.java  | 12 +++++++
 .../permission/model/PatientServiceQuery.java      | 12 +++++++
 .../resources/mainOrm/master/PatientService.xml    | 13 ++++++--
 .../platform/common/enums/PatientSerEnums.java     | 36 +++++++++++++++------
 .../java/com/lyms/platform/operate/web/Test.java   | 18 +++++++----
 .../web/controller/PatientServiceController.java   | 14 ++++++++
 .../operate/web/facade/MatDeliverFacade.java       | 37 ++++++++++++++++------
 .../operate/web/facade/MatdeliverFollowFacade.java |  7 +---
 .../operate/web/facade/PatientServiceFacade.java   | 36 +++++++--------------
 .../web/request/MatdeliverFollowRequest.java       | 12 +++++++
 .../web/result/MatdeliverFollowListResult.java     | 14 ++++++++
 11 files changed, 153 insertions(+), 58 deletions(-)

diff --git a/platform-biz-service/src/main/java/com/lyms/platform/permission/model/PatientService.java b/platform-biz-service/src/main/java/com/lyms/platform/permission/model/PatientService.java
index 30a6345..1721808 100644
--- a/platform-biz-service/src/main/java/com/lyms/platform/permission/model/PatientService.java
+++ b/platform-biz-service/src/main/java/com/lyms/platform/permission/model/PatientService.java
@@ -16,6 +16,10 @@ public class PatientService {
      */
     private String pid;
     /**
+     * 服务人类型(1-孕妇、2-儿童)
+     */
+    private Integer perType;
+    /**
      * 服务类型(1-孕期精准医疗、2-体重管理、3-血糖管理、4-血压管理、5-专家咨询、6-标准服务)
      */
     private Integer serType;
@@ -96,6 +100,14 @@ public class PatientService {
      */
     private Integer isOld;
 
+    public Integer getPerType() {
+        return perType;
+    }
+
+    public void setPerType(Integer perType) {
+        this.perType = perType;
+    }
+
     public Integer getIsOld() {
         return isOld;
     }
diff --git a/platform-biz-service/src/main/java/com/lyms/platform/permission/model/PatientServiceQuery.java b/platform-biz-service/src/main/java/com/lyms/platform/permission/model/PatientServiceQuery.java
index c7029dc..89cb79d 100644
--- a/platform-biz-service/src/main/java/com/lyms/platform/permission/model/PatientServiceQuery.java
+++ b/platform-biz-service/src/main/java/com/lyms/platform/permission/model/PatientServiceQuery.java
@@ -15,6 +15,10 @@ public class PatientServiceQuery extends BaseQuery {
     private String[] parentIds;
     private String pid;
     private Integer serType;
+    /**
+     * 服务人类型(1-孕妇、2-儿童)
+     */
+    private Integer perType;
     private String serDoct;
     private Date createDate;
     private Date createStartDate;
@@ -69,6 +73,14 @@ public class PatientServiceQuery extends BaseQuery {
      */
     private Integer isOld;
 
+    public Integer getPerType() {
+        return perType;
+    }
+
+    public void setPerType(Integer perType) {
+        this.perType = perType;
+    }
+
     public Integer getIsOld() {
         return isOld;
     }
diff --git a/platform-biz-service/src/main/resources/mainOrm/master/PatientService.xml b/platform-biz-service/src/main/resources/mainOrm/master/PatientService.xml
index 23800e9..68349dd 100644
--- a/platform-biz-service/src/main/resources/mainOrm/master/PatientService.xml
+++ b/platform-biz-service/src/main/resources/mainOrm/master/PatientService.xml
@@ -25,11 +25,12 @@
         <result column="order_id" property="orderId" jdbcType="VARCHAR"/>
         <result column="syn_status" property="synStatus" jdbcType="INTEGER"/>
         <result column="is_old" property="isOld" jdbcType="INTEGER"/>
+        <result column="per_type" property="perType" jdbcType="INTEGER"/>
     </resultMap>
 
 
     <insert id="addPatientService" parameterType="com.lyms.platform.permission.model.PatientService">
-        insert into patient_service (id,parentid,pid,ser_type,ser_doct,create_date,create_user_name,create_user,ser_status,update_date,update_user_name,update_user,hospital_id,ser_code,status,receive_date,receive_user,back_date,back_user,order_id,syn_status,is_old) values (#{id},#{parentid},#{pid},#{serType},#{serDoct},#{createDate},#{createUserName},#{createUser},#{serStatus},#{updateDate},#{updateUserName},#{updateUser},#{hospitalId},#{serCode},#{status},#{receiveDate},#{receiveUser},#{backDate},#{backUser},#{orderId},#{synStatus},#{isOld})
+        insert into patient_service (id,parentid,pid,ser_type,ser_doct,create_date,create_user_name,create_user,ser_status,update_date,update_user_name,update_user,hospital_id,ser_code,status,receive_date,receive_user,back_date,back_user,order_id,syn_status,is_old,per_type) values (#{id},#{parentid},#{pid},#{serType},#{serDoct},#{createDate},#{createUserName},#{createUser},#{serStatus},#{updateDate},#{updateUserName},#{updateUser},#{hospitalId},#{serCode},#{status},#{receiveDate},#{receiveUser},#{backDate},#{backUser},#{orderId},#{synStatus},#{isOld},#{perType})
     </insert>
 
 
@@ -94,6 +95,9 @@
             <if test="isOld != null and isOld != ''">
                 is_old = #{isOld,jdbcType=INTEGER},
             </if>
+            <if test="perType != null and perType != ''">
+                per_type = #{perType,jdbcType=INTEGER},
+            </if>
         </set>
         where id = #{id,jdbcType=VARCHAR}
     </update>
@@ -105,7 +109,7 @@
 
 
     <select id="getPatientService" resultMap="PatientServiceResultMap" parameterType="java.lang.String">
-        select id,parentid,pid,ser_type,ser_doct,create_date,create_user_name,create_user,ser_status,update_date,update_user_name,update_user,hospital_id,ser_code,status,receive_date,receive_user,back_date,back_user,order_id,syn_status,is_old
+        select id,parentid,pid,ser_type,ser_doct,create_date,create_user_name,create_user,ser_status,update_date,update_user_name,update_user,hospital_id,ser_code,status,receive_date,receive_user,back_date,back_user,order_id,syn_status,is_old,per_type
         from patient_service where id = #{id,jdbcType=VARCHAR}
     </select>
 
@@ -207,6 +211,9 @@
             <if test="isOld != null and isOld != ''">
                 and is_old = #{isOld,jdbcType=INTEGER}
             </if>
+            <if test="perType != null and perType != ''">
+                and per_type = #{perType,jdbcType=INTEGER}
+            </if>
             <if test="sql != null and sql != ''">
                 ${sql}
             </if>
@@ -216,7 +223,7 @@
     <select id="queryPatientService" resultMap="PatientServiceResultMap"
             parameterType="com.lyms.platform.permission.model.PatientServiceQuery">
         select
-        id,parentid,pid,ser_type,ser_doct,create_date,create_user_name,create_user,ser_status,update_date,update_user_name,update_user,hospital_id,ser_code,status,receive_date,receive_user,back_date,back_user,order_id,syn_status,is_old
+        id,parentid,pid,ser_type,ser_doct,create_date,create_user_name,create_user,ser_status,update_date,update_user_name,update_user,hospital_id,ser_code,status,receive_date,receive_user,back_date,back_user,order_id,syn_status,is_old,per_type
         from patient_service
         <include refid="PatientServiceCondition"/>
         <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 1402bff..88993c7 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
@@ -12,21 +12,23 @@ import java.util.Map;
  */
 public class PatientSerEnums {
     //服务类型(1-高危精准指导、2-体重、3-血糖、4-血压、5-专家咨询)
-    public enum SerTypeEnums{
+    public enum SerTypeEnums {
         bzfw(6, "标准服务"),
-        yqjzzd(1,"孕期精准医疗"),
-        tz(2,"体重管理"),
+        yqjzzd(1, "孕期精准医疗"),
+        tz(2, "体重管理"),
         xt(3, "血糖管理"),
         xy(4, "血压管理"),
         zjzx(5, "专家咨询");
         private Integer id;
         private String title;
+
         private SerTypeEnums(Integer id, String title) {
             this.id = id;
             this.title = title;
         }
+
         public static String getTitle(Integer id) {
-            for (SerTypeEnums e:values()) {
+            for (SerTypeEnums e : values()) {
                 if (e.getId() == id) {
                     return e.getTitle();
                 }
@@ -52,19 +54,21 @@ public class PatientSerEnums {
     }
 
     //服务状态(1-开通、2-退订、3-过期、4-暂停)
-    public enum SerStatusEnums{
-        kt(1,"开通"),
-        td(2,"退订"),
+    public enum SerStatusEnums {
+        kt(1, "开通"),
+        td(2, "退订"),
         gq(3, "过期"),
         zt(4, "暂停");
         private Integer id;
         private String title;
+
         private SerStatusEnums(Integer id, String title) {
             this.id = id;
             this.title = title;
         }
+
         public static String getTitle(Integer id) {
-            for (SerStatusEnums e:values()) {
+            for (SerStatusEnums e : values()) {
                 if (e.getId() == id) {
                     return e.getTitle();
                 }
@@ -89,7 +93,20 @@ public class PatientSerEnums {
         }
     }
 
-    //服务类型
+    //儿童服务类型
+    public static List getBabySerType() {
+        List<Object> list = new ArrayList<>();
+        Map<String, Object> resultMap = new HashMap<>();
+        resultMap.put("id", SerTypeEnums.bzfw.id);
+        resultMap.put("name", SerTypeEnums.bzfw.name());
+        list.add(resultMap);
+        resultMap.put("id", SerTypeEnums.yqjzzd.id);
+        resultMap.put("name", SerTypeEnums.yqjzzd.name());
+        list.add(resultMap);
+        return list;
+    }
+
+    //全部服务类型
     public static List getSerType() {
         List<Object> list = new ArrayList<>();
         for (SerTypeEnums enums : SerTypeEnums.values()) {
@@ -100,6 +117,7 @@ public class PatientSerEnums {
         }
         return list;
     }
+
     //服务状态
     public static List getSerStatus() {
         List<Object> list = new ArrayList<>();
diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/Test.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/Test.java
index 49d84ee..249479a 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/Test.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/Test.java
@@ -1,12 +1,11 @@
 package com.lyms.platform.operate.web;
 
-import com.lyms.platform.common.enums.YnEnums;
-import com.lyms.platform.query.PatientsQuery;
+import com.lyms.platform.common.utils.DateUtil;
 import net.sourceforge.pinyin4j.PinyinHelper;
 import org.apache.log4j.Logger;
-import org.springframework.util.StopWatch;
 
-import java.util.*;
+import java.util.Comparator;
+import java.util.Date;
 
 /**
  * Created by Administrator on 2016/8/22 0022.
@@ -16,7 +15,14 @@ public class Test {
     private static org.apache.log4j.Logger log = Logger.getLogger("HTTP-INVOKE");
 
     public static void main(String[] args) throws Exception{
-        PatientsQuery patientsQuery = new PatientsQuery();
+
+        Date startDate = DateUtil.addDay(new Date(),-21);
+        Date endDate = DateUtil.addDay(new Date(),-22);
+        System.out.println(DateUtil.getyyyy_MM_dd(startDate));
+        System.out.println(DateUtil.getyyyy_MM_dd(endDate));
+
+
+       /* PatientsQuery patientsQuery = new PatientsQuery();
         //排查本院隐藏建档
         patientsQuery.setExtEnable(false);
         patientsQuery.setBuildTypeNot(1);
@@ -49,7 +55,7 @@ public class Test {
             System.out.println(string);
         }
         stopWatch.stop();
-        System.out.println(stopWatch.toString());
+        System.out.println(stopWatch.toString());*/
     }
     /**
      * 功能：实现汉语拼音序比较
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 a8b3023..35f9f57 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
@@ -43,6 +43,20 @@ public class PatientServiceController extends BaseController {
     }
 
     /**
+     * 初始化接口
+     *
+     * @return
+     */
+    @ResponseBody
+    @TokenRequired
+    @RequestMapping(value = "/babySer/init", method = RequestMethod.GET)
+    public BaseResponse babyServiceInit( HttpServletRequest request) {
+        LoginContext loginState = (LoginContext) request.getAttribute("loginContext");
+
+        return patientServiceFacade.babyServiceInit(loginState.getId());
+    }
+
+    /**
      * 根据孕妇Id查询在当前医院的服务开通记录
      *
      * @param pid     孕妇Id
diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MatDeliverFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MatDeliverFacade.java
index 4e86c5c..d0ccae3 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MatDeliverFacade.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MatDeliverFacade.java
@@ -1207,6 +1207,15 @@ public class MatDeliverFacade {
                 patientsQuery.setFmDateStart(DateUtil.getSNDate(matdeliverFollowRequest.getBirthDate())[0]);
                 patientsQuery.setFmDateEnd(DateUtil.getSNDate(matdeliverFollowRequest.getBirthDate())[1]);
             }
+
+            if(matdeliverFollowRequest.getFollowStage()!=null){//按访视阶段查询
+                if(matdeliverFollowRequest.getFollowStage() == 1){//1、访视期内 分娩时间为：21天到当前时间
+                    patientsQuery.setFmDateStart(DateUtil.addDay(new Date(),-22));
+                    patientsQuery.setFmDateEnd(new Date());
+                }else if(matdeliverFollowRequest.getFollowStage() == 2){//2、超出访视期 分娩时间为：结束时间为：21天前的
+                    patientsQuery.setFmDateEnd(DateUtil.addDay(new Date(),-22));
+                }
+            }
             patientsQuery.setFmHospitalQueryList(hospitalList);
 
             List<Patients> patientsList = patientsService.queryPatient(patientsQuery);
@@ -1222,10 +1231,20 @@ public class MatDeliverFacade {
         }
 
         matDeliverQuery.setYn(YnEnums.YES.getId());
+        //分娩日期
         if (StringUtils.isNotEmpty(matdeliverFollowRequest.getBirthDate())) {
             matDeliverQuery.setCreatedStart(DateUtil.getSNDate(matdeliverFollowRequest.getBirthDate())[0]);
             matDeliverQuery.setEndStart(DateUtil.getSNDate(matdeliverFollowRequest.getBirthDate())[1]);
         }
+        if(matdeliverFollowRequest.getFollowStage()!=null){//按访视阶段查询
+            if(matdeliverFollowRequest.getFollowStage() == 1){//1、访视期内 分娩时间为：21天到当前时间
+                matDeliverQuery.setCreatedStart(DateUtil.addDay(new Date(),-22));
+                matDeliverQuery.setEndStart(new Date());
+            }else if(matdeliverFollowRequest.getFollowStage() == 2){//2、超出访视期 分娩时间为：结束时间为：21天前的
+                matDeliverQuery.setEndStart(DateUtil.addDay(new Date(),-22));
+            }
+        }
+
         matDeliverQuery.setFmHospitalList(hospitalList);
         matDeliverQuery.setContactResult(matdeliverFollowRequest.getContactResult());
         if (matdeliverFollowRequest.getContactReason() != null) {
@@ -1320,15 +1339,9 @@ public class MatDeliverFacade {
                 matdeliverFollowListResult.setMakeType(PostpartumFollowMakeEnums.TypeEnum.getTitle(deliverModel.getMakeType()));
             }
 
-            matdeliverFollowListResult.setIsClose(deliverModel.getIsClose());
-            //访视是否结案,如果已经结案则返回已结案，如果未结案，显示下次访视时间
-            if (deliverModel.getIsClose() != null && deliverModel.getIsClose() == PostpartumFollowMakeEnums.IsCloseEnum.YJA.getId()) {
-                matdeliverFollowListResult.setNextVisitDate(PostpartumFollowMakeEnums.IsCloseEnum.getTitle(deliverModel.getIsClose()));
-            } else if (deliverModel.getIsClose() != null && deliverModel.getIsClose() == PostpartumFollowMakeEnums.IsCloseEnum.WJA.getId()) {
-                //下次访视时间
-                if (deliverModel.getNextVisitDate() != null && deliverModel.getVisitResult() == 1) {
-                    matdeliverFollowListResult.setNextVisitDate(DateUtil.getyyyy_MM_dd(deliverModel.getNextVisitDate()));
-                }
+            //下次访视时间
+            if (deliverModel.getNextVisitDate() != null) {
+                matdeliverFollowListResult.setNextVisitDate(DateUtil.getyyyy_MM_dd(deliverModel.getNextVisitDate()));
             }
             //访视状态 0--是修改后替换的初始值
             if (deliverModel.getVisitStatus() != null && deliverModel.getVisitStatus() == 1) {
@@ -1339,6 +1352,12 @@ public class MatDeliverFacade {
                 matdeliverFollowListResult.setVisitResult(PostpartumFollowMakeEnums.ResultEnum.getTitle(deliverModel.getVisitResult()));
             }
 
+            matdeliverFollowListResult.setFollowStage(2);
+            if(StringUtils.isNotEmpty(deliverModel.getDueDate())){//根据分娩时间判断访视时间是否过期
+                Date resultDate = DateUtil.parseYMD(deliverModel.getDueDate());
+                boolean isScope = DateUtil.isBetween(resultDate,DateUtil.addDay(new Date(),-22),new Date());
+                matdeliverFollowListResult.setFollowStage(isScope?1:2);
+            }
             matdeliverFollowListResults.add(matdeliverFollowListResult);
         }
         listResponse.setPageInfo(matDeliverQuery.getPageInfo());
diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MatdeliverFollowFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MatdeliverFollowFacade.java
index abef171..4d65f4f 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MatdeliverFollowFacade.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MatdeliverFollowFacade.java
@@ -56,7 +56,7 @@ public class MatdeliverFollowFacade {
     public BaseResponse matdeliverFollowMakeInit(Integer id) {
         Map map = new HashMap();
         //是否结案
-        map.put("isClose", PostpartumFollowMakeEnums.getIsCloseEnum());
+        // map.put("isClose", PostpartumFollowMakeEnums.getIsCloseEnum());
         //上门访视失败理由
         map.put("getReason", PostpartumFollowMakeEnums.getReasonEnum());
         //访视结果
@@ -247,11 +247,6 @@ public class MatdeliverFollowFacade {
         } else {
             maternalDeliverModel.setNextVisitDate(null);
         }
-        if (matDeliverFollowAddRequest.getIsClose() != null) {
-            maternalDeliverModel.setIsClose(matDeliverFollowAddRequest.getIsClose());
-        } else {
-            maternalDeliverModel.setIsClose(0);
-        }
         //修改分娩记录
         matDeliverService.updateOne(maternalDeliverModel, maternalDeliverModel.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 fb0d794..3093bab 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
@@ -1,7 +1,5 @@
 package com.lyms.platform.operate.web.facade;
 
-import com.lyms.platform.biz.service.AntExRecordService;
-import com.lyms.platform.biz.service.AntenatalExaminationService;
 import com.lyms.platform.biz.service.CommonService;
 import com.lyms.platform.biz.service.PatientsService;
 import com.lyms.platform.common.constants.ErrorCodeConstants;
@@ -12,7 +10,6 @@ import com.lyms.platform.common.enums.ServiceTypeEnums;
 import com.lyms.platform.common.result.BaseListResponse;
 import com.lyms.platform.common.result.BaseObjectResponse;
 import com.lyms.platform.common.result.BaseResponse;
-import com.lyms.platform.common.utils.Config;
 import com.lyms.platform.common.utils.DateUtil;
 import com.lyms.platform.common.utils.StringUtils;
 import com.lyms.platform.operate.web.request.BasePageQueryRequest;
@@ -32,7 +29,7 @@ import java.util.*;
 /**
  * @auther yangfei
  * @createTime 2017年09月11日 14时29分
- * @discription 孕妇服务
+ * @discription 孕妇或儿童服务
  */
 @Component
 public class PatientServiceFacade {
@@ -48,22 +45,26 @@ public class PatientServiceFacade {
     @Autowired
     private PatientsService patientsService;
     @Autowired
-    private AntExRecordService recordService;
-    @Autowired
     private CommonService commonService;
     @Autowired
-    private AntenatalExaminationService antenatalExaminationService;
-    @Autowired
     private HospitalDoctServiceService hospitalDoctService;
     @Autowired
     private HospitalServiceContentService hospitalServiceContentService;
-
+    @Autowired
+    private HospitalDoctServiceService hospitalDoctServiceService;
     @Autowired
     private OperateLogFacade operateLogFacade;
     @Autowired
     private BookbuildingFacade bookbuildingFacade;
 
-    public static String patSer_sync_url = Config.getItem("patSer_sync_url", "0");
+    public BaseResponse babyServiceInit(Integer userId) {
+        Map map = new HashMap();
+        //服务类型
+        map.put("serTypes", PatientSerEnums.getBabySerType());
+        //服务状态
+        map.put("serStatus", PatientSerEnums.getSerStatus());
+        return new BaseObjectResponse().setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg(ErrorCodeConstants.SUCCESS_DESCRIPTION).setData(map);
+    }
 
     public BaseResponse patientServiceInit(Integer id) {
         //根据用户id获取医院ID
@@ -247,8 +248,6 @@ public class PatientServiceFacade {
      * @return
      */
     public BaseResponse updatePatientService(PatientService ps, Integer userId) {
-
-
         String hospitalId = autoMatchFacade.getHospitalId(userId);
 
         //根据用户id获取医院ID
@@ -718,11 +717,6 @@ public class PatientServiceFacade {
         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;
     }
 
@@ -734,15 +728,7 @@ public class PatientServiceFacade {
         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;
 }
diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/MatdeliverFollowRequest.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/MatdeliverFollowRequest.java
index c96d19a..749a498 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/MatdeliverFollowRequest.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/MatdeliverFollowRequest.java
@@ -15,6 +15,10 @@ public class MatdeliverFollowRequest extends BasePageQueryRequest{
      */
     private String queryNo;
     /**
+     * 访视阶段 1-访视期内、2-超出访视期
+     */
+    private Integer followStage;
+    /**
      * @discription 是否区域
      */
     private String isArea;
@@ -79,6 +83,14 @@ public class MatdeliverFollowRequest extends BasePageQueryRequest{
      */
     private String need;
 
+    public Integer getFollowStage() {
+        return followStage;
+    }
+
+    public void setFollowStage(Integer followStage) {
+        this.followStage = followStage;
+    }
+
     public Integer getMakeType() {
         return makeType;
     }
diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/MatdeliverFollowListResult.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/MatdeliverFollowListResult.java
index 5f76d70..703acac 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/MatdeliverFollowListResult.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/MatdeliverFollowListResult.java
@@ -91,6 +91,20 @@ public class MatdeliverFollowListResult {
      */
     private Integer isClose;
 
+    /**
+     * 1、访视期内
+     * 2、超出访视期
+     */
+    private Integer followStage;
+
+    public Integer getFollowStage() {
+        return followStage;
+    }
+
+    public void setFollowStage(Integer followStage) {
+        this.followStage = followStage;
+    }
+
     public String getDueDate() {
         return dueDate;
     }
-- 
1.8.3.1