From 7285f70c4804d88c175ace932956eec524e2ceda Mon Sep 17 00:00:00 2001
From: fwq <582742538@qq.com>
Date: 星期一, 15 四月 2024 10:07:02 +0800
Subject: [PATCH] Merge branch 'master-fwq-颜值规划4.0' into master-prod-new
---
phis-feign/src/main/java/com/hz/his/dto/micro/MicroPlanDto.java | 5 ++
phis-feign/src/main/java/com/hz/his/dto/micro/MicroRecordIdDto.java | 14 +++++++
phis-feign/src/main/java/com/hz/his/dto/micro/MicroDataDto.java | 46 +++++++++++++++++++++++
phis-feign/src/main/java/com/hz/his/feign/service/platform/SPhipMicroRecordService.java | 29 ++++++++++++++
phis-feign/src/main/java/com/hz/his/dto/micro/MicroRecordDto.java | 12 +++++
5 files changed, 104 insertions(+), 2 deletions(-)
diff --git a/phis-feign/src/main/java/com/hz/his/dto/micro/MicroDataDto.java b/phis-feign/src/main/java/com/hz/his/dto/micro/MicroDataDto.java
new file mode 100644
index 0000000..219e3d5
--- /dev/null
+++ b/phis-feign/src/main/java/com/hz/his/dto/micro/MicroDataDto.java
@@ -0,0 +1,46 @@
+package com.hz.his.dto.micro;
+
+import lombok.Data;
+
+/**
+ * 棰滃�艰鍒掓暟鎹�
+ **/
+@Data
+public class MicroDataDto {
+ /**鍒嗙被鍚�:鐧藉厜/缇�/绱�/濉�*/
+ private String typeName;
+ /**閫傚簲鐥囦竴绾у垎绫�*/
+ private String firstTypeId;
+ /**閫傚簲鐥囦竴绾у垎绫诲悕*/
+ private String firstTypeName;
+ /**閫傚簲鐥囦簩绾у垎绫�*/
+ private String secondTypeId;
+ /**閫傚簲鐥囦簩绾у垎绫诲悕*/
+ private String secondTypeName;
+ /**閫傚簲鐥囦笁绾у垎绫�*/
+ private String thirdTypeId;
+ /**閫傚簲鐥囦笁绾у垎绫诲悕*/
+ private String thirdTypeName;
+ /**閫傚簲鐥�*/
+ private String indicationId;
+ /**閫傚簲鐥囧悕*/
+ private String indicationName;
+ /**绋嬪害绫诲瀷鏍囪瘑*/
+ private String degreeTypeId;
+ /**绋嬪害鍚�*/
+ private String degreeTypeName;
+ /**韬綋閮ㄤ綅鏍囪瘑*/
+ private String bodyPartId;
+ /**韬綋閮ㄤ綅鍚�*/
+ private String bodyPartName;
+ /**韬綋閮ㄤ綅瀛愰」鏍囪瘑*/
+ private String bodyPartItemId;
+ /**韬綋閮ㄤ綅瀛愰」鍚�*/
+ private String bodyPartItemName;
+ /**鏈�鍚庝竴绾ф暟鎹悕绉�*/
+ private String dataName;
+ /**鏈�鍚庝竴绾ф暟鎹爣璇�*/
+ private String dataId;
+ /**寰暣璁板綍鏍囪瘑*/
+ private String microRecordId;
+}
diff --git a/phis-feign/src/main/java/com/hz/his/dto/micro/MicroPlanDto.java b/phis-feign/src/main/java/com/hz/his/dto/micro/MicroPlanDto.java
index 55a0080..0c26f6f 100644
--- a/phis-feign/src/main/java/com/hz/his/dto/micro/MicroPlanDto.java
+++ b/phis-feign/src/main/java/com/hz/his/dto/micro/MicroPlanDto.java
@@ -18,7 +18,10 @@
private String recommend;
/** 鎺掑簭鍙�(鍓嶇鎺掑簭) */
private Integer sortNum;
-
+ /**鍒嗙被瀛楃涓�*/
+ private String typeJson;
+ /**鎺ㄨ崘椤圭洰*/
private List<MicroPlanItemDto> itemList;
+ /**閫傚簲鐥�*/
private List<MicroPlanIndicationDto> indicationList;
}
diff --git a/phis-feign/src/main/java/com/hz/his/dto/micro/MicroRecordDto.java b/phis-feign/src/main/java/com/hz/his/dto/micro/MicroRecordDto.java
index 8254f31..dedcdc1 100644
--- a/phis-feign/src/main/java/com/hz/his/dto/micro/MicroRecordDto.java
+++ b/phis-feign/src/main/java/com/hz/his/dto/micro/MicroRecordDto.java
@@ -35,6 +35,16 @@
private String visitOrderId;
/** 鏄惁鑽夌*/
private Integer isDraft;
-
+ /**寤鸿淇℃伅*/
private List<MicroPlanDto> planList;
+ /**棰滃�艰鍒掍俊鎭�*/
+ private List<MicroDataDto> dataList;
+ /**鏌ヨ鏍囪瘑绫诲瀷:TreatPlan.typeStr*/
+ private String typeStr;
+ /**鏌ヨ涓�绾ф爣璇�*/
+ private String firstId;
+ /**鏌ヨ浜岀骇鏍囪瘑*/
+ private String secondId;
+ /**鍏宠仈澶氱骇鏍囪瘑*/
+ private List<MicroRecordIdDto> idList;
}
diff --git a/phis-feign/src/main/java/com/hz/his/dto/micro/MicroRecordIdDto.java b/phis-feign/src/main/java/com/hz/his/dto/micro/MicroRecordIdDto.java
new file mode 100644
index 0000000..2798eda
--- /dev/null
+++ b/phis-feign/src/main/java/com/hz/his/dto/micro/MicroRecordIdDto.java
@@ -0,0 +1,14 @@
+package com.hz.his.dto.micro;
+
+import lombok.Data;
+
+/**
+ * 瀛愮骇鏍囪瘑
+ **/
+@Data
+public class MicroRecordIdDto{
+ /***/
+ private String firstId;
+ private String secondId;
+
+}
diff --git a/phis-feign/src/main/java/com/hz/his/feign/service/platform/SPhipMicroRecordService.java b/phis-feign/src/main/java/com/hz/his/feign/service/platform/SPhipMicroRecordService.java
index 740d356..e377fa1 100644
--- a/phis-feign/src/main/java/com/hz/his/feign/service/platform/SPhipMicroRecordService.java
+++ b/phis-feign/src/main/java/com/hz/his/feign/service/platform/SPhipMicroRecordService.java
@@ -54,4 +54,33 @@
@PostMapping(value = "/micro/record/check/view")
Result checkView(@RequestBody MicroRecordDto dto);
+ //--------------------棰滃�艰鍒�4.0------------------------------
+ /** 寰暣璁板綍鍒楄〃 */
+ @PostMapping(value = "/micro/record/list/V2")
+ Result listV2(@RequestBody MicroRecordDto dto);
+
+ /** 璁板綍璇︽儏 */
+ @PostMapping(value = "/micro/record/details/V2")
+ Result detailsV2(@RequestBody MicroRecordDto dto);
+
+ /** 閫傚簲鐥囨暟鎹� */
+ @PostMapping(value = "/micro/record/indication/data/V2")
+ Result indicationDataV2(@RequestBody MicroRecordDto dto);
+
+ /** 閫傚簲鐥囨不鐤楀缓璁� */
+ @PostMapping(value = "/micro/record/treatPlan/V2")
+ Result treatPlanV2(@RequestBody MicroRecordDto dto);
+
+ /** 鏂板寰暣璁板綍 */
+ @PostMapping(value = "/micro/record/add/V2")
+ Result addV2(@RequestBody MicroRecordDto dto);
+
+ /** 淇敼寰暣璁板綍 */
+ @PostMapping(value = "/micro/record/edit/V2")
+ Result editV2(@RequestBody MicroRecordDto dto);
+
+ /** 鍒犻櫎寰暣璁板綍 */
+ @PostMapping(value = "/micro/record/del/V2")
+ Result delV2(@RequestBody MicroRecordDto dto);
+
}
--
Gitblit v1.8.0