From 17c959c9ba3966d251ccc555f1215175fdccdf97 Mon Sep 17 00:00:00 2001
From: fwq <582742538@qq.com>
Date: 星期四, 09 五月 2024 17:57:37 +0800
Subject: [PATCH] Merge branch 'master-prod-new' into master-test
---
phis-feign/src/main/java/com/hz/his/dto/user/room/UserDoctorRoomDto.java | 1 -
phis-feign/src/main/java/com/hz/his/feign/service/platform/SPhipUserService.java | 7 +++++++
2 files changed, 7 insertions(+), 1 deletions(-)
diff --git a/phis-feign/src/main/java/com/hz/his/dto/user/room/UserDoctorRoomDto.java b/phis-feign/src/main/java/com/hz/his/dto/user/room/UserDoctorRoomDto.java
index a15203e..884f443 100644
--- a/phis-feign/src/main/java/com/hz/his/dto/user/room/UserDoctorRoomDto.java
+++ b/phis-feign/src/main/java/com/hz/his/dto/user/room/UserDoctorRoomDto.java
@@ -35,5 +35,4 @@
private String opRoleName;
private String opRoleTypeId;
private String opRoleStr;
-
}
diff --git a/phis-feign/src/main/java/com/hz/his/feign/service/platform/SPhipUserService.java b/phis-feign/src/main/java/com/hz/his/feign/service/platform/SPhipUserService.java
index 2b2e144..3353622 100644
--- a/phis-feign/src/main/java/com/hz/his/feign/service/platform/SPhipUserService.java
+++ b/phis-feign/src/main/java/com/hz/his/feign/service/platform/SPhipUserService.java
@@ -1,6 +1,7 @@
package com.hz.his.feign.service.platform;
import com.hx.resultTool.Result;
+import com.hz.his.dto.marketing.common.MarCommonReturnDto;
import com.hz.his.dto.marketing.common.MarketingTotalDto;
import com.hz.his.dto.user.*;
import com.hz.his.dto.user.coupon.UserCouponDto;
@@ -136,6 +137,12 @@
Result userFamiliesRoomCreate(@RequestBody UserDoctorRoomDto userDoctorRoomDto);
/**
+ * 寮�鏀惧钩鍙�-鐢ㄦ埛绉戝鐐硅瘖瀹℃牳鍥炶皟
+ */
+ @PostMapping(value = "user/room/doctor/diagnosis")
+ Result diagnosisFamiliesRoom(@RequestBody MarCommonReturnDto marCommonReturnDto);
+
+ /**
* 寮�鏀惧钩鍙�-杞彂鍒涘缓钀ラ攢鍔╂墜瀹℃牳
*/
@PostMapping(value = "/user/common/approve/create")
--
Gitblit v1.8.0