From fb7682fe74c243feca8da502bf69f24d6a851cd7 Mon Sep 17 00:00:00 2001 From: gengxiaokai Date: Mon, 5 Nov 2018 10:07:05 +0800 Subject: [PATCH] =?UTF-8?q?=E5=94=90=E5=B1=B1=E6=BB=A6=E5=8E=BF=E4=BA=A7?= =?UTF-8?q?=E5=A6=87=E5=81=A5=E5=BA=B7=E7=AE=A1=E7=90=86=E7=99=BB=E8=AE=B0?= =?UTF-8?q?=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/lyms/platform/common/utils/ExcelUtil.java | 7 +++---- .../platform/operate/web/facade/PatientFacade.java | 7 +++++-- .../operate/web/result/QuanChanResult.java | 18 +++++++++++++++++ .../operate/web/worker/QuanChanPatientWorker.java | 23 +++++++++++++++++++++- 4 files changed, 48 insertions(+), 7 deletions(-) diff --git a/platform-common/src/main/java/com/lyms/platform/common/utils/ExcelUtil.java b/platform-common/src/main/java/com/lyms/platform/common/utils/ExcelUtil.java index c846ac0..893a372 100644 --- a/platform-common/src/main/java/com/lyms/platform/common/utils/ExcelUtil.java +++ b/platform-common/src/main/java/com/lyms/platform/common/utils/ExcelUtil.java @@ -472,10 +472,9 @@ public class ExcelUtil ws.addCell(new Label(k + 10, i + 2, data.get(i).get("total") == null ? "" : data.get(i).get("total").toString())); ws.addCell(new Label(k + 11, i + 2, data.get(i).get("cyxj") == null ? "" : data.get(i).get("cyxj").toString())); - ws.addCell(new Label(k + 12, i + 2, data.get(i).get("total") == null ? "" : data.get(i).get("total").toString())); - ws.addCell(new Label(k + 13, i + 2, data.get(i).get("total") == null ? "" : data.get(i).get("total").toString())); - ws.addCell(new Label(k + 14, i + 2, data.get(i).get("total") == null ? "" : data.get(i).get("total").toString())); - ws.addCell(new Label(k + 15, i + 2, data.get(i).get("total") == null ? "" : data.get(i).get("total").toString())); + ws.addCell(new Label(k + 12, i + 2, data.get(i).get("chfs") == null ? "" : data.get(i).get("chfs").toString())); + ws.addCell(new Label(k + 13, i + 2, data.get(i).get("chfc") == null ? "" : data.get(i).get("chfc").toString())); + ws.addCell(new Label(k + 14, i + 2, data.get(i).get("remarks") == null ? "" : data.get(i).get("remarks").toString())); } } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientFacade.java index 7e77777..a286ac8 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientFacade.java @@ -104,7 +104,8 @@ public class PatientFacade { @Autowired private DischargeAbstractMotherService dischargeAbstractMotherService; - + @Autowired + private MatDeliverFollowService matDeliverFollowService; /** * 修改产妇的社区 @@ -745,7 +746,7 @@ public class PatientFacade { if (end > patientses.size()) { end = patientses.size(); } - listFuture.add(commonThreadPool.submit(new QuanChanPatientWorker(patientses.subList(i, end), hospital, usersService, postReviewService, matDeliverService, patientsService, organizationService, basicConfigService,antExService,dischargeAbstractMotherService))); + listFuture.add(commonThreadPool.submit(new QuanChanPatientWorker(patientses.subList(i, end), hospital, usersService, postReviewService, matDeliverService, patientsService, organizationService, basicConfigService,antExService,dischargeAbstractMotherService,matDeliverFollowService))); } for (Future f : listFuture) { try { @@ -1091,6 +1092,8 @@ public class PatientFacade { data.put("wu",rp.getWu()); data.put("total", rp.getcTimes()); data.put("cyxj",rp.getCyxj()); + data.put("chfs",rp.getChfs()); + data.put("chfc",rp.getChfc()); datas.add(data); } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/QuanChanResult.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/QuanChanResult.java index 699a212..c76dde4 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/QuanChanResult.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/QuanChanResult.java @@ -77,6 +77,8 @@ public class QuanChanResult implements IBasicResultConvert> { private OrganizationService organizationService; private BasicConfigService basicConfigService; private DischargeAbstractMotherService dischargeAbstractMotherService; + private MatDeliverFollowService matDeliverFollowService; public QuanChanPatientWorker(List patientses, String hospital, @@ -55,7 +56,8 @@ public class QuanChanPatientWorker implements Callable> { PostReviewService postReviewService, MatDeliverService matDeliverService, PatientsService patientsService, OrganizationService organizationService, BasicConfigService basicConfigService, - AntenatalExaminationService antExService,DischargeAbstractMotherService dischargeAbstractMotherService) { + AntenatalExaminationService antExService,DischargeAbstractMotherService dischargeAbstractMotherService, + MatDeliverFollowService matDeliverFollowService) { this.patientses = patientses; this.matDeliverService = matDeliverService; this.postReviewService = postReviewService; @@ -157,6 +159,25 @@ public class QuanChanPatientWorker implements Callable> { }else{ chanResult.setCyxj("无"); } + //产后访视 + MatDeliverFollowQuery mfQuery = new MatDeliverFollowQuery(); + mfQuery.setPid(patients.getPid()); + List maternalDeliverList = matDeliverFollowService.query(mfQuery); + if(maternalDeliverList != null && maternalDeliverList.size() > 0){ + chanResult.setChfs("有"); + }else{ + chanResult.setChfs("无"); + } + PostReviewQuery pReviewQuery = new PostReviewQuery(); + pReviewQuery.setYn(YnEnums.YES.getId()); + pReviewQuery.setParentId(patients.getId()); + //产后复查记录 + List reviewModels = postReviewService.findWithList(pReviewQuery); + if(reviewModels != null && reviewModels.size() > 0){ + chanResult.setChfc("有"); + }else{ + chanResult.setChfc("无"); + } if (StringUtils.isNotEmpty(patients.getBookbuildingDoctor())) { -- 1.8.3.1