diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MatDeliverFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MatDeliverFacade.java index 88cf9ea..65f9440 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MatDeliverFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MatDeliverFacade.java @@ -2124,7 +2124,6 @@ public class MatDeliverFacade { break; } List babyModelList = babyService.queryBabyWithQuery(babyModelQuery); - System.out.println(babyModelQuery.convertToQuery().convertToMongoQuery().toString()); List babyParentIdList = new ArrayList<>(); for (BabyModel babyModel : babyModelList) { babyParentIdList.add(babyModel.getParentId()); @@ -2185,7 +2184,7 @@ public class MatDeliverFacade { patientsMap.put(patients.getId(), patients); } - List childbirthManagerQueryModelList = new ArrayList<>(); + List childbirthManagerQueryModelList = new LinkedList<>(); int batchSize = 3; int end = 0; List futures = new ArrayList<>(); diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/worker/MaterDeliverWorker.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/worker/MaterDeliverWorker.java index 9cb3a01..8ba9fe4 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/worker/MaterDeliverWorker.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/worker/MaterDeliverWorker.java @@ -25,6 +25,7 @@ import org.springframework.beans.factory.annotation.Autowired; import java.text.SimpleDateFormat; import java.util.ArrayList; +import java.util.LinkedList; import java.util.List; import java.util.Map; import java.util.concurrent.Callable; @@ -65,7 +66,7 @@ public class MaterDeliverWorker implements Callable call() { - List childbirthManagerQueryModelList = new ArrayList<>(); + List childbirthManagerQueryModelList = new LinkedList<>(); try { for (MaternalDeliverModel maternalDeliverModel : maternalDeliverModelList) { Patients patients = patientsMap.get(maternalDeliverModel.getParentId()); diff --git a/platform-operate-api/src/main/resources/qhdnb.xls b/platform-operate-api/src/main/resources/qhdnb.xls new file mode 100644 index 0000000000000000000000000000000000000000..dc26558b5c11c08bef5f4111160a0f803369ed5b GIT binary patch literal 27136 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