refactor(client-customer): 重构客户住院记录查询接口

zhuyifan
Commit 4dd114c80597eb832508f73aa8924edb91fa0700 4dd114c8 1 parent 1e08435b
Showing 3 changed files with 36 additions and 33 deletions
src/main/java/com/infoloop/tianting/service/client/ClientCustomerServiceRpcClient.java
src/main/java/com/infoloop/tianting/service/impl/ClientCustomerServiceImpl.java
src/main/proto/ClientCustomerService.proto
--- a/src/main/java/com/infoloop/tianting/service/client/ClientCustomerServiceRpcClient.java
View file @4dd114c
+++ b/src/main/java/com/infoloop/tianting/service/client/ClientCustomerServiceRpcClient.java
View file @4dd114c
 package com.infoloop.tianting.service.client;
-import com.infoloop.tianting.clientcustomerorderservice.QueryClientCustomerOrdersByConditionRpcResponse;
 import com.infoloop.tianting.clientcustomerservice.BatchCreateClientCustomerLabelRefsRpcRequest;
 import com.infoloop.tianting.clientcustomerservice.BatchCreateClientCustomerLabelRefsRpcResponse;
 import com.infoloop.tianting.clientcustomerservice.ClientCustomerLabelRefCreation;
@@ -13,21 +12,21 @@ import com.infoloop.tianting.clientcustomerservice.GetClientCustomerByIdRpcReque
 import com.infoloop.tianting.clientcustomerservice.GetClientCustomerByIdRpcResponse;
 import com.infoloop.tianting.clientcustomerservice.GetClientCustomerByMobileRpcRequest;
 import com.infoloop.tianting.clientcustomerservice.GetClientCustomerByMobileRpcResponse;
-import com.infoloop.tianting.clientcustomerservice.GetClientCustomerHospitalRecordsByCustomerIdRpcRequest;
+import com.infoloop.tianting.clientcustomerservice.GetClientCustomerHospitalRecordByCustomerIdRpcRequest;
-import com.infoloop.tianting.clientcustomerservice.GetClientCustomerHospitalRecordsByCustomerIdRpcResponse;
+import com.infoloop.tianting.clientcustomerservice.GetClientCustomerHospitalRecordByCustomerIdRpcResponse;
 import com.infoloop.tianting.clientcustomerservice.GetClientCustomersByIdsRpcRequest;
 import com.infoloop.tianting.clientcustomerservice.GetClientCustomersByIdsRpcResponse;
 import com.infoloop.tianting.clientcustomerservice.QueryClientCustomerLabelRefsByConditionRpcRequest;
 import com.infoloop.tianting.clientcustomerservice.QueryClientCustomerLabelRefsByConditionRpcResponse;
 import com.infoloop.tianting.model.dto.ClientLabelDTO.BatchCreateCustomerLabelRefDto;
 import com.infoloop.tianting.model.dto.ClientLabelDTO.BatchDeleteCustomerLabelRefRequestDto;
-import io.swagger.models.auth.In;
-import java.util.List;
-import java.util.stream.Collectors;
 import lombok.RequiredArgsConstructor;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+import java.util.List;
