shiyang / regional-platform

Download as
Browse Code »

Commit 43835dee3ef3f99caa2eab97ab9e8002f19ca31b

Authored by liquanyu
1 parent bfda2dae8b
Exists in master and in 1 other branch nobuildprocess

code update

Showing 3 changed files with 6 additions and 7 deletions

platform-common/src/main/java/com/lyms/platform/common/utils/ExcelUtil.java View file @ 43835de
... ... @@ -54,7 +54,7 @@
54 54 WritableCellFormat title1 = new WritableCellFormat(font1);
55 55 title1.setAlignment(jxl.format.Alignment.CENTRE);
56 56  
57   - WritableFont contentFont = new WritableFont(WritableFont.ARIAL, 12, WritableFont.NO_BOLD, false, UnderlineStyle.NO_UNDERLINE, Colour.BLACK);
  57 + WritableFont contentFont = new WritableFont(WritableFont.ARIAL, 10, WritableFont.NO_BOLD, false, UnderlineStyle.NO_UNDERLINE, Colour.BLACK);
58 58 WritableCellFormat contentFormt = new WritableCellFormat(contentFont);
59 59 contentFormt.setAlignment(jxl.format.Alignment.CENTRE);
60 60  
platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/BookbuildingController.java View file @ 43835de
... ... @@ -209,7 +209,7 @@
209 209  
210 210  
211 211 @RequestMapping(value = "/exportChanReport", method = RequestMethod.GET)
212   -// @TokenRequired
  212 + @TokenRequired
213 213 public void exportChanReport(HttpServletRequest httpServletRequest,HttpServletResponse httpServletResponse,
214 214 @RequestParam(required = false) String exDateStart,
215 215 @RequestParam(required = false) String exDateEnd,
... ... @@ -226,8 +226,8 @@
226 226 @RequestParam(required = false) String doctorNo,
227 227 @RequestParam(required = false) Integer page,
228 228 @RequestParam(required = false) Integer limit){
229   -// LoginContext loginState = (LoginContext) httpServletRequest.getAttribute("loginContext");
230   - bookbuildingFacade.exportChanReport(1, httpServletResponse,
  229 + LoginContext loginState = (LoginContext) httpServletRequest.getAttribute("loginContext");
  230 + bookbuildingFacade.exportChanReport(loginState.getId(), httpServletResponse,
231 231 exDateStart,
232 232 exDateEnd,
233 233 name,
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BookbuildingFacade.java View file @ 43835de
... ... @@ -1231,8 +1231,7 @@
1231 1231 String hiv,
1232 1232 String hcv,
1233 1233 String doctorNo) {
1234   -// String hospitalId = autoMatchFacade.getHospitalId(userId);
1235   - String hospitalId = "242";
  1234 + String hospitalId = autoMatchFacade.getHospitalId(userId);
1236 1235 String sql = "SELECT A.EXAMINE_DATE,\n" +
1237 1236 " A.NAME,\n" +
1238 1237 " A.AGE,\n" +
... ... @@ -1343,7 +1342,7 @@
1343 1342 cnames.put("NOW_WEEKS", "孕周");
1344 1343 cnames.put("TEL_NO", "联系方式");
1345 1344 cnames.put("SUGGESTION", "处理意见");
1346   - cnames.put("HBEAG", "乙肝表面抗原");
  1345 + cnames.put("HBSAG", "乙肝表面抗原");
1347 1346 cnames.put("HBSAB", "乙肝表面抗体");
1348 1347 cnames.put("HBEAG", "乙肝e抗原");
1349 1348 cnames.put("HBEAB", "乙肝e抗体");