From a9f912fd205035a4d0a953aa0ae9fe17fdf53bc5 Mon Sep 17 00:00:00 2001
From: fwq <582742538@qq.com>
Date: 星期二, 19 九月 2023 11:25:52 +0800
Subject: [PATCH] Merge branch 'master-prod-new' into master-fwq-phis下载中心

---
 phis-feign/src/main/java/com/hz/his/feign/service/platform/SPhipConsultationService.java |   53 ++++
 phis-feign/src/main/java/com/hz/his/dto/consultation/ConsultRecordDto.java               |  576 ++++++++++++++++++++++++++++++++++++++++++++++++++++
 phis-feign/src/main/java/com/hz/his/feign/service/platform/SPhipDeductionService.java    |    6 
 3 files changed, 635 insertions(+), 0 deletions(-)

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
new file mode 100644
index 0000000..c1df09a
--- /dev/null
+++ b/phis-feign/src/main/java/com/hz/his/dto/consultation/ConsultRecordDto.java
@@ -0,0 +1,576 @@
+package com.hz.his.dto.consultation;
+
+import com.fasterxml.jackson.annotation.JsonInclude;
+
+import java.util.Date;
+import java.util.List;
+import java.util.Map;
+
+
+/**
+ * 鍜ㄨ璁板綍dto 鏂扮増
+ */
+@JsonInclude(JsonInclude.Include.NON_NULL)
+public class ConsultRecordDto{
+
+    //鐢ㄦ埛id
+    private String userId;
+    //闂ㄥ簵/璇婃墍ID
+    private String shopId;
+    //鍜ㄨ绫诲瀷 0=鏍囧噯锛堟棫鐗堬級 1=鍒濊瘖 2=澶嶈瘖
+    private Integer consultType;
+    //婊℃剰搴� 0=涓嶆弧鎰� 1=涓�鑸� 2=婊℃剰
+    private Integer satisfie;
+    //闈㈣瘖鍖荤敓id
+    private String faceDoctorId;
+    //娌荤枟鍖荤敓id
+    private String treatDoctorId;
+    //鍩烘湰淇℃伅
+    private String content;
+    //涓昏璇夋眰
+    private String appealDetail;
+    //娌荤枟鏂规&鎶ヤ环
+    private String treatPlanQuote;
+    //鍓傞噺鍙傛暟
+    private String dosageParams;
+    //鏃㈠線鐥呭彶
+    private String anamnesis;
+    //鏉ラ櫌鍓嶆不鐤楄繃鐨勯」鐩�
+    private String hasTreatProjects;
+    //鏄惁鑽夌 0=鍚� 1=鏄�
+    private Integer isDraft;
+    //鍒涘缓浜虹被鍨� 0=鍛樺伐 1=鍚庡彴
+    private Integer adminType;
+    //鍒涘缓浜篿d
+    private String adminId;
+    //鍒涘缓浜哄悕绉�
+    private String adminName;
+    //闈㈣瘖鏂规
+    private String facePlan;
+    //鍒涘缓鏃堕棿
+    private Date createTime;
+    //鏈娌荤枟椤圭洰 澶氫釜閫楀彿鍒嗗壊
+    private String treatProjectIds;
+    //鎺ㄨ崘椤圭洰 澶氫釜閫楀彿鍒嗗壊
+    private String recommendProjectIds;
+    //涓婃娌荤枟鍖荤敓ID
+    private String lastTreatDoctorId;
+    //涓婃娌荤枟椤圭洰json瀛楃涓� ["椤圭洰ID","椤圭洰ID"]
+    private String lastTreatProjects;
+    //鍜ㄨ鏂瑰紡浠ｇ爜
+    private String methodCode;
+    //鍜ㄨ鏂瑰紡鍚嶇О
+    private String methodCodeName;
+
+    //------------- 淇敼浼犲��
+    private String id;
+
+
+    //------------- 璇︽儏杩斿洖
+    //娌荤枟鍖荤敓鍚嶇О
+    private String faceDoctorName;
+    //娌荤枟鍖荤敓鍚嶇О
+    private String treatDoctorName;
+    //涓婃娌荤枟鍖荤敓鍚嶇О
+    private String lastTreatDoctorName;
+
+    //------------ 璇︽儏杩斿洖鍊艰ˉ鍏�
+    //娌荤枟椤圭洰
+    private List<Map<String,Object>> treatProjectList;
+    //鎺ㄨ崘椤圭洰
+    private List<Map<String,Object>> recommendProjectList;
+    //涓婃娌荤枟椤圭洰
+    private List<Map<String,Object>> lastTreatProjectList;
+
+
+    //-------------- 鎼滅储鏉′欢
+    //灏忕▼搴忔悳绱㈡椂 鏈変釜椤甸潰鏄渶瑕佷紶鏃堕棿鐨�
+    @JsonInclude(JsonInclude.Include.NON_NULL)
+    private String startTime;
+    @JsonInclude(JsonInclude.Include.NON_NULL)
+    private String endTime;
+
+    //鎼滅储鏉′欢
+    //鐢ㄦ埛鍚嶆煡鎵�
+    @JsonInclude(JsonInclude.Include.NON_NULL)
+    private String userName;
+    //瀹㈡埛鏉ユ簮娓犻亾鍒嗙被
+    @JsonInclude(JsonInclude.Include.NON_NULL)
+    private String channelsTypeId;
+    //瀹㈡埛鏉ユ簮涓�绾ф笭閬�
+    @JsonInclude(JsonInclude.Include.NON_NULL)
+    private String channelId;
+    //瀹㈡埛鏉ユ簮浜岀骇娓犻亾
+    @JsonInclude(JsonInclude.Include.NON_NULL)
+    private String channel2Id;
+    //鍜ㄨ甯�
+    @JsonInclude(JsonInclude.Include.NON_NULL)
+    private String hisCorpUserId;
+    //鐢ㄦ埛椤鹃棶鍚嶇О
+    private String hisCorpUserName;
+    //鎵嬫満鍙�
+    private String tel;
+    //鐢电綉鍜ㄨ甯�
+    @JsonInclude(JsonInclude.Include.NON_NULL)
+    private String internetCorpUserId;
+    //瀹㈡湇
+    @JsonInclude(JsonInclude.Include.NON_NULL)
+    private String chatCorpUserId;
+    //鍒涘缓浜�
+    @JsonInclude(JsonInclude.Include.NON_NULL)
+    private String createEmployeeId;
+    //鍒涘缓浜洪儴闂�
+    @JsonInclude(JsonInclude.Include.NON_NULL)
+    private String createEmployeePartId;
+    //鍏虫敞娲诲姩
+    @JsonInclude(JsonInclude.Include.NON_NULL)
+    private String focusActivityId;
+    //鍒拌绫诲瀷
+    @JsonInclude(JsonInclude.Include.NON_NULL)
+    private String recentVisitType;
+    //鍒拌鐘舵��
+    @JsonInclude(JsonInclude.Include.NON_NULL)
+    private Integer recentVisitStatus;
+    //鏄惁鎴愪氦
+    @JsonInclude(JsonInclude.Include.NON_NULL)
+    private Integer isMakeADeal;
+
+    //鍒楄〃鎺ュ彛 灏忕▼搴忎篃浣跨敤 鍖哄垎鏄惁鏄粠鐢ㄦ埛璇︽儏杩涘幓鐨�
+    private Integer isDetail;
+
+    /**褰撳墠椤垫暟*/
+    private Integer pageNum = 1;
+    /**褰撳墠椤垫樉绀烘潯鏁�*/
+    private Integer pageSize = 20;
+    /**鍏抽敭瀛�*/
+    private String keyWord;
+    /**鏌ヨ鏂瑰紡*/
+    private String useType;
+    public ConsultRecordDto() {
+    }
+
+    public String getUserId() {
+        return userId;
+    }
+
+    public void setUserId(String userId) {
+        this.userId = userId;
+    }
+
+    public String getShopId() {
+        return shopId;
+    }
+
+    public void setShopId(String shopId) {
+        this.shopId = shopId;
+    }
+
+    public Integer getConsultType() {
+        return consultType;
+    }
+
+    public void setConsultType(Integer consultType) {
+        this.consultType = consultType;
+    }
+
+    public String getContent() {
+        return content;
+    }
+
+    public void setContent(String content) {
+        this.content = content;
+    }
+
+    public String getFaceDoctorId() {
+        return faceDoctorId;
+    }
+
+    public void setFaceDoctorId(String faceDoctorId) {
+        this.faceDoctorId = faceDoctorId;
+    }
+
+    public String getTreatDoctorId() {
+        return treatDoctorId;
+    }
+
+    public void setTreatDoctorId(String treatDoctorId) {
+        this.treatDoctorId = treatDoctorId;
+    }
+
+    public String getAppealDetail() {
+        return appealDetail;
+    }
+
+    public void setAppealDetail(String appealDetail) {
+        this.appealDetail = appealDetail;
+    }
+
+    public String getTreatPlanQuote() {
+        return treatPlanQuote;
+    }
+
+    public void setTreatPlanQuote(String treatPlanQuote) {
+        this.treatPlanQuote = treatPlanQuote;
+    }
+
+    public String getDosageParams() {
+        return dosageParams;
+    }
+
+    public void setDosageParams(String dosageParams) {
+        this.dosageParams = dosageParams;
+    }
+
+    public String getAnamnesis() {
+        return anamnesis;
+    }
+
+    public void setAnamnesis(String anamnesis) {
+        this.anamnesis = anamnesis;
+    }
+
+    public String getHasTreatProjects() {
+        return hasTreatProjects;
+    }
+
+    public void setHasTreatProjects(String hasTreatProjects) {
+        this.hasTreatProjects = hasTreatProjects;
+    }
+
+    public Integer getIsDraft() {
+        return isDraft;
+    }
+
+    public void setIsDraft(Integer isDraft) {
+        this.isDraft = isDraft;
+    }
+
+    public Integer getAdminType() {
+        return adminType;
+    }
+
+    public void setAdminType(Integer adminType) {
+        this.adminType = adminType;
+    }
+
+    public String getAdminId() {
+        return adminId;
+    }
+
+    public void setAdminId(String adminId) {
+        this.adminId = adminId;
+    }
+
+    public String getAdminName() {
+        return adminName;
+    }
+
+    public void setAdminName(String adminName) {
+        this.adminName = adminName;
+    }
+
+    public String getTreatProjectIds() {
+        return treatProjectIds;
+    }
+
+    public void setTreatProjectIds(String treatProjectIds) {
+        this.treatProjectIds = treatProjectIds;
+    }
+
+    public String getRecommendProjectIds() {
+        return recommendProjectIds;
+    }
+
+    public void setRecommendProjectIds(String recommendProjectIds) {
+        this.recommendProjectIds = recommendProjectIds;
+    }
+
+    public List<Map<String, Object>> getTreatProjectList() {
+        return treatProjectList;
+    }
+
+    public void setTreatProjectList(List<Map<String, Object>> treatProjectList) {
+        this.treatProjectList = treatProjectList;
+    }
+
+    public List<Map<String, Object>> getRecommendProjectList() {
+        return recommendProjectList;
+    }
+
+    public void setRecommendProjectList(List<Map<String, Object>> recommendProjectList) {
+        this.recommendProjectList = recommendProjectList;
+    }
+
+    public String getFacePlan() {
+        return facePlan;
+    }
+
+    public void setFacePlan(String facePlan) {
+        this.facePlan = facePlan;
+    }
+
+    public Integer getSatisfie() {
+        return satisfie;
+    }
+
+    public void setSatisfie(Integer satisfie) {
+        this.satisfie = satisfie;
+    }
+
+    public String getFaceDoctorName() {
+        return faceDoctorName;
+    }
+
+    public void setFaceDoctorName(String faceDoctorName) {
+        this.faceDoctorName = faceDoctorName;
+    }
+
+    public String getTreatDoctorName() {
+        return treatDoctorName;
+    }
+
+    public void setTreatDoctorName(String treatDoctorName) {
+        this.treatDoctorName = treatDoctorName;
+    }
+
+    public String getStartTime() {
+        return startTime;
+    }
+
+    public void setStartTime(String startTime) {
+        this.startTime = startTime;
+    }
+
+    public String getEndTime() {
+        return endTime;
+    }
+
+    public void setEndTime(String endTime) {
+        this.endTime = endTime;
+    }
+
+
+    public Date getCreateTime() {
+        return createTime;
+    }
+
+    public void setCreateTime(Date createTime) {
+        this.createTime = createTime;
+    }
+
+    public String getUserName() {
+        return userName;
+    }
+
+    public void setUserName(String userName) {
+        this.userName = userName;
+    }
+
+    public String getChannelsTypeId() {
+        return channelsTypeId;
+    }
+
+    public void setChannelsTypeId(String channelsTypeId) {
+        this.channelsTypeId = channelsTypeId;
+    }
+
+    public String getChannelId() {
+        return channelId;
+    }
+
+    public void setChannelId(String channelId) {
+        this.channelId = channelId;
+    }
+
+    public String getChannel2Id() {
+        return channel2Id;
+    }
+
+    public void setChannel2Id(String channel2Id) {
+        this.channel2Id = channel2Id;
+    }
+
+    public String getHisCorpUserId() {
+        return hisCorpUserId;
+    }
+
+    public void setHisCorpUserId(String hisCorpUserId) {
+        this.hisCorpUserId = hisCorpUserId;
+    }
+
+    public String getHisCorpUserName() {
+        return hisCorpUserName;
+    }
+
+    public void setHisCorpUserName(String hisCorpUserName) {
+        this.hisCorpUserName = hisCorpUserName;
+    }
+
+    public String getTel() {
+        return tel;
+    }
+
+    public void setTel(String tel) {
+        this.tel = tel;
+    }
+
+    public String getInternetCorpUserId() {
+        return internetCorpUserId;
+    }
+
+    public void setInternetCorpUserId(String internetCorpUserId) {
+        this.internetCorpUserId = internetCorpUserId;
+    }
+
+    public String getChatCorpUserId() {
+        return chatCorpUserId;
+    }
+
+    public void setChatCorpUserId(String chatCorpUserId) {
+        this.chatCorpUserId = chatCorpUserId;
+    }
+
+    public String getCreateEmployeeId() {
+        return createEmployeeId;
+    }
+
+    public void setCreateEmployeeId(String createEmployeeId) {
+        this.createEmployeeId = createEmployeeId;
+    }
+
+    public String getCreateEmployeePartId() {
+        return createEmployeePartId;
+    }
+
+    public void setCreateEmployeePartId(String createEmployeePartId) {
+        this.createEmployeePartId = createEmployeePartId;
+    }
+
+    public String getFocusActivityId() {
+        return focusActivityId;
+    }
+
+    public void setFocusActivityId(String focusActivityId) {
+        this.focusActivityId = focusActivityId;
+    }
+
+    public String getRecentVisitType() {
+        return recentVisitType;
+    }
+
+    public void setRecentVisitType(String recentVisitType) {
+        this.recentVisitType = recentVisitType;
+    }
+
+    public Integer getRecentVisitStatus() {
+        return recentVisitStatus;
+    }
+
+    public void setRecentVisitStatus(Integer recentVisitStatus) {
+        this.recentVisitStatus = recentVisitStatus;
+    }
+
+    public Integer getIsMakeADeal() {
+        return isMakeADeal;
+    }
+
+    public void setIsMakeADeal(Integer isMakeADeal) {
+        this.isMakeADeal = isMakeADeal;
+    }
+
+    public String getLastTreatDoctorId() {
+        return lastTreatDoctorId;
+    }
+
+    public void setLastTreatDoctorId(String lastTreatDoctorId) {
+        this.lastTreatDoctorId = lastTreatDoctorId;
+    }
+
+    public String getLastTreatProjects() {
+        return lastTreatProjects;
+    }
+
+    public void setLastTreatProjects(String lastTreatProjects) {
+        this.lastTreatProjects = lastTreatProjects;
+    }
+
+    public String getLastTreatDoctorName() {
+        return lastTreatDoctorName;
+    }
+
+    public void setLastTreatDoctorName(String lastTreatDoctorName) {
+        this.lastTreatDoctorName = lastTreatDoctorName;
+    }
+
+    public List<Map<String, Object>> getLastTreatProjectList() {
+        return lastTreatProjectList;
+    }
+
+    public void setLastTreatProjectList(List<Map<String, Object>> lastTreatProjectList) {
+        this.lastTreatProjectList = lastTreatProjectList;
+    }
+
+    public String getId() {
+        return id;
+    }
+
+    public void setId(String id) {
+        this.id = id;
+    }
+
+    public Integer getPageNum() {
+        return pageNum;
+    }
+
+    public void setPageNum(Integer pageNum) {
+        this.pageNum = pageNum;
+    }
+
+    public Integer getPageSize() {
+        return pageSize;
+    }
+
+    public void setPageSize(Integer pageSize) {
+        this.pageSize = pageSize;
+    }
+
+    public String getKeyWord() {
+        return keyWord;
+    }
+
+    public void setKeyWord(String keyWord) {
+        this.keyWord = keyWord;
+    }
+
+    public String getMethodCode() {
+        return methodCode;
+    }
+
+    public void setMethodCode(String methodCode) {
+        this.methodCode = methodCode;
+    }
+
+    public String getMethodCodeName() {
+        return methodCodeName;
+    }
+
+    public void setMethodCodeName(String methodCodeName) {
+        this.methodCodeName = methodCodeName;
+    }
+
+    public String getUseType() {
+        return useType;
+    }
+
+    public void setUseType(String useType) {
+        this.useType = useType;
+    }
+
+    public Integer getIsDetail() {
+        return isDetail;
+    }
+
+    public void setIsDetail(Integer isDetail) {
+        this.isDetail = isDetail;
+    }
+}
\ 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
new file mode 100644
index 0000000..45e0e98
--- /dev/null
+++ b/phis-feign/src/main/java/com/hz/his/feign/service/platform/SPhipConsultationService.java
@@ -0,0 +1,53 @@
+package com.hz.his.feign.service.platform;
+
+import com.hx.resultTool.Result;
+import com.hz.his.dto.consultation.ConsultRecordDto;
+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-consult")
+public interface SPhipConsultationService {
+
+    /**
+     * 寮�鏀惧钩鍙�-鍜ㄨ璁板綍鏂板/淇敼
+     */
+    @PostMapping(value = "/consultation/record/add/or/edit")
+    Result addOrEditConsult(@RequestBody ConsultRecordDto consultRecordNewDto);
+
+
+    /**
+     * 寮�鏀惧钩鍙�-鍜ㄨ璁板綍鍒犻櫎
+     */
+    @PostMapping(value = "/consultation/record/del")
+    Result delConsult(@RequestBody ConsultRecordDto consultRecordNewDto);
+
+    /**
+     * 寮�鏀惧钩鍙�-鍜ㄨ璁板綍鍒楄〃
+     */
+    @PostMapping(value = "/consultation/record/user/list")
+    Result listConsult(@RequestBody ConsultRecordDto consultRecordNewDto);
+
+    /**
+     * 寮�鏀惧钩鍙�- 鑾峰彇涓婁竴娆¤褰曢儴鍒嗗瓧娈�
+     */
+    @PostMapping(value = "/consultation/record/last/detail")
+    Result lastDetailConsult(@RequestBody ConsultRecordDto consultRecordNewDto);
+
+
+    /**
+     * 寮�鏀惧钩鍙�- 璇︽儏
+     */
+    @PostMapping(value = "/consultation/record/detail")
+    Result detailConsult(@RequestBody ConsultRecordDto consultRecordNewDto);
+
+    /**
+     * 寮�鏀惧钩鍙�-鍒掓墸椤圭洰鍒楄〃
+     */
+    @PostMapping(value = "/consultation/record/deduction/project/list")
+    Result deductionProList(@RequestBody ConsultRecordDto consultRecordNewDto);
+
+}
\ No newline at end of file
diff --git a/phis-feign/src/main/java/com/hz/his/feign/service/platform/SPhipDeductionService.java b/phis-feign/src/main/java/com/hz/his/feign/service/platform/SPhipDeductionService.java
index a3397c3..b959c4d 100644
--- a/phis-feign/src/main/java/com/hz/his/feign/service/platform/SPhipDeductionService.java
+++ b/phis-feign/src/main/java/com/hz/his/feign/service/platform/SPhipDeductionService.java
@@ -65,4 +65,10 @@
      */
     @PostMapping(value = "/deduction/delete")
     Result deleteData(@RequestBody DeductionDto dto);
+
+    /**
+     * 鍒掓墸鏈悗鎻愮ず鍗￠�氱煡鑾峰彇鏁版嵁
+     */
+    @PostMapping(value = "/deduction/postoperative/card/info")
+    Result postoperativeCardInfo(@RequestBody DeductionDto dto);
 }
\ No newline at end of file

--
Gitblit v1.8.0