厦门五院个性化需求 同一病人，主刀医生、手术等级合并

src/main/java/com/diagbot/facade/ConsoleFacade.java

@@ -1,12 +1,14 @@
 package com.diagbot.facade;
 
 import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.diagbot.aggregate.AverageStatisticsAggregate;
 import com.diagbot.aggregate.MrStatisticsAggregate;
 import com.diagbot.aggregate.ResultStatisticsAggregate;
+import com.diagbot.biz.push.entity.Lis;
 import com.diagbot.dto.*;
 import com.diagbot.entity.*;
 import com.diagbot.enums.IsDeleteEnum;
@@ -2665,6 +2667,24 @@ public class ConsoleFacade {
     public IPage<QcResultShortDTO> leaveHosMRPage(QcResultShortPageVO qcResultShortPageVO) {
         filterFacade.qcResultShortPageVOSet(qcResultShortPageVO);
         IPage<QcResultShortDTO> page = behospitalInfoFacade.leaveHosMRPage(qcResultShortPageVO);
+        List<QcResultShortDTO> records = page.getRecords();
+        HashMap<String, QcResultShortDTO> map = new HashMap<String, QcResultShortDTO>();
+        for (QcResultShortDTO record : records) {
+            if (map.get(record.getBehospitalCode())==null){
+                map.put(record.getBehospitalCode(),record);
+            }else {
+                QcResultShortDTO qcResultShortDTO = map.get(record.getBehospitalCode());
+                qcResultShortDTO.setOperationDocterName(qcResultShortDTO.getOperationDocterName()+","+record.getOperationDocterName());
+                qcResultShortDTO.setOperationLevel(qcResultShortDTO.getOperationLevel()+","+record.getOperationLevel());
+                map.put(record.getBehospitalCode(),qcResultShortDTO);
+            }
+        }
+        List<QcResultShortDTO> resultShortDTOS=new ArrayList<>();
+        Set<Map.Entry<String, QcResultShortDTO>> entries = map.entrySet();
+        for (Map.Entry<String, QcResultShortDTO> entry : entries) {
+            resultShortDTOS.add(entry.getValue());
+        }
+        page.setRecords(resultShortDTOS);
         return page;
     }
 

src/main/resources/mapper/BehospitalInfoMapper.xml

@@ -21601,8 +21601,7 @@
     <!--输血患者人数-->
     <select id="bloodCount" resultType="int" parameterType="com.diagbot.vo.FilterVO">
         SELECT
-        distinct
-        count(*)
+        count(DISTINCT a.behospital_code)
         FROM
         med_behospital_info a,
         med_home_page b
@@ -21644,7 +21643,7 @@
     <!--癌痛患者人数-->
     <select id="cancerCount" resultType="int" parameterType="com.diagbot.vo.FilterVO">
         SELECT
-        count(*)
+        count(DISTINCT a.behospital_code)
         FROM
         med_behospital_info a,
         med_doctor_advice b