From 9f619727eacfd1ff18e6cbfdd1731131b6cbcc43 Mon Sep 17 00:00:00 2001
From: wangrenhuang <wangren_huang@163.com>
Date: 星期一, 28 八月 2023 11:53:34 +0800
Subject: [PATCH] Merge branch 'master' into master-test
---
phis-feign/src/main/java/com/hz/his/feign/service/platform/bi/BiDoctorSaleService.java | 6 ++++++
phis-feign/src/main/java/com/hz/his/dto/meiji/MjSkinReportItemDto.java | 42 ++++++++++++++++++++++++++++++++++++++++++
phis-feign/src/main/java/com/hz/his/feign/service/phis/SMeiJiService.java | 8 +++++++-
3 files changed, 55 insertions(+), 1 deletions(-)
diff --git a/phis-feign/src/main/java/com/hz/his/dto/meiji/MjSkinReportItemDto.java b/phis-feign/src/main/java/com/hz/his/dto/meiji/MjSkinReportItemDto.java
new file mode 100644
index 0000000..7d43638
--- /dev/null
+++ b/phis-feign/src/main/java/com/hz/his/dto/meiji/MjSkinReportItemDto.java
@@ -0,0 +1,42 @@
+package com.hz.his.dto.meiji;
+
+import lombok.Data;
+
+import java.math.BigDecimal;
+
+/**
+ * @ClassName MjSkinReportDto
+ * @Description 缇庨檯妗ｆ瀛愮被鏁版嵁Dto
+ * @Author wrh
+ * @Date 2023/8/25 15:43
+ * @Version 1.0
+ */
+@Data
+public class MjSkinReportItemDto {
+
+ /**缁撴灉鍊�*/
+ private BigDecimal result;
+ /**缂洪櫡绛夌骇鍊�*/
+ private Integer level;
+ /**鍚嶇О*/
+ private String name;
+ /**绋嬪害*/
+ private String degree;
+
+ //鐨偆鍒嗘瀽绫诲瀷
+ public static final String TYPE_PORE = "姣涘瓟";
+ //榛戝ご
+ public static final String TYPE_BLACKHEAD = "榛戝ご";
+ //T鍖哄嚭娌�
+ public static final String TYPE_T = "T鍖哄嚭娌�";
+ //T鍖哄嚭娌�
+ public static final String TYPE_U = "U鍖哄嚭娌�";
+ //鑹叉枒 stain
+ public static final String TYPE_STAIN = "鑹叉枒";
+ //娉涚孩 reddening
+ public static final String TYPE_REDDENING = "娉涚孩";
+ //绾㈣涓� Redness
+ public static final String TYPE_REDNESS = "绾㈣涓�";
+ //鐥ょ柈 acne
+ public static final String TYPE_ACNE = "鐥ょ柈";
+}
diff --git a/phis-feign/src/main/java/com/hz/his/feign/service/phis/SMeiJiService.java b/phis-feign/src/main/java/com/hz/his/feign/service/phis/SMeiJiService.java
index 05fa958..d04f3a2 100644
--- a/phis-feign/src/main/java/com/hz/his/feign/service/phis/SMeiJiService.java
+++ b/phis-feign/src/main/java/com/hz/his/feign/service/phis/SMeiJiService.java
@@ -15,8 +15,14 @@
public interface SMeiJiService {
/**
- * 璁㈠崟鍒楄〃
+ * 缇庨檯妗ｆ鍒楄〃
*/
@PostMapping(value = "/meiji/userSkinReportList")
Result userSkinReportList(@RequestBody UserDto userDto);
+
+ /**
+ * 鏌ヨ鐢ㄦ埛鏈�鏂扮殑缇庨檯妗ｆ
+ */
+ @PostMapping(value = "/meiji/one")
+ Result userSkinReportOne(@RequestBody UserDto userDto);
}
\ No newline at end of file
diff --git a/phis-feign/src/main/java/com/hz/his/feign/service/platform/bi/BiDoctorSaleService.java b/phis-feign/src/main/java/com/hz/his/feign/service/platform/bi/BiDoctorSaleService.java
index 88fe124..481605a 100644
--- a/phis-feign/src/main/java/com/hz/his/feign/service/platform/bi/BiDoctorSaleService.java
+++ b/phis-feign/src/main/java/com/hz/his/feign/service/platform/bi/BiDoctorSaleService.java
@@ -46,6 +46,12 @@
@PostMapping("/admin/doctor/sale/report/project/type/list")
Result projectList(@RequestBody EmployeeReportDto employeeReportDto);
+ /**
+ * 鎵ц椤圭洰-鍒嗙被鑱斿悎娌荤枟
+ */
+ @PostMapping("/admin/doctor/sale/report/project/combination/therapy/list")
+ Result combinationTherapy(@RequestBody EmployeeReportDto employeeReportDto);
+
/**
* 鎵ц椤圭洰-SPU鍗犳瘮
--
Gitblit v1.8.0