From 84e2eb6fc02b589525f81b9ee43bfa497bbf90c7 Mon Sep 17 00:00:00 2001
From: fwq <582742538@qq.com>
Date: 星期一, 08 七月 2024 10:48:28 +0800
Subject: [PATCH] Merge branch 'master-stander' into master-jiayan

---
 phis-feign/src/main/java/com/hz/phis/vo/returnVisitRecord/ReturnVisitRecordFindVo.java        |   78 +++++++
 phis-feign/src/main/java/com/hz/his/feign/service/platform/SPhipReturnVisitRecordService.java |   73 ++++++
 phis-feign/src/main/java/com/hz/his/vo/project/ProjectFindVo.java                             |   18 +
 phis-feign/src/main/java/com/hz/phis/vo/returnVisitRecord/ReturnVisitRecordInsertVo.java      |   61 +++++
 phis-feign/src/main/java/com/hz/phis/vo/returnVisitRecord/ReturnVisitRecordInfoVo.java        |   17 +
 phis-feign/src/main/java/com/hz/his/feign/service/phis/SAppointmentService.java               |   20 +
 phis-feign/src/main/java/com/hz/his/vo/appointment/AppointmentProjectFindVo.java              |   21 +
 phis-feign/src/main/java/com/hz/phis/vo/returnVisitRecord/ReturnVisitVisitVo.java             |   42 +++
 phis-feign/src/main/java/com/hz/his/dto/consultation/ConsultRecordDto.java                    |   40 +++
 phis-feign/src/main/java/com/hz/his/feign/service/phis/SReturnVisitRecordService.java         |   23 ++
 phis-feign/src/main/java/com/hz/his/feign/service/platform/SPhipConsultationService.java      |    2 
 phis-feign/src/main/java/com/hz/his/feign/service/phis/SProjectService.java                   |    8 
 phis-feign/src/main/java/com/hz/phis/vo/returnVisitRecord/ReturnVisitListItemProjectVo.java   |   30 ++
 phis-feign/src/main/java/com/hz/phis/vo/returnVisitRecord/ReturnVisitListItemVo.java          |   63 +++++
 phis-feign/src/main/java/com/hz/his/dto/consultation/ConsultTreatProjectVo.java               |   18 +
 phis-feign/src/main/java/com/hz/phis/vo/returnVisitRecord/ReturnVisitListVo.java              |  121 +++++++++++
 phis-feign/src/main/java/com/hz/his/dto/consultation/ConsultAppearancePlanVo.java             |   16 +
 phis-feign/src/main/java/com/hz/his/dto/PageDto.java                                          |    3 
 18 files changed, 651 insertions(+), 3 deletions(-)

diff --git a/phis-feign/src/main/java/com/hz/his/dto/PageDto.java b/phis-feign/src/main/java/com/hz/his/dto/PageDto.java
index 6d9e6b9..3907d31 100644
--- a/phis-feign/src/main/java/com/hz/his/dto/PageDto.java
+++ b/phis-feign/src/main/java/com/hz/his/dto/PageDto.java
@@ -23,9 +23,8 @@
     /**鍒嗙被鏍囪瘑*/
     private String typeId;
     private List<String> typeIdList;
-    //appid
+    /**appid*/
     private String appId;
