From 4829593daa194b175e9e914634d352c7c4f0ffc6 Mon Sep 17 00:00:00 2001
From: fhx <308050795@qq.com>
Date: 星期二, 29 八月 2023 14:31:00 +0800
Subject: [PATCH] Merge branch 'master-prod-new' into master-test
---
phis-feign/src/main/java/com/hz/his/dto/appearance/AppearanceLabelInfoDto.java | 26 ++++++++++++++++++++++++++
phis-feign/src/main/java/com/hz/his/dto/user/UserParamDto.java | 2 +-
phis-feign/src/main/java/com/hz/his/dto/appearance/AppearanceLabelDto.java | 2 ++
phis-feign/src/main/java/com/hz/his/dto/user/UserBaseInfoDto.java | 2 +-
4 files changed, 30 insertions(+), 2 deletions(-)
diff --git a/phis-feign/src/main/java/com/hz/his/dto/appearance/AppearanceLabelDto.java b/phis-feign/src/main/java/com/hz/his/dto/appearance/AppearanceLabelDto.java
index 94725e4..afa12b7 100644
--- a/phis-feign/src/main/java/com/hz/his/dto/appearance/AppearanceLabelDto.java
+++ b/phis-feign/src/main/java/com/hz/his/dto/appearance/AppearanceLabelDto.java
@@ -23,6 +23,8 @@
private String labelInfoName;
/**棰滆壊*/
private String color;
+ /** 鍏朵粬淇℃伅 */
+ private AppearanceLabelInfoDto labelInfo;
public AppearanceLabelDto() {
}
diff --git a/phis-feign/src/main/java/com/hz/his/dto/appearance/AppearanceLabelInfoDto.java b/phis-feign/src/main/java/com/hz/his/dto/appearance/AppearanceLabelInfoDto.java
new file mode 100644
index 0000000..e54f690
--- /dev/null
+++ b/phis-feign/src/main/java/com/hz/his/dto/appearance/AppearanceLabelInfoDto.java
@@ -0,0 +1,26 @@
+package com.hz.his.dto.appearance;
+
+import lombok.Data;
+
+/**
+ * @USER: fhx
+ * @DATE: 2023/8/29
+ **/
+@Data
+public class AppearanceLabelInfoDto {
+
+ /** 閫傚簲鐥囩▼搴� */
+ private String indDegree;
+ /** 鍓傞噺鍗曚綅 */
+ private String doseUnit;
+ /** 寤鸿娌荤枟鍓傞噺 */
+ private String treatDose;
+ /** 椤圭洰璇夋眰鍒嗙被鏍囪瘑(AppealType) */
+ private String appealTypeId;
+ //鏍煎紡锛歔{'appealTypeId':'123', 'name':'鐧�', 'parentId':'123'},....]
+ /** 椤圭洰璇夋眰鍒嗙被鏁扮粍json */
+ private String appealTypeJson;
+
+ public AppearanceLabelInfoDto() {
+ }
+}
diff --git a/phis-feign/src/main/java/com/hz/his/dto/user/UserBaseInfoDto.java b/phis-feign/src/main/java/com/hz/his/dto/user/UserBaseInfoDto.java
index 2d64d2d..b98373f 100644
--- a/phis-feign/src/main/java/com/hz/his/dto/user/UserBaseInfoDto.java
+++ b/phis-feign/src/main/java/com/hz/his/dto/user/UserBaseInfoDto.java
@@ -27,7 +27,7 @@
/** 璇佷欢缂栧彿 */
private String certificateNo;
/** 鎬у埆 */
- private Integer gender = SEX_WUMAN;
+ private Integer gender;
/** 涓荤數璇濆彿鐮� */
private String tel;
/** 鐢佃瘽鍖虹爜 */
diff --git a/phis-feign/src/main/java/com/hz/his/dto/user/UserParamDto.java b/phis-feign/src/main/java/com/hz/his/dto/user/UserParamDto.java
index 4bca9ee..5ba8886 100644
--- a/phis-feign/src/main/java/com/hz/his/dto/user/UserParamDto.java
+++ b/phis-feign/src/main/java/com/hz/his/dto/user/UserParamDto.java
@@ -74,7 +74,7 @@
/** 璇█绫诲瀷鍚嶇О */
private String languageTypeName;
/** 鐢ㄦ埛骞撮緞 */
- private Integer year = 0;
+ private Integer year;
/** 鏄熷骇绫诲瀷鍚嶇О */
private String constellationTypeName;
--
Gitblit v1.8.0