liuqq 3 роки тому
батько
коміт
4be33204d4

+ 12 - 0
external-service/src/main/java/com/lantone/external/dto/BalanceDTO.java

@@ -0,0 +1,12 @@
+package com.lantone.external.dto;
+
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+public class BalanceDTO {
+    private String behospitalCode;
+    private String homePageId;
+    private List<RecDTO> recList;
+}

+ 4 - 3
external-service/src/main/java/com/lantone/external/dto/DataBalanceDTO.java

@@ -6,7 +6,8 @@ import java.util.List;
 
 @Data
 public class DataBalanceDTO {
-    private String behospitalCode;
-    private String homePageId;
-    private List<RecDTO> recList;
+    private int behospitalCount;
+    private int homePageCount;
+    private int recCount;
+    private List<BalanceDTO> balanceDTOList;
 }

+ 10 - 4
external-service/src/main/java/com/lantone/external/facade/DataBalanceFacade.java

@@ -3,6 +3,7 @@ package com.lantone.external.facade;
 import com.google.common.collect.Lists;
 import com.lantone.common.util.ListUtil;
 import com.lantone.common.util.StringUtil;
+import com.lantone.external.dto.BalanceDTO;
 import com.lantone.external.dto.DataBalanceDTO;
 import com.lantone.external.dto.RecDTO;
 import com.lantone.external.entity.VLtMedicalRecord;
@@ -27,9 +28,10 @@ public class DataBalanceFacade {
     @Autowired
     private VLtMedicalRecordFacade vLtMedicalRecordFacade;
 
-    public List<DataBalanceDTO> balanceData(DataViewVO dataViewVO){
+    public DataBalanceDTO balanceData(DataViewVO dataViewVO){
         try{
-            List<DataBalanceDTO> dtoList= Lists.newLinkedList();
+            DataBalanceDTO dataDto=new DataBalanceDTO();
+            List<BalanceDTO> dtoList= Lists.newLinkedList();
             List<String> beHospitalCodeList=vLtBehospitalInfoFacade.getTimeSoltData(dataViewVO);
             if(ListUtil.isNotEmpty(beHospitalCodeList)){
                 //获取病案首页数据
@@ -37,7 +39,7 @@ public class DataBalanceFacade {
 
                 Map<String,List<VLtMedicalRecord>> recMap=vLtMedicalRecordFacade.getTimeSoltData(beHospitalCodeList);
                 beHospitalCodeList.stream().forEach(s->{
-                    DataBalanceDTO dto=new DataBalanceDTO();
+                    BalanceDTO dto=new BalanceDTO();
                     dto.setBehospitalCode(s);
                     //拼接病案序号
                     if(StringUtil.isNotEmpty(homePageMap.get(s))){
@@ -58,8 +60,12 @@ public class DataBalanceFacade {
                     }
                     dtoList.add(dto);
                 });
+                dataDto.setBehospitalCount(beHospitalCodeList.size());
+                dataDto.setHomePageCount(homePageMap.size());
+                dataDto.setRecCount(recMap.size());
             }
-            return dtoList;
+            dataDto.setBalanceDTOList(dtoList);
+            return dataDto;
         }catch (Exception e){
             log.error("数据比对-获取某个入院时间段内的病历数::"+e.getMessage(),new Throwable());
             return null;

+ 1 - 1
external-service/src/main/java/com/lantone/external/web/DataBalanceController.java

@@ -22,7 +22,7 @@ public class DataBalanceController {
 
     @ApiOperation(value = "数据比对-获取某个入院时间段内的病历数")
     @PostMapping("/getDataCount")
-    public List<DataBalanceDTO> getDataCount(DataViewVO dataViewVO){
+    public DataBalanceDTO getDataCount(DataViewVO dataViewVO){
         return dataBalanceFacade.balanceData(dataViewVO);
     }
 }