From 50345f3b921e6c9763ea713bc0f7824d23717c40 Mon Sep 17 00:00:00 2001
From: chenjiahe <763432473@qq.com>
Date: 星期二, 25 六月 2024 17:13:03 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/chenjiahe-咨询记录（未成交）' into master-prod-new
---
phis-feign/src/main/java/com/hz/his/vo/project/ProjectFindVo.java | 18 ++++++
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/his/dto/consultation/ConsultTreatProjectVo.java | 18 ++++++
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/his/dto/consultation/ConsultAppearancePlanVo.java | 16 +++++
phis-feign/src/main/java/com/hz/his/dto/consultation/ConsultRecordDto.java | 40 +++++++++++++
phis-feign/src/main/java/com/hz/his/dto/PageDto.java | 3
9 files changed, 143 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 b0e0a1e..963981e 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/platform/SPhipConsultationService.java b/phis-feign/src/main/java/com/hz/his/feign/service/platform/SPhipConsultationService.java
index 45e0e98..c7790cb 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/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;
+
+
+}
--
Gitblit v1.8.0