-
 
     public Integer getPageNum() {
         if(this.pageNum == null || this.pageNum < 0){
diff --git a/phis-feign/src/main/java/com/hz/his/dto/consultation/ConsultAppearancePlanVo.java b/phis-feign/src/main/java/com/hz/his/dto/consultation/ConsultAppearancePlanVo.java
new file mode 100644
index 0000000..921f738
--- /dev/null
+++ b/phis-feign/src/main/java/com/hz/his/dto/consultation/ConsultAppearancePlanVo.java
@@ -0,0 +1,16 @@
+package com.hz.his.dto.consultation;
+
+import lombok.Data;
+
+
+/**
+ * 鍜ㄨ璁板綍dto-棰滃�艰鍒�
+ * @author CJH
+ */
+@Data
+public class ConsultAppearancePlanVo {
+
+    /**棰滃�艰鍒掕鎯�*/
+    private String details;
+
+}
\ No newline at end of file
diff --git a/phis-feign/src/main/java/com/hz/his/dto/consultation/ConsultRecordDto.java b/phis-feign/src/main/java/com/hz/his/dto/consultation/ConsultRecordDto.java
index 8bbd680..f5e506b 100644
--- a/phis-feign/src/main/java/com/hz/his/dto/consultation/ConsultRecordDto.java
+++ b/phis-feign/src/main/java/com/hz/his/dto/consultation/ConsultRecordDto.java
@@ -1,6 +1,7 @@
 package com.hz.his.dto.consultation;
 
 import com.fasterxml.jackson.annotation.JsonInclude;
+import lombok.Data;
 
 import java.util.Date;
 import java.util.List;
@@ -11,6 +12,7 @@
  * 鍜ㄨ璁板綍dto 鏂扮増
  */
 @JsonInclude(JsonInclude.Include.NON_NULL)
+@Data
 public class ConsultRecordDto{
 
     //鐢ㄦ埛id
@@ -33,10 +35,20 @@
     private String treatPlanQuote;
     //鍓傞噺鍙傛暟
     private String dosageParams;
+    /**鏄惁鏃犳棦寰�鍙诧細0鍚�1鏄�*/
+    private Integer unanamnesis;
     //鏃㈠線鐥呭彶
     private String anamnesis;
     //鏉ラ櫌鍓嶆不鐤楄繃鐨勯」鐩�
     private String hasTreatProjects;
+
+    /**鏃㈠線娌荤枟鏈烘瀯*/
+    private String anamTreatAgency;
+    /**鏃㈠線娌荤枟鍖荤敓*/
+    private String anamTreatDoctor;
+    /**鏃㈠線娌荤枟鍖荤敓*/
+    private String anamTreatSatisfaction;
+
     //鏄惁鑽夌 0=鍚� 1=鏄�
     private Integer isDraft;
     //鍒涘缓浜虹被鍨� 0=鍛樺伐 1=鍚庡彴
@@ -62,6 +74,28 @@
     //鍜ㄨ鏂瑰紡鍚嶇О
     private String methodCodeName;
 
+    /**鏈垚浜ゅ師鍥�*/
+    private String description;
+    /**鐢ㄦ埛鑱屼笟*/
+    private String userCareer;
+    /**浣滄伅*/
+    private String workRest;
+    /**鎬ф牸*/
+    private String characterInfo;
+    /**鐢ㄦ埛鍠滃ソ*/
+    private String userLike;
+    /**濠氬Щ鐘跺喌*/
+    private Integer maritalStatus = 0;
+    /**澶囧瓡鎯呭喌*/
+    private Integer preparationPregnancy = 0;
+
+    /**杩囨晱鍙�*/
+    private String allergyHistory;
+    /**鐤剧梾鍙�*/
+    private String diseaseHistory;
+    /**鐧藉厜缇庣揣鑲屽鐢熻瘎浼�*/
+    private String estimateMapper;
+
     //------------- 淇敼浼犲��
     private String id;
 
@@ -81,6 +115,10 @@
     private List<Map<String,Object>> recommendProjectList;
     //涓婃娌荤枟椤圭洰
     private List<Map<String,Object>> lastTreatProjectList;
+    /**棰勭害椤圭洰闆嗗悎*/
+    private List<ConsultTreatProjectVo> preProjectList;
+    /**棰滃�艰鍒掗泦鍚�*/
+    private List<ConsultAppearancePlanVo> appearancePlanList;
 
 
     //-------------- 鎼滅储鏉′欢
@@ -150,6 +188,8 @@
     // --------- 澶嶈瘖琛ュ厖鏂板瓧娈�
     //瀹㈡埛鐤戣檻
     private String doubt;
+    /**瀹㈡埛鐗规畩鎯呭喌*/
+    private String specialSituation;
     //寮傝
     private String dissent;
     //棰勭畻
diff --git a/phis-feign/src/main/java/com/hz/his/dto/consultation/ConsultTreatProjectVo.java b/phis-feign/src/main/java/com/hz/his/dto/consultation/ConsultTreatProjectVo.java
new file mode 100644
index 0000000..53c1e1b
--- /dev/null
+++ b/phis-feign/src/main/java/com/hz/his/dto/consultation/ConsultTreatProjectVo.java
@@ -0,0 +1,18 @@
+package com.hz.his.dto.consultation;
+
+import lombok.Data;
+
+
+/**
+ * 鍜ㄨ璁板綍dto-椤圭洰
+ * @author CJH
+ */
+@Data
+public class ConsultTreatProjectVo {
+
+    /**椤圭洰鏍囪瘑*/
+    private String projectId;
+    /**椤圭洰鍚嶇О*/
+    private String projectName;
+
+}
\ No newline at end of file
diff --git a/phis-feign/src/main/java/com/hz/his/feign/service/phis/SAppointmentService.java b/phis-feign/src/main/java/com/hz/his/feign/service/phis/SAppointmentService.java
new file mode 100644
index 0000000..17a2273
--- /dev/null
+++ b/phis-feign/src/main/java/com/hz/his/feign/service/phis/SAppointmentService.java
@@ -0,0 +1,20 @@
+package com.hz.his.feign.service.phis;
+
+import com.hx.resultTool.Result;
+import com.hz.his.vo.appointment.AppointmentProjectFindVo;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+
+/**
+ * @author CJH
+ **/
+@FeignClient(name="phis-provider",path = "/p-his-data",contextId = "read-appointment")
+public interface SAppointmentService {
+
+    /** 鑾峰彇鐢ㄦ埛鏃堕棿鍐呴绾︾殑椤圭洰 */
+    @PostMapping("/appointment/user/project/list")
+    Result userAppointmentProjectList(@RequestBody AppointmentProjectFindVo appointmentProjectFindVo);
+
+
+}
diff --git a/phis-feign/src/main/java/com/hz/his/feign/service/phis/SProjectService.java b/phis-feign/src/main/java/com/hz/his/feign/service/phis/SProjectService.java
index 4e48627..a4b64d1 100644
--- a/phis-feign/src/main/java/com/hz/his/feign/service/phis/SProjectService.java
+++ b/phis-feign/src/main/java/com/hz/his/feign/service/phis/SProjectService.java
@@ -4,6 +4,7 @@
 import com.hz.his.dto.PageDto;
 import com.hz.his.dto.TimeDto;
 import com.hz.his.dto.project.ProjectDto;
+import com.hz.his.vo.project.ProjectFindVo;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
@@ -48,6 +49,13 @@
      * @return Result
      */
     @PostMapping(value = "/project/page/list")
+    Result getProjectList(@RequestBody ProjectFindVo projectFindVo);
+
+    /**
+     * 鑾峰彇椤圭洰鍒楄〃锛堝洜涓轰唬鐮佺殑闂锛岃繖涓帴鍙ｄ繚瀛樹笅鏉ワ級
+     * @return Result
+     */
+    @PostMapping(value = "/project/page/list2")
     Result getProjectList(@RequestBody PageDto pageDto);
 
     /**
diff --git a/phis-feign/src/main/java/com/hz/his/feign/service/phis/SReturnVisitRecordService.java b/phis-feign/src/main/java/com/hz/his/feign/service/phis/SReturnVisitRecordService.java
new file mode 100644
index 0000000..6fc0ba4
--- /dev/null
+++ b/phis-feign/src/main/java/com/hz/his/feign/service/phis/SReturnVisitRecordService.java
@@ -0,0 +1,23 @@
+package com.hz.his.feign.service.phis;
+
+import com.hx.resultTool.Result;
+import com.hz.phis.vo.returnVisitRecord.ReturnVisitRecordFindVo;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+
+/**
+ * 杩欓噷杩欎釜name 闇�瑕佸～鍐� 璇锋眰鐨勬湇鍔℃彁渚涜�呯殑娉ㄥ唽鍒皀acos Server涓婇潰鐨勬湇鍔″悕锛宲ath 鏄姹傛帴鍙ｅ墠缂�
+ */
+@FeignClient(name="phis-provider",path = "/p-his-data",contextId = "user-return-visit-record")
+public interface SReturnVisitRecordService {
+
+
+    /*** 鑾峰彇鐢ㄦ埛鍥炶璁板綍鍒楄〃 **/
+    @PostMapping(value = "/return/visit/record/list")
+    Result returnVisitList(@RequestBody ReturnVisitRecordFindVo findData);
+
+    /*** 鑾峰彇鐢ㄦ埛鍥炶璁板綍璇︽儏 **/
+    @PostMapping(value = "/return/visit/record/detail")
+    Result returnVisitDetail(@RequestBody ReturnVisitRecordFindVo findData);
+}
\ No newline at end of file
diff --git a/phis-feign/src/main/java/com/hz/his/feign/service/platform/SPhipConsultationService.java b/phis-feign/src/main/java/com/hz/his/feign/service/platform/SPhipConsultationService.java
index aca26f9..15a6b67 100644
--- a/phis-feign/src/main/java/com/hz/his/feign/service/platform/SPhipConsultationService.java
+++ b/phis-feign/src/main/java/com/hz/his/feign/service/platform/SPhipConsultationService.java
@@ -15,7 +15,7 @@
     /**
      * 寮�鏀惧钩鍙�-鍜ㄨ璁板綍鏂板/淇敼
      */
-    @PostMapping(value = "/consultation/record/add/or/edit")
+    @PostMapping(value = "/consultation/record/addOrUpdate")
     Result addOrEditConsult(@RequestBody ConsultRecordDto consultRecordNewDto);
 
 
diff --git a/phis-feign/src/main/java/com/hz/his/feign/service/platform/SPhipReturnVisitRecordService.java b/phis-feign/src/main/java/com/hz/his/feign/service/platform/SPhipReturnVisitRecordService.java
new file mode 100644
index 0000000..fc9ab0d
--- /dev/null
+++ b/phis-feign/src/main/java/com/hz/his/feign/service/platform/SPhipReturnVisitRecordService.java
@@ -0,0 +1,73 @@
+package com.hz.his.feign.service.platform;
+
+import com.hx.resultTool.Result;
+import com.hz.phis.vo.returnVisitRecord.ReturnVisitRecordInsertVo;
+import com.hz.phis.vo.returnVisitRecord.ReturnVisitVisitVo;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+
+/**
+ * 杩欓噷杩欎釜name 闇�瑕佸～鍐� 璇锋眰鐨勬湇鍔℃彁渚涜�呯殑娉ㄥ唽鍒皀acos Server涓婇潰鐨勬湇鍔″悕锛宲ath 鏄姹傛帴鍙ｅ墠缂�
+ */
+@FeignClient(name="phi-platform-service",path = "/phip",contextId = "phip-return-visit-record")
+public interface SPhipReturnVisitRecordService {
+
+    /**
+     * 寮�鏀惧钩鍙�-鍥炶璁板綍鏂板
+     */
+    @PostMapping(value = "/return/visit/record/v2/add")
+    Result add(@RequestBody ReturnVisitRecordInsertVo dto);
+
+    /**
+     * 寮�鏀惧钩鍙�-鍥炶璁板綍淇敼
+     */
+    @PostMapping(value = "/return/visit/record/v2/update")
+    Result update(@RequestBody ReturnVisitRecordInsertVo dto);
+
+
+    /**
+     * 寮�鏀惧钩鍙�-鎵归噺淇敼鍥炶浜�
+     */
+    @PostMapping(value = "/return/visit/record/v2/batch/update/corp/user")
+    Result batchUpdateCorpUser(@RequestBody ReturnVisitRecordInsertVo dto);
+
+
+    /**
+     * 寮�鏀惧钩鍙�-鎵归噺淇敼璁″垝鏃堕棿
+     */
+    @PostMapping(value = "/return/visit/record/v2/batch/update/plan/time")
+    Result batchUpdatePlanTime(@RequestBody ReturnVisitRecordInsertVo dto);
+
+    /**
+     * 寮�鏀惧钩鍙�-鍙栨秷
+     */
+    @PostMapping(value = "/return/visit/record/v2/cancel")
+    Result cancelData(@RequestBody ReturnVisitRecordInsertVo dto);
+
+
+    /**
+     * 寮�鏀惧钩鍙�-鎵归噺鍙栨秷
+     */
+    @PostMapping(value = "/return/visit/record/v2/batch/cancel")
+    Result batchCancelData(@RequestBody ReturnVisitRecordInsertVo dto);
+
+    /**
+     * 寮�鏀惧钩鍙�-鍒犻櫎
+     */
+    @PostMapping(value = "/return/visit/record/v2/delete")
+    Result delete(@RequestBody ReturnVisitRecordInsertVo dto);
+
+    /**
+     * 寮�鏀惧钩鍙�-鎵归噺鍒犻櫎
+     */
+    @PostMapping(value = "/return/visit/record/v2/batch/delete")
+    Result batchDeleteRecord(@RequestBody ReturnVisitRecordInsertVo dto);
+
+    /**
+     * 寮�鏀惧钩鍙�-鍥炶
+     */
+    @PostMapping(value = "/return/visit/record/v2/access")
+    Result access(@RequestBody ReturnVisitVisitVo dto);
+
+}
\ No newline at end of file
diff --git a/phis-feign/src/main/java/com/hz/his/vo/appointment/AppointmentProjectFindVo.java b/phis-feign/src/main/java/com/hz/his/vo/appointment/AppointmentProjectFindVo.java
new file mode 100644
index 0000000..e27804a
--- /dev/null
+++ b/phis-feign/src/main/java/com/hz/his/vo/appointment/AppointmentProjectFindVo.java
@@ -0,0 +1,21 @@
+package com.hz.his.vo.appointment;
+
+import com.hz.his.dto.PageDto;
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+ * @author CJH
+ */
+@Data
+public class AppointmentProjectFindVo extends PageDto {
+
+    /**鐢ㄦ埛鏍囪瘑*/
+    private String userId;
+    /**棰勭害鏃堕棿-寮�濮�*/
+    private Date preStartTime;
+    /**棰勭害鏃堕棿-缁撴潫*/
+    private Date preEndTime;
+
+}
diff --git a/phis-feign/src/main/java/com/hz/his/vo/project/ProjectFindVo.java b/phis-feign/src/main/java/com/hz/his/vo/project/ProjectFindVo.java
new file mode 100644
index 0000000..fcfc7ae
--- /dev/null
+++ b/phis-feign/src/main/java/com/hz/his/vo/project/ProjectFindVo.java
@@ -0,0 +1,18 @@
+package com.hz.his.vo.project;
+
+import com.hz.his.dto.PageDto;
+import lombok.Data;
+
+/**
+ * @author CJH
+ */
+@Data
+public class ProjectFindVo extends PageDto {
+
+    /**绫诲瀷*/
+    private Integer type;
+    /**鏄惁涓婁笅鏋�-榛樿涓婃灦*/
+    private Integer isUp = 1;
+
+
+}
diff --git a/phis-feign/src/main/java/com/hz/phis/vo/returnVisitRecord/ReturnVisitListItemProjectVo.java b/phis-feign/src/main/java/com/hz/phis/vo/returnVisitRecord/ReturnVisitListItemProjectVo.java
new file mode 100644
index 0000000..0a69967
--- /dev/null
+++ b/phis-feign/src/main/java/com/hz/phis/vo/returnVisitRecord/ReturnVisitListItemProjectVo.java
@@ -0,0 +1,30 @@
+package com.hz.phis.vo.returnVisitRecord;
+
+import lombok.Data;
+
+
+/**鍥炶鍒楄〃瀛愰」鏁版嵁
+ * @author CJH
+ */
+@Data
+public class ReturnVisitListItemProjectVo {
+
+    /*** 鏍囪瘑 */
+    private String id;
+    /*** 椤圭洰鏍囪瘑 */
+    private String projectId;
+    /*** 椤圭洰鏍囪瘑 */
+    private String projectName;
+
+
+    public ReturnVisitListItemProjectVo() {
+
+    }
+
+    public ReturnVisitListItemProjectVo(String id, String projectId, String projectName) {
+        this.id = id;
+        this.projectId = projectId;
+        this.projectName = projectName;
+    }
+}
+
diff --git a/phis-feign/src/main/java/com/hz/phis/vo/returnVisitRecord/ReturnVisitListItemVo.java b/phis-feign/src/main/java/com/hz/phis/vo/returnVisitRecord/ReturnVisitListItemVo.java
new file mode 100644
index 0000000..b9838b2
--- /dev/null
+++ b/phis-feign/src/main/java/com/hz/phis/vo/returnVisitRecord/ReturnVisitListItemVo.java
@@ -0,0 +1,63 @@
+package com.hz.phis.vo.returnVisitRecord;
+
+import com.hx.util.MapUtil;
+import lombok.Data;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+
+
+/**鍥炶鍒楄〃瀛愰」鏁版嵁
+ * @author CJH
+ */
+@Data
+public class ReturnVisitListItemVo {
+
+    /*** 瓒呮椂鐘舵�� 0鏈秴鏃� 1宸茶秴鏃�**/
+    private Integer timeoutStatus;
+    /*** 鍥炶鐘舵�� 0鏈洖璁� 1宸插洖璁�**/
+    private Integer returnVisitStatus;
+
+    /*** 闂ㄥ簵ID */
+    private String shopId;
+    /*** 闂ㄥ簵鍚嶇О */
+    private String shopName;
+
+    /*** 鍥炶绫诲瀷 瀛楀吀id */
+    private String returnVisitType;
+    /*** 鍥炶绫诲瀷鍚嶇О*/
+    private String returnVisitTypeName;
+
+    /**鍥炶鏂瑰紡 瀛楀吀id*/
+    private String returnVisitMethod;
+    /**鍥炶鏂瑰紡鍚嶇О*/
+    private String returnVisitMethodName;
+
+    /*** 鍥炶缁撴灉 0 鏈煡 1鍥炶鎴愬姛 2鍥炶澶辫触**/
+    private Integer visitResultStatus;
+    /*** 鍥炶鏄惁婊℃剰 0 鏈煡 1婊℃剰 2涓嶆弧鎰�**/
+    private Integer satisfiedStatus;
+
+    /*** 鍥炶浜哄悕绉�**/
+    private String corpName;
+    /*** 鍥炶浜篿d**/
+    private String corpId;
+
+    /*** 鍥炶璇︽儏**/
+    private String content;
+    /*** 鍥炶澶囨敞**/
+    private String remark;
+    /*** 鍥炶璁板綍鏍囪瘑 **/
+    private String id;
+
+    /**鍒涘缓浜�*/
+    private String createPersonName;
+
+    private List<ReturnVisitListItemProjectVo> projectList = new ArrayList<>();
+
+    public ReturnVisitListItemVo() {
+    }
+
+}
+
diff --git a/phis-feign/src/main/java/com/hz/phis/vo/returnVisitRecord/ReturnVisitListVo.java b/phis-feign/src/main/java/com/hz/phis/vo/returnVisitRecord/ReturnVisitListVo.java
new file mode 100644
index 0000000..6d22feb
--- /dev/null
+++ b/phis-feign/src/main/java/com/hz/phis/vo/returnVisitRecord/ReturnVisitListVo.java
@@ -0,0 +1,121 @@
+package com.hz.phis.vo.returnVisitRecord;
+
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.hx.util.DateUtil;
+import com.hx.util.MapUtil;
+import lombok.Data;
+
+import java.util.*;
+
+/**
+ * 鍥炶鍒楄〃杩斿洖dto
+ * @author CJH
+ */
+@Data
+public class ReturnVisitListVo {
+
+    /**鐢ㄦ埛id*/
+    private String userId;
+    /**鐢ㄦ埛鍚嶇О*/
+    private String userName;
+    /**鍛樺伐鏍囪瘑*/
+    private String corpId;
+    /**鍛樺伐鍚嶇О*/
+    private String corpName;
+
+    /**璁″垝鏃ユ湡*/
+    private Date planTime;
+    /**鍥炶鏃堕棿*/
+    private Date returnVisitTime;
+    /**瀹屾垚鏃堕棿*/
+    private Date doneTime;
+
+    /**鐢ㄦ埛鐢熸棩*/
+    private String birthDay;
+    /**CIQ*/
+    private String CIQ;
+    /**浼氬憳鍙�*/
+    private String memberNO;
+    /**鎵嬫満鍙�*/
+    private String tel;
+    /**鐢ㄦ埛澶栭儴鑱旂郴浜虹紪鍙�*/
+    private String externalUserId;
+
+    /**娓犻亾鏉ユ簮*/
+    private String channelType;
+    /**娓犻亾鏉ユ簮*/
+    private String channelType2;
+    /**椤鹃棶鍚嶇О*/
+    private String cnName;
+
+    // --- 鍙栧�肩涓�涓� todo
+    /**鍥炶鐘舵�� 0鏈洖璁� 1宸插洖璁�*/
+    private Integer returnVisitStatus;
+    /**瀹屾垚鐘舵�� 0鏈畬鎴� 1宸插畬鎴� 2宸插彇娑�*/
+    private Integer doneStatus;
+    /**瓒呮椂鐘舵�� 0鏈秴鏃� 1宸茶秴鏃�*/
+    private Integer timeoutStatus;
+    /**鍥炶缁撴灉 0 鏈煡 1鍥炶鎴愬姛 2鍥炶澶辫触*/
+    private Integer visitResultStatus;
+    /**鍥炶鏄惁婊℃剰 0 鏈煡 1婊℃剰 2涓嶆弧鎰�*/
+    private Integer satisfiedStatus;
+
+    //--- 鍙栧�肩涓�涓� todo
+
+    /**鍥炶鎯呭喌锛堝憳宸ュ洖璁挎椂鍊欏～鍐欙級*/
+    private String situation;
+    /**鍥炶澶囨敞锛堝憳宸ュ洖璁挎椂鍊欏～鍐欙級*/
+    private String visitRemark;
+
+    /*** 鍥炶鍒楄〃瀛愭暟鎹�**/
+    private List<ReturnVisitListItemVo> itemList = new ArrayList<>();
+
+
+    //---鏌ヨ棰濆杩斿洖鐨勫弬鏁�
+    /**id*/
+    private String id;
+    /**鐢ㄦ埛鎵�灞為棬搴楁爣璇� 杩斿洖*/
+    private String shopId ;
+    /**鐢ㄦ埛鎵�灞為棬搴楀悕绉�*/
+    private String shopName ;
+    /**鍥炶绫诲瀷 瀛楀吀id"*/
+    private String returnVisitType;
+    /**鍥炶绫诲瀷鍚嶇О*/
+    private String returnVisitTypeName;
+
+    /**鍥炶鏂瑰紡 瀛楀吀id*/
+    private String returnVisitMethod ;
+    /**鍥炶鏂瑰紡鍚嶇О*/
+    private String returnVisitMethodName;
+    /**鍒涘缓浜�*/
+    private String createPersonName;
+
+
+    public ReturnVisitListVo() {
+    }
+
+    public ReturnVisitListVo(Map<String,Object> recordMap) {
+        this.userId = MapUtil.getString(recordMap,"userId");
+        this.userName = MapUtil.getString(recordMap,"userName");
+        this.corpId = MapUtil.getString(recordMap,"corpId");
+        this.corpName = MapUtil.getString(recordMap,"corpName");
+        this.planTime = DateUtil.parseString_2(recordMap.get("planTime").toString());
+        this.returnVisitTime = DateUtil.parseString_1(MapUtil.getString(recordMap,"returnVisitTime"));
+        this.doneTime = DateUtil.parseString_1(MapUtil.getString(recordMap,"doneTime"));
+        this.birthDay = MapUtil.getString(recordMap,"birthDay");
+        this.CIQ = MapUtil.getString(recordMap,"CIQ");
+        this.memberNO = MapUtil.getString(recordMap,"memberNO");
+        this.tel = MapUtil.getString(recordMap,"tel");
+        this.channelType = MapUtil.getString(recordMap,"channelType");
+        this.channelType2 = MapUtil.getString(recordMap,"channelType2");
+        this.cnName = MapUtil.getString(recordMap,"cnName");
+        this.returnVisitStatus = MapUtil.getInt(recordMap,"returnVisitStatus");
+        this.doneStatus = MapUtil.getInt(recordMap,"doneStatus");
+        this.timeoutStatus = MapUtil.getInt(recordMap,"timeoutStatus");
+        this.visitResultStatus = MapUtil.getInt(recordMap,"visitResultStatus");
+        this.satisfiedStatus = MapUtil.getInt(recordMap,"satisfiedStatus");
+        this.situation = MapUtil.getString(recordMap,"situation");
+        this.visitRemark = MapUtil.getString(recordMap,"visitRemark");
+    }
+
+}
diff --git a/phis-feign/src/main/java/com/hz/phis/vo/returnVisitRecord/ReturnVisitRecordFindVo.java b/phis-feign/src/main/java/com/hz/phis/vo/returnVisitRecord/ReturnVisitRecordFindVo.java
new file mode 100644
index 0000000..5d8a95c
--- /dev/null
+++ b/phis-feign/src/main/java/com/hz/phis/vo/returnVisitRecord/ReturnVisitRecordFindVo.java
@@ -0,0 +1,78 @@
+package com.hz.phis.vo.returnVisitRecord;
+
+import com.hz.his.dto.PageDto;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.util.Date;
+import java.util.List;
+
+/**鍥炶鏌ヨ鏉′欢瀵硅薄
+ * @author CJH*/
+@EqualsAndHashCode(callSuper = true)
+@Data
+public class ReturnVisitRecordFindVo extends PageDto {
+
+    /*** 鎵�灞炵敤鎴�**/
+    private String userId;
+    /*** 璁″垝鏃堕棿-寮�濮�**/
+    private Date planStartTime;
+    /*** 璁″垝鏃堕棿-缁撴潫**/
+    private Date planEndTime;
+    /*** 鍥炶鐘舵��**/
+    private Integer returnVisitStatus;
+    /*** 瀹屾垚鐘舵��**/
+    private Integer doneStatus;
+    /*** 瓒呮椂鐘舵��**/
+    private Integer timeoutStatus;
+
+    /*** 鍒涘缓鏃堕棿-寮�濮�**/
+    private Date startTime;
+    /*** 鍒涘缓鏃堕棿-缁撴潫**/
+    private Date endTime;
+
+    /*** 鍥炶鏃堕棿-寮�濮�**/
+    private Date returnVisitStartTime;
+    /*** 鍥炶鏃堕棿-缁撴潫**/
+    private Date returnVisitEndTime;
+
+    /*** 瀹屾垚鏃堕棿-寮�濮�**/
+    private Date doneStartTime;
+    /*** 瀹屾垚鏃堕棿-缁撴潫**/
+    private Date doneEndTime;
+
+    /*** 鍥炶绫诲瀷 **/
+    private String returnVisitType;
+    /*** 鍥炶鏂瑰紡 **/
+    private String returnVisitMethod;
+    /*** 鍥炶缁撴灉**/
+    private Integer visitResultStatus;
+    /*** 鍥炶鏄惁婊℃剰**/
+    private Integer satisfiedStatus;
+
+    /**鎵�灞為棬搴�*/
+    private List<String> shopIdList;
+    /***鍥炶鍛樺伐 - List**/
+    private List<String> employeeIdList;
+
+    /*** 鍒涘缓浜�**/
+    private String createPersonName;
+    /*** 鍒涘缓浜篿d**/
+    private String createPersonId;
+    /*** 鏉ユ簮娓犻亾鏌ヨ**/
+    private String channelType;
+
+    //---棰濆鐨勫弬鏁�
+    /*** 璁″垝鏃堕棿**/
+    private Date planTime;
+    /*** 鍥炶鍛樺伐鏍囪瘑 **/
+    private String corpId;
+
+    //---鑷畾涔夊垎椤碉紝璧拌繖涓病鏈夊垎椤垫ā寮�
+    /**椤垫暟*/
+    private Integer customPageNum;
+    /**鏉℃暟*/
+    private Integer customPageSize;
+
+
+}
\ No newline at end of file
diff --git a/phis-feign/src/main/java/com/hz/phis/vo/returnVisitRecord/ReturnVisitRecordInfoVo.java b/phis-feign/src/main/java/com/hz/phis/vo/returnVisitRecord/ReturnVisitRecordInfoVo.java
new file mode 100644
index 0000000..c96bc12
--- /dev/null
+++ b/phis-feign/src/main/java/com/hz/phis/vo/returnVisitRecord/ReturnVisitRecordInfoVo.java
@@ -0,0 +1,17 @@
+package com.hz.phis.vo.returnVisitRecord;
+
+import lombok.Data;
+
+
+@Data
+public class ReturnVisitRecordInfoVo {
+
+    /*** 鍥炶璁板綍鏍囪瘑 **/
+    private String id;
+    /*** 鍥炶璇︽儏锛堝垱寤哄洖璁垮～鍐欙級**/
+    private String content;
+
+
+
+
+}
\ No newline at end of file
diff --git a/phis-feign/src/main/java/com/hz/phis/vo/returnVisitRecord/ReturnVisitRecordInsertVo.java b/phis-feign/src/main/java/com/hz/phis/vo/returnVisitRecord/ReturnVisitRecordInsertVo.java
new file mode 100644
index 0000000..dd0489a
--- /dev/null
+++ b/phis-feign/src/main/java/com/hz/phis/vo/returnVisitRecord/ReturnVisitRecordInsertVo.java
@@ -0,0 +1,61 @@
+package com.hz.phis.vo.returnVisitRecord;
+
+import lombok.Data;
+
+import java.util.Date;
+import java.util.List;
+import java.util.Set;
+
+/**鍥炶璁板綍鏂板鎴栬�呮洿鏂颁娇鐢╒O
+ * @author CJH*/
+@Data
+public class ReturnVisitRecordInsertVo {
+
+    /*******************涓嬮潰鏄柊澧�/淇敼浣跨敤鍙傛暟**************************/
+
+    /*** 鍥炶璁板綍鏍囪瘑 **/
+    private String id;
+    /*** 鎵�灞炵敤鎴�**/
+    private String userId;
+    /*** 璁″垝鏃堕棿**/
+    private Date planTime;
+    /*** 鍥炶绫诲瀷 **/
+    private String returnVisitType;
+    /*** 鍥炶鏂瑰紡 **/
+    private String returnVisitMethod;
+    /*** 鍥炶缁撴灉**/
+    private Integer visitResultStatus;
+    /*** 闂ㄥ簵**/
+    private String shopId;
+    /*** 鍛樺伐id **/
+    private String corpId;
+
+    /*** 鏂板 閫夋嫨椤圭洰鏁版嵁 **/
+    private String projectIds;
+    /*** 鏂板 閫夋嫨娲诲姩鏁版嵁**/
+    private String activityIds;
+
+    /*** 鍥炶璇︽儏锛堝垱寤哄洖璁垮～鍐欙級**/
+    private String content;
+    /*** 鍥炶澶囨敞锛堝垱寤哄洖璁垮～鍐欙級**/
+    private String remark;
+
+    /*** 鍒涘缓浜虹被鍨� 0 绗笁鏂瑰钩鍙�(鍛樺伐淇℃伅) 锛�2 绯荤粺鍒涘缓**/
+    private Integer createPersonType = 1;
+    /*** 鍒涘缓浜篿d**/
+    private String createPersonId;
+
+    /*** 鎿嶄綔浜篿d**/
+    private String operationId;
+
+    /*** 鐗规畩瀛楁 淇敼浼犲�� 鍥炶鍐呭 澶氫釜**/
+    private List<ReturnVisitRecordInfoVo>  itemList;
+    /** 鍒犻櫎鐨勫洖璁�*/
+    private Set<String> deleteIdList;
+
+    /*********************************************/
+
+    /*** 鎵归噺鎿嶄綔ID**/
+    private Set<String> ids;
+
+}
\ No newline at end of file
diff --git a/phis-feign/src/main/java/com/hz/phis/vo/returnVisitRecord/ReturnVisitVisitVo.java b/phis-feign/src/main/java/com/hz/phis/vo/returnVisitRecord/ReturnVisitVisitVo.java
new file mode 100644
index 0000000..0aaa123
--- /dev/null
+++ b/phis-feign/src/main/java/com/hz/phis/vo/returnVisitRecord/ReturnVisitVisitVo.java
@@ -0,0 +1,42 @@
+package com.hz.phis.vo.returnVisitRecord;
+
+import lombok.Data;
+
+import java.util.Date;
+import java.util.List;
+import java.util.Set;
+
+/**鍛樺伐鍥炶浣跨敤VO
+ * @author CJH*/
+@Data
+public class ReturnVisitVisitVo {
+
+    /**鍥炶浜�*/
+    private String corpId;
+    /*** 鍥炶鏃ユ湡**/
+    private Date returnVisitTime;
+    /*** 鍥炶缁撴灉**/
+    private Integer visitResultStatus;
+    /*** 鍥炶鏄惁婊℃剰**/
+    private Integer satisfiedStatus;
+    /*** 鍥炶鏂瑰紡 **/
+    private String returnVisitMethod;
+    /*** 鍥炶璇︽儏锛堝憳宸ュ洖璁垮～鍐欙級**/
+    private String content;
+    /*** 鍥炶澶囨敞锛堝憳宸ュ垱寤哄洖璁垮～鍐欙級**/
+    private String remark;
+
+    /*** 鍥炶鎯呭喌锛堝憳宸ュ洖璁挎椂鍊欏～鍐欙級**/
+    private String situation;
+    /*** 鍥炶澶囨敞锛堝憳宸ュ洖璁挎椂鍊欏～鍐�**/
+    private String visitRemark;
+
+    /*** 鎿嶄綔浜篿d**/
+    private String operationId;
+
+    /*** 鎵归噺鎿嶄綔ID**/
+    private Set<String> ids;
+
+
+
+}
\ No newline at end of file

--
Gitblit v1.8.0