+import java.util.stream.Collectors;
+
 @Service
 @RequiredArgsConstructor(onConstructor = @__(@Autowired))
 public class ClientCustomerServiceRpcClient {
@@ -64,14 +63,14 @@ public class ClientCustomerServiceRpcClient {
     return clientCustomerServiceRpcBlockingStub.getClientCustomerByMobile(request);
   }
-  public GetClientCustomerHospitalRecordsByCustomerIdRpcResponse
+  public GetClientCustomerHospitalRecordByCustomerIdRpcResponse
   getClientCustomerHospitalRecordsByCustomerId(Integer enterpriseId, Integer customerId) {
-    final var request = GetClientCustomerHospitalRecordsByCustomerIdRpcRequest.newBuilder()
+    final var request = GetClientCustomerHospitalRecordByCustomerIdRpcRequest.newBuilder()
         .setCustomerId(customerId)
         .setEnterpriseId(enterpriseId)
         .setIncludeDeleted(false)
         .build();
-    return clientCustomerServiceRpcBlockingStub.getClientCustomerHospitalRecordsByCustomerId(request);
+    return clientCustomerServiceRpcBlockingStub.getClientCustomerHospitalRecordByCustomerId(request);
   }
   public BatchCreateClientCustomerLabelRefsRpcResponse batchCreateClientCustomerLabelRefs(
--- a/src/main/java/com/infoloop/tianting/service/impl/ClientCustomerServiceImpl.java
View file @4dd114c
+++ b/src/main/java/com/infoloop/tianting/service/impl/ClientCustomerServiceImpl.java
View file @4dd114c
@@ -7,17 +7,17 @@ import com.infoloop.tianting.model.dto.ClientLabelDTO.BatchCreateCustomerLabelRe
 import com.infoloop.tianting.model.dto.ClientLabelDTO.BatchDeleteCustomerLabelRefRequestDto;
 import com.infoloop.tianting.model.dto.ClientLabelDTO.BatchDeleteCustomerLabelRefResponseDto;
 import com.infoloop.tianting.model.dto.ClientLabelDTO.CustomerLabelRefDetailDto;
-import com.infoloop.tianting.model.dto.InventoryDbDTO.ClientDto;
 import com.infoloop.tianting.service.ClientCustomerService;
 import com.infoloop.tianting.service.client.ClientCustomerServiceRpcClient;
 import com.infoloop.tianting.utils.DateUtil;
-import java.util.List;
-import java.util.stream.Collectors;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+import java.util.List;
+import java.util.stream.Collectors;
+
 @Slf4j
 @Service
 @RequiredArgsConstructor(onConstructor = @__(@Autowired))
@@ -86,8 +86,8 @@ public class ClientCustomerServiceImpl implements ClientCustomerService {
       Integer enterpriseId, Integer customerId) {
     final var response = clientCustomerServiceRpcClient
         .getClientCustomerHospitalRecordsByCustomerId(enterpriseId, customerId);
-    return response.getResponsesList().stream().map(record ->
+    final var record = response.getResponse();
-        HospitalRecordDto.builder()
+    return List.of(HospitalRecordDto.builder()
             .id(record.getId())
             .enterpriseId(record.getEnterpriseId())
             .clientId(record.getClientId())
@@ -110,7 +110,7 @@ public class ClientCustomerServiceImpl implements ClientCustomerService {
             .updatedAt(DateUtil.formatDate(record.getUpdatedAt()))
             .updatedBy(record.getUpdatedBy())
             .updateSource(record.getUpdateSource())
-            .build()).collect(Collectors.toList());
+            .build());
   }
   @Override
--- a/src/main/proto/ClientCustomerService.proto
View file @4dd114c
+++ b/src/main/proto/ClientCustomerService.proto
View file @4dd114c
@@ -11,7 +11,10 @@ service ClientCustomerServiceRpc {
   //客户
   rpc GetClientCustomerById (GetClientCustomerByIdRpcRequest) returns (GetClientCustomerByIdRpcResponse) {}
+  //HIS客户
   rpc GetClientCustomerByHISCustomerId (GetClientCustomerByHISCustomerIdRpcRequest) returns (GetClientCustomerByHISCustomerIdRpcResponse) {}
+  //月子中心客户
+  rpc GetClientCustomerByContactNo (GetClientCustomerByContactNoRpcRequest) returns (GetClientCustomerByContactNoRpcResponse) {}
   rpc GetClientCustomerByMobile (GetClientCustomerByMobileRpcRequest) returns (GetClientCustomerByMobileRpcResponse) {}
   rpc GetClientCustomersByName (GetClientCustomersByNameRpcRequest) returns (GetClientCustomersByNameRpcResponse) {}
   rpc GetClientCustomersByRoomNo (GetClientCustomersByRoomNoRpcRequest) returns (GetClientCustomersByRoomNoRpcResponse) {}
@@ -24,12 +27,15 @@ service ClientCustomerServiceRpc {
   rpc DeleteClientCustomersByIds (DeleteClientCustomersByIdsRpcRequest) returns (DeleteClientCustomersRpcResponse) {}
   //客户住院记录
+
+  //根据合同号查询住院记录
   rpc GetClientCustomerHospitalRecordByContractNo (GetClientCustomerHospitalRecordByContractNoRpcRequest) returns (GetClientCustomerHospitalRecordByContractNoRpcResponse) {}
   rpc GetClientCustomerHospitalRecordById (GetClientCustomerHospitalRecordByIdRpcRequest) returns (GetClientCustomerHospitalRecordByIdRpcResponse) {}
   rpc GetClientCustomerHospitalRecordsByIds (GetClientCustomerHospitalRecordsByIdsRpcRequest) returns (GetClientCustomerHospitalRecordsByIdsRpcResponse) {}
-  rpc GetClientCustomerHospitalRecordsByCustomerId (GetClientCustomerHospitalRecordsByCustomerIdRpcRequest) returns (GetClientCustomerHospitalRecordsByCustomerIdRpcResponse) {}
+  //根据客户ID查询住院记录
-  rpc GetClientCustomerCurrentHospitalRecordByCustomerId (GetClientCustomerCurrentHospitalRecordByCustomerIdRpcRequest) returns (GetClientCustomerCurrentHospitalRecordByCustomerIdRpcResponse) {}
+  rpc GetClientCustomerHospitalRecordByCustomerId (GetClientCustomerHospitalRecordByCustomerIdRpcRequest) returns (GetClientCustomerHospitalRecordByCustomerIdRpcResponse) {}
-  rpc GetClientCustomerCurrentHospitalRecordsByCustomerIds (GetClientCustomerCurrentHospitalRecordsByCustomerIdsRpcRequest) returns (GetClientCustomerCurrentHospitalRecordsByCustomerIdsRpcResponse) {}
+  //根据客户IDS查询住院记录
+  rpc GetClientCustomerHospitalRecordsByCustomerIds (GetClientCustomerHospitalRecordsByCustomerIdsRpcRequest) returns (GetClientCustomerHospitalRecordsByCustomerIdsRpcResponse) {}
   rpc QueryClientCustomerHospitalRecordsByCondition (QueryClientCustomerHospitalRecordsByConditionRpcRequest) returns (QueryClientCustomerHospitalRecordsByConditionRpcResponse) {}
   rpc CreateClientCustomerHospitalRecord (CreateClientCustomerHospitalRecordRpcRequest) returns (CreateClientCustomerHospitalRecordRpcResponse) {}
   rpc BatchCreateClientCustomerHospitalRecords (BatchCreateClientCustomerHospitalRecordsRpcRequest) returns (BatchCreateClientCustomerHospitalRecordsRpcResponse) {}
@@ -94,6 +100,14 @@ message GetClientCustomerByHISCustomerIdRpcResponse {
   SingleClientCustomerRpcResponse response = 1;
 }
+message GetClientCustomerByContactNoRpcRequest {
+  string contractNo = 1;
+}
+
+message GetClientCustomerByContactNoRpcResponse {
+  SingleClientCustomerRpcResponse response = 1;
+}
+
 message GetClientCustomerByMobileRpcRequest {
   string mobile = 1;
 }
@@ -307,8 +321,8 @@ message GetClientCustomerHospitalRecordByIdRpcRequest {
   int32 id = 1;
   int32 enterpriseId = 2;
   bool includeDeleted = 3;
-}
+}
 message GetClientCustomerHospitalRecordByIdRpcResponse {
   SingleClientCustomerHospitalRecordRpcResponse response = 1;
 }
@@ -323,33 +337,23 @@ message GetClientCustomerHospitalRecordsByIdsRpcResponse {
   repeated SingleClientCustomerHospitalRecordRpcResponse responses = 1;
 }
-message GetClientCustomerHospitalRecordsByCustomerIdRpcRequest {
+message GetClientCustomerHospitalRecordByCustomerIdRpcRequest {
-  int32 customerId = 1;
-  int32 enterpriseId = 2;
-  bool includeDeleted = 3;
-}
-
-message GetClientCustomerHospitalRecordsByCustomerIdRpcResponse {
-  repeated SingleClientCustomerHospitalRecordRpcResponse responses = 1;
-}
-
-message GetClientCustomerCurrentHospitalRecordByCustomerIdRpcRequest {
   int32 customerId = 1;
   int32 enterpriseId = 2;
   bool includeDeleted = 3;
 }
-message GetClientCustomerCurrentHospitalRecordByCustomerIdRpcResponse {
+message GetClientCustomerHospitalRecordByCustomerIdRpcResponse {
   SingleClientCustomerHospitalRecordRpcResponse response = 1;
 }
-message GetClientCustomerCurrentHospitalRecordsByCustomerIdsRpcRequest {
+message GetClientCustomerHospitalRecordsByCustomerIdsRpcRequest {
   repeated int32 customerIds = 1;
   int32 enterpriseId = 2;
   bool includeDeleted = 3;
 }
-message GetClientCustomerCurrentHospitalRecordsByCustomerIdsRpcResponse {
+message GetClientCustomerHospitalRecordsByCustomerIdsRpcResponse {
   repeated SingleClientCustomerHospitalRecordRpcResponse responses = 1;
 }