From d0ea714534513f0d8344f673eb6e0e202588b22f Mon Sep 17 00:00:00 2001
From: chenjiahe <763432473@qq.com>
Date: 星期四, 30 五月 2024 14:39:33 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/chenjiahe-咨询记录（未成交）' into master-test
---
phis-feign/src/main/java/com/hz/his/feign/service/platform/SPhipConsultationService.java | 2
phis-feign/src/main/java/com/hz/his/dto/consultation/ConsultTreatProjectVo.java | 18 +++++++++
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 | 38 +++++++++++++++++++
4 files changed, 73 insertions(+), 1 deletions(-)
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..c63d236 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,26 @@
//鍜ㄨ鏂瑰紡鍚嶇О
private String methodCodeName;
+ /**鐢ㄦ埛鑱屼笟*/
+ private String userCareer;
+ /**浣滄伅*/
+ private String workRest;
+ /**鎬ф牸*/
+ private String character;
+ /**鐢ㄦ埛鍠滃ソ*/
+ 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 +113,10 @@
private List<Map<String,Object>> recommendProjectList;
//涓婃娌荤枟椤圭洰
private List<Map<String,Object>> lastTreatProjectList;
+ /**棰勭害椤圭洰闆嗗悎*/
+ private List<ConsultTreatProjectVo> preProjectList;
+ /**棰滃�艰鍒掗泦鍚�*/
+ private List<ConsultAppearancePlanVo> appearancePlanList;
//-------------- 鎼滅储鏉′欢
@@ -150,6 +186,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/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);
--
Gitblit v1.8.0