diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/worker/QuanChanPatientWorker.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/worker/QuanChanPatientWorker.java index fbd6b85..2d477bc 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/worker/QuanChanPatientWorker.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/worker/QuanChanPatientWorker.java @@ -93,14 +93,7 @@ public class QuanChanPatientWorker implements Callable > { for (Patients patients : patientses) { StopWatch stopWatch = new StopWatch("QuanChanPatientWorker -" + patients.getId()); QuanChanResult chanResult = new QuanChanResult(); - /*********************************************************/ - /** - * 秦皇岛需求 在区域妇幼管理---全部孕妇管理---全部产妇管理、全部孕妇管理两个界面,首次建档医院后面加初诊日期一栏列表 - */ - if (patients.getFirstCheckTime() != null){ - chanResult.setFirstCheckTime(DateUtil.getyyyy_MM_dd(patients.getFirstCheckTime())); - } - /*********************************************************/ + chanResult.setVcCardNo(patients.getVcCardNo()); chanResult.setCardNo(patients.getCardNo()); chanResult.setRemark(patients.getMremark()); @@ -130,6 +123,10 @@ public class QuanChanPatientWorker implements Callable > { List ant = null; int i = 0; if (CollectionUtils.isNotEmpty(chu)) { + if (chu.get(0) != null){ + chanResult.setFirstCheckTime(DateUtil.getyyyy_MM_dd(chu.get(0).getCheckTime())); + } + for (AntExChuModel a : chu) {//唐山滦县导出判断初诊是否是本院 if (StringUtils.isNotEmpty(a.getHospitalId())) { if (a.getHospitalId().equals(hospital)) {