From 2bd54a75e15870579e410a7841c413e5fcae52ea Mon Sep 17 00:00:00 2001 From: liquanyu Date: Thu, 12 May 2022 15:21:29 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8C=BA=E5=9F=9F=E4=BA=A7=E5=A6=87=E5=92=8C?= =?UTF-8?q?=E5=AD=95=E5=A6=87=E5=A4=87=E6=B3=A8=E5=AF=BC=E5=87=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/lyms/platform/operate/web/facade/PatientFacade.java | 5 +++++ .../com/lyms/platform/operate/web/result/QuanChanResult.java | 10 ++++++++++ .../lyms/platform/operate/web/result/QuanPatientsResult.java | 10 ++++++++++ .../platform/operate/web/worker/QuanChanPatientWorker.java | 2 ++ .../lyms/platform/operate/web/worker/QuanPatientWorker.java | 1 + 5 files changed, 28 insertions(+) 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 05c8347..db437a1 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 @@ -2234,6 +2234,7 @@ public class PatientFacade extends BaseServiceImpl { data.put("phone", patientsQueryRequest.getIsEncry() == 0 ? rp.getRealPhone() : StringUtils.encryPhone(rp.getRealPhone())); data.put("serviceType", rp.getServiceType()); data.put("serviceStatus", rp.getServiceStatus()); + datas.add(data); }else if(patientsQueryRequest.getQueryType()==1){ //全部孕妇 @@ -2261,6 +2262,7 @@ public class PatientFacade extends BaseServiceImpl { data.put("phone", patientsQueryRequest.getIsEncry() == 0 ? rp.getRealPhone() : com.lyms.platform.common.utils.StringUtils.encryPhone(rp.getRealPhone())); data.put("serviceType", rp.getServiceType()); data.put("serviceStatus", rp.getServiceStatus()); + data.put("remark", rp.getRemark()); datas.add(data); }else { //全部产妇 @@ -2280,6 +2282,7 @@ public class PatientFacade extends BaseServiceImpl { data.put("bTime", rp.getbTime()); data.put("phone", patientsQueryRequest.getIsEncry() == 0 ? rp.getRealPhone() : StringUtils.encryPhone(rp.getRealPhone())); data.put("cardNo", patientsQueryRequest.getIsEncry() == 0 ? rp.getCardNo() : StringUtils.encryCardNo(rp.getCardNo())); + data.put("remark", rp.getRemark()); datas.add(data); } } @@ -2328,6 +2331,7 @@ public class PatientFacade extends BaseServiceImpl { cnames.put("phone", "联系方式"); cnames.put("serviceType", "服务类型"); cnames.put("serviceStatus", "服务状态"); + cnames.put("remark", "备注"); }else { //全部产妇 cnames.put("name", "姓名"); @@ -2345,6 +2349,7 @@ public class PatientFacade extends BaseServiceImpl { cnames.put("bTime", "建档日期"); cnames.put("phone", "联系方式"); cnames.put("cardNo", "身份证号码"); + cnames.put("remark", "备注"); } OutputStream out = response.getOutputStream(); ExcelUtil.toExcel(out, datas, cnames); 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 30dc9d1..247e253 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 @@ -108,6 +108,16 @@ public class QuanChanResult implements IBasicResultConvert> { QuanChanResult chanResult = new QuanChanResult(); chanResult.setVcCardNo(patients.getVcCardNo()); chanResult.setCardNo(patients.getCardNo()); + chanResult.setRemark(patients.getMremark()); chanResult.setYi("-"); chanResult.setEr("-"); @@ -224,6 +225,7 @@ public class QuanChanPatientWorker implements Callable > { try { if (StringUtils.isNotEmpty(patients.getSource())) { Patients pat = patientsService.findOnePatientById(patients.getSource()); + chanResult.setRemark(pat.getMremark()); chanResult.setFirstBH(organizationService.getOrganization(Integer.valueOf(pat.getHospitalId())).getName()); } else { chanResult.setFirstBH(organizationService.getOrganization(Integer.valueOf(patients.getHospitalId())).getName()); diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/worker/QuanPatientWorker.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/worker/QuanPatientWorker.java index 4d14d76..7d86c88 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/worker/QuanPatientWorker.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/worker/QuanPatientWorker.java @@ -77,6 +77,7 @@ public class QuanPatientWorker implements Callable> { QuanPatientsResult quanPatientsResult = new QuanPatientsResult(); quanPatientsResult.setVcCardNo(patients.getVcCardNo()); quanPatientsResult.setCardNo(patients.getCardNo()); + quanPatientsResult.setRemark(patients.getMremark()); quanPatientsResult.setYi("-"); quanPatientsResult.setEr("-"); -- 1.8.3.1