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 908bfdf..2ebbc71 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 @@ -54,7 +54,7 @@ public class ExcelUtil WritableCellFormat title1 = new WritableCellFormat(font1); title1.setAlignment(jxl.format.Alignment.CENTRE); - WritableFont contentFont = new WritableFont(WritableFont.ARIAL, 12, WritableFont.NO_BOLD, false, UnderlineStyle.NO_UNDERLINE, Colour.BLACK); + WritableFont contentFont = new WritableFont(WritableFont.ARIAL, 10, WritableFont.NO_BOLD, false, UnderlineStyle.NO_UNDERLINE, Colour.BLACK); WritableCellFormat contentFormt = new WritableCellFormat(contentFont); contentFormt.setAlignment(jxl.format.Alignment.CENTRE); diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/BookbuildingController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/BookbuildingController.java index 2522ce8..ed5442b 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/BookbuildingController.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/BookbuildingController.java @@ -209,7 +209,7 @@ public class BookbuildingController extends BaseController{ @RequestMapping(value = "/exportChanReport", method = RequestMethod.GET) -// @TokenRequired + @TokenRequired public void exportChanReport(HttpServletRequest httpServletRequest,HttpServletResponse httpServletResponse, @RequestParam(required = false) String exDateStart, @RequestParam(required = false) String exDateEnd, @@ -226,8 +226,8 @@ public class BookbuildingController extends BaseController{ @RequestParam(required = false) String doctorNo, @RequestParam(required = false) Integer page, @RequestParam(required = false) Integer limit){ -// LoginContext loginState = (LoginContext) httpServletRequest.getAttribute("loginContext"); - bookbuildingFacade.exportChanReport(1, httpServletResponse, + LoginContext loginState = (LoginContext) httpServletRequest.getAttribute("loginContext"); + bookbuildingFacade.exportChanReport(loginState.getId(), httpServletResponse, exDateStart, exDateEnd, name, diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BookbuildingFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BookbuildingFacade.java index 8a2d185..02a7179 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BookbuildingFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BookbuildingFacade.java @@ -1231,8 +1231,7 @@ public class BookbuildingFacade { String hiv, String hcv, String doctorNo) { -// String hospitalId = autoMatchFacade.getHospitalId(userId); - String hospitalId = "242"; + String hospitalId = autoMatchFacade.getHospitalId(userId); String sql = "SELECT A.EXAMINE_DATE,\n" + " A.NAME,\n" + " A.AGE,\n" + @@ -1343,7 +1342,7 @@ public class BookbuildingFacade { cnames.put("NOW_WEEKS", "孕周"); cnames.put("TEL_NO", "联系方式"); cnames.put("SUGGESTION", "处理意见"); - cnames.put("HBEAG", "乙肝表面抗原"); + cnames.put("HBSAG", "乙肝表面抗原"); cnames.put("HBSAB", "乙肝表面抗体"); cnames.put("HBEAG", "乙肝e抗原"); cnames.put("HBEAB", "乙肝e抗体");