From 01495e52fb8610bd4643d0ffe7e47e3b1466bf9e Mon Sep 17 00:00:00 2001
From: wyb <1977763549@qq.com>
Date: Thu, 21 Aug 2025 11:05:18 +0800
Subject: [PATCH] =?UTF-8?q?imp:=20=E4=B8=BB=E7=AE=A1=E5=8C=BB=E7=94=9F?=
 =?UTF-8?q?=E4=BB=8E=E8=AF=A6=E7=BB=86=E6=8E=A5=E5=8F=A3=E5=8F=96=E4=BD=8F?=
 =?UTF-8?q?=E9=99=A2=E5=8C=BB=E5=B8=88?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/HttpTBasicServiceImpl.java           | 28 ++++++++++++++++++-
 .../rpc/MzZyyRocCurrWebCommonRpc.java         |  7 +++++
 .../impl/MzZyyRocCurrWebCommonRpcImpl.java    | 18 ++++++++++++
 3 files changed, 52 insertions(+), 1 deletion(-)

diff --git a/src/main/java/com/docus/server/collection/httpservices/impl/HttpTBasicServiceImpl.java b/src/main/java/com/docus/server/collection/httpservices/impl/HttpTBasicServiceImpl.java
index 43b8a50..7e950b9 100644
--- a/src/main/java/com/docus/server/collection/httpservices/impl/HttpTBasicServiceImpl.java
+++ b/src/main/java/com/docus/server/collection/httpservices/impl/HttpTBasicServiceImpl.java
@@ -2,12 +2,15 @@ package com.docus.server.collection.httpservices.impl;
 
 import cn.hutool.http.HttpRequest;
 import cn.hutool.http.HttpUtil;
+import com.alibaba.fastjson.JSONObject;
 import com.docus.core.util.Func;
 import com.docus.server.collection.dto.TBasicDto;
 import com.docus.server.collection.httpservices.HttpTBasicService;
+import com.docus.server.collection.rpc.MzZyyRocCurrWebCommonRpc;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
 
+import javax.annotation.Resource;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
@@ -23,6 +26,8 @@ import java.util.Map;
 @Service
 @Slf4j
 public class HttpTBasicServiceImpl implements HttpTBasicService {
+    @Resource
+    private MzZyyRocCurrWebCommonRpc mzZyyRocCurrWebCommonRpc;
     @Override
     public List<TBasicDto> getTBasicDto(String url, Map<String,String> headers, Map<String,Object> params) {
         List<TBasicDto> tBasicDtos=null;
@@ -130,10 +135,31 @@ public class HttpTBasicServiceImpl implements HttpTBasicService {
             tBasicDto.setInpatientNo(inpatientNo);
             tBasicDto.setDutyNurse(dutyNurse);
             tBasicDto.setMotherInpatientNo(motherInpatientNo);
-
+            // 主管医生取另外的接口数据值
+            setAttending(tBasicDto);
             tBasicDtos.add(tBasicDto);
         }
 
         return tBasicDtos;
     }
+
+    /**
+     * 设置另外的主管医生为住院医师
+     */
+    private void setAttending(TBasicDto tBasicDto) {
+        String jzh = tBasicDto.getJzh();
+        JSONObject patientRes = mzZyyRocCurrWebCommonRpc.getInPatient(jzh);
+        if (patientRes == null) {
+            return;
+        }
+        boolean success = "200".equals(patientRes.getString("code"));
+        JSONObject patientData = patientRes.getJSONObject("data");
+        if (!success || patientData == null) {
+            return;
+        }
+        String houseDocCode = patientData.getString("houseDocCode");
+        String houseDocName = patientData.getString("houseDocName");
+        tBasicDto.setAttending(houseDocCode);
+        tBasicDto.setAttending(houseDocName);
+    }
 }
diff --git a/src/main/java/com/docus/server/collection/rpc/MzZyyRocCurrWebCommonRpc.java b/src/main/java/com/docus/server/collection/rpc/MzZyyRocCurrWebCommonRpc.java
index aefe4b3..f475cd5 100644
--- a/src/main/java/com/docus/server/collection/rpc/MzZyyRocCurrWebCommonRpc.java
+++ b/src/main/java/com/docus/server/collection/rpc/MzZyyRocCurrWebCommonRpc.java
@@ -15,4 +15,11 @@ public interface MzZyyRocCurrWebCommonRpc {
      * @return 科室列表
      */
     JSONObject queryDept(String deptCode, String deptType);
+
+    /**
+     * 住院患者详细信息查询
+     * @param inpatientNo 患者编号
+     * @return 住院患者详细信息查询
+     */
+    JSONObject getInPatient(String inpatientNo);
 }
diff --git a/src/main/java/com/docus/server/collection/rpc/impl/MzZyyRocCurrWebCommonRpcImpl.java b/src/main/java/com/docus/server/collection/rpc/impl/MzZyyRocCurrWebCommonRpcImpl.java
index 796013a..66187b4 100644
--- a/src/main/java/com/docus/server/collection/rpc/impl/MzZyyRocCurrWebCommonRpcImpl.java
+++ b/src/main/java/com/docus/server/collection/rpc/impl/MzZyyRocCurrWebCommonRpcImpl.java
@@ -47,4 +47,22 @@ public class MzZyyRocCurrWebCommonRpcImpl implements MzZyyRocCurrWebCommonRpc {
             return null;
         }
     }
+
+    @Override
+    public JSONObject getInPatient(String inpatientNo) {
+        final String path = "/api/v1/common/in-patient/get/" + inpatientNo;
+        final String url = rocCurrWebUrl + path;
+        try {
+            String result = HttpUtil.createGet(url)
+                    .header("Content-Type", "application/json")
+                    .header("domain", rocDomain)
+                    .header("key", rocKey)
+                    .timeout(60 * 1000)
+                    .execute().body();
+            return JSONObject.parseObject(result);
+        } catch (Exception ex) {
+            log.error(url + " 请求出错了，" + ex.getMessage(), ex);
+            return null;
+        }
+    }
 }