From f1d345f02172b1e1396bc8aaa443b8df737f8d58 Mon Sep 17 00:00:00 2001 From: liquanyu Date: Wed, 14 Nov 2018 10:42:06 +0800 Subject: [PATCH] =?UTF-8?q?=E7=AD=9B=E6=9F=A5=E7=BB=9F=E8=AE=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/lyms/platform/common/utils/ExcelUtil.java | 2 +- .../com/lyms/platform/operate/web/facade/SieveFacade.java | 13 ++++++------- 2 files changed, 7 insertions(+), 8 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 e0f945f..adf2e73 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 @@ -386,7 +386,7 @@ public class ExcelUtil Label label = new Label(0, 0, titleName,titleFormt); ws.addCell(label); - Label label1 = new Label(1, 1, h1,h1Formt); + Label label1 = new Label(1, 0, h1,h1Formt); ws.addCell(label1); int arrayIndex = 0; diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/SieveFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/SieveFacade.java index eb0464d..f5e6b6a 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/SieveFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/SieveFacade.java @@ -1596,9 +1596,12 @@ public class SieveFacade { public void exportDiagnosisReportExcl(CqSieveQueryRequest cqSieveQueryRequest, Integer userId, HttpServletResponse response) { try { + String hospitalId = autoMatchFacade.getHospitalId(userId); + + Organization org = organizationService.getOrganization(Integer.parseInt(hospitalId)); String titleName = "产前诊断及新生儿疾病筛查工作情况表"; - String h1 = "填报单位（签章）：威海市妇幼保健院 "; + String h1 = "填报单位（签章）： "+org.getName(); String[] dates = null; if (StringUtils.isNotEmpty(cqSieveQueryRequest.getTime())) { dates = cqSieveQueryRequest.getTime().split(" - "); @@ -1825,6 +1828,8 @@ public class SieveFacade { dataMap.put("hjDiaExcCount",String.valueOf(hjDiaExcCount)); dataMap.put("hjStopCount",String.valueOf(hjStopCount)); + list.add(dataMap); + } sumDia(list); return list; @@ -1910,7 +1915,6 @@ public class SieveFacade { Map dataMap = new LinkedHashMap<>(); dataMap.put("areaName","合计"); dataMap.put("sieveCount",String.valueOf(sieveCount)); - dataMap.put("sieveCount",String.valueOf(sieveCount)); dataMap.put("st21Count",String.valueOf(st21Count)); dataMap.put("st1813Count",String.valueOf(st1813Count)); dataMap.put("sjqxCount",String.valueOf(sjqxCount)); @@ -1918,7 +1922,6 @@ public class SieveFacade { dataMap.put("disCount",String.valueOf(disCount)); dataMap.put("disExcCount",String.valueOf(disExcCount)); dataMap.put("disStopCount",String.valueOf(disStopCount)); - dataMap.put("csDiaCount",String.valueOf(csDiaCount)); dataMap.put("csClCount",String.valueOf(csClCount)); dataMap.put("csDzCount",String.valueOf(csDzCount)); @@ -1930,16 +1933,12 @@ public class SieveFacade { dataMap.put("csJxCount",String.valueOf(csJxCount)); dataMap.put("ysDiaCount",String.valueOf(ysDiaCount)); dataMap.put("csDiaExcCount",String.valueOf(csDiaExcCount)); - dataMap.put("rmDiaCount",String.valueOf(rmDiaCount)); dataMap.put("rmDiaExcCount",String.valueOf(rmDiaExcCount)); - dataMap.put("teDiaCount",String.valueOf(teDiaCount)); dataMap.put("teDiaExcCount",String.valueOf(teDiaExcCount)); - dataMap.put("qtDiaCount",String.valueOf(qtDiaCount)); dataMap.put("qtDiaExcCount",String.valueOf(qtDiaExcCount)); - dataMap.put("hjDiaCount",String.valueOf(hjDiaCount)); dataMap.put("hjDiaExcCount",String.valueOf(hjDiaExcCount)); dataMap.put("hjStopCount",String.valueOf(hjStopCount)); -- 1.8.3.1