|
@@ -13,6 +13,7 @@ import org.slf4j.LoggerFactory;
|
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
|
import org.springframework.stereotype.Service;
|
|
|
|
|
|
+import java.util.ArrayList;
|
|
|
import java.util.List;
|
|
|
|
|
|
@Service
|
|
@@ -46,6 +47,7 @@ public class CommonWxPushService {
|
|
|
// }
|
|
|
List<MedicalCard> infoList = getListByHospitalId(hospitalId);
|
|
|
|
|
|
+
|
|
|
String col1 = "患者ID";
|
|
|
String col2 = "患者姓名";
|
|
|
String col3 = "身份证号";
|
|
@@ -53,16 +55,25 @@ public class CommonWxPushService {
|
|
|
|
|
|
String[] columns = new String[]{col1, col2, col3, col4};
|
|
|
ExcelDataMap map = new ExcelDataMap(columns);
|
|
|
- String filename = "患者ID";
|
|
|
if (Checker.isNone(infoList)) {
|
|
|
- return;
|
|
|
- }
|
|
|
- for (MedicalCard item : infoList) {
|
|
|
- map.getStringListSafely(col1).add(item.getHisPatientId());
|
|
|
- map.getStringListSafely(col2).add(item.getPatientName());
|
|
|
- map.getStringListSafely(col3).add(item.getIdNo());
|
|
|
- map.getStringListSafely(col4).add(item.getMobile());
|
|
|
+ map.getStringListSafely(col1).add("");
|
|
|
+ map.getStringListSafely(col2).add("");
|
|
|
+ map.getStringListSafely(col3).add("");
|
|
|
+ map.getStringListSafely(col4).add("");
|
|
|
+ } else {
|
|
|
+ List<String> duplicateRemovalList = new ArrayList<>();
|
|
|
+ for (MedicalCard item : infoList) {
|
|
|
+ String value = (new StringBuilder(item.getHisPatientId()).append("_").append(item.getIdNo())).toString();
|
|
|
+ if (!duplicateRemovalList.contains(value)) {
|
|
|
+ duplicateRemovalList.add(value);
|
|
|
+ map.getStringListSafely(col1).add(item.getHisPatientId());
|
|
|
+ map.getStringListSafely(col2).add(item.getPatientName());
|
|
|
+ map.getStringListSafely(col3).add(item.getIdNo());
|
|
|
+ map.getStringListSafely(col4).add(item.getMobile());
|
|
|
+ }
|
|
|
+ }
|
|
|
}
|
|
|
+
|
|
|
// 得到统计
|
|
|
int size = infoList.size();
|
|
|
List<ExcelCollectPojo> itemList = null;
|