liquanyu / regional-platform

Download as
Browse Code »

Commit e4e9dc8649cf0bbe7516a75213e4fb2daa8d3fdf

Authored by wangbo
1 parent d8893057d8
Exists in master and in 1 other branch dev

update

Showing 3 changed files with 180 additions and 194 deletions

platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/MatDeliverController.java View file @ e4e9dc8
... ... @@ -45,7 +45,7 @@
45 45 * Created by Administrator on 2016/6/17 0017.
46 46 */
47 47 @Controller
48   -public class MatDeliverController extends BaseController{
  48 +public class MatDeliverController extends BaseController {
49 49  
50 50 @Autowired
51 51 private MatDeliverFacade matDeliverFacade;
52 52  
53 53  
54 54  
55 55  
56 56  
57 57  
58 58  
59 59  
60 60  
61 61  
62 62  
63 63  
64 64  
65 65  
66 66  
67 67  
68 68  
69 69  
... ... @@ -73,73 +73,70 @@
73 73 * 查询分娩记录
74 74 *
75 75 * @param deliverQueryRequest 分娩记录查询请求
76   - *
77   - * @return 返回
  76 + * @return 返回
78 77 */
79   - @RequestMapping(value = "/matmanger",method = RequestMethod.GET)
  78 + @RequestMapping(value = "/matmanger", method = RequestMethod.GET)
80 79 @ResponseBody
81 80 @TokenRequired
82   - public BaseResponse queryMatDeliver(@Valid MatDeliverQueryRequest deliverQueryRequest,HttpServletRequest request) {
  81 + public BaseResponse queryMatDeliver(@Valid MatDeliverQueryRequest deliverQueryRequest, HttpServletRequest request) {
83 82 LoginContext loginState = (LoginContext) request.getAttribute("loginContext");
84   - return matDeliverFacade.queryMatDeliver(deliverQueryRequest,loginState.getId());
  83 + return matDeliverFacade.queryMatDeliver(deliverQueryRequest, loginState.getId());
85 84 }
86 85  
87 86 /**
88   - *
89 87 * 增加分娩记录
90 88 *
91 89 * @param deliverAddRequest 增加分娩记录
92   - *
93 90 * @return 返回
94 91 */
95   - @RequestMapping(value = "/matdel",method = RequestMethod.POST)
  92 + @RequestMapping(value = "/matdel", method = RequestMethod.POST)
96 93 @ResponseBody
97 94 @TokenRequired
98   - public BaseResponse addOneMatDeliver(@Valid @RequestBody MatDeliverAddRequest deliverAddRequest,HttpServletRequest request){
  95 + public BaseResponse addOneMatDeliver(@Valid @RequestBody MatDeliverAddRequest deliverAddRequest, HttpServletRequest request) {
99 96 LoginContext loginState = (LoginContext) request.getAttribute("loginContext");
100 97 BaseResponse baseResponse = matDeliverFacade.addOrUpdateMatDeliver(deliverAddRequest, loginState.getId());
101   - if(StringUtils.isNotEmpty(deliverAddRequest.getCouponCode())){
  98 + if (StringUtils.isNotEmpty(deliverAddRequest.getCouponCode())) {
102 99 baseResponse.setObject(couponService.getPatientsInfoByCode(deliverAddRequest.getCouponCode()));
103 100 }
104 101 return baseResponse;
105 102 }
  103 +
106 104 /**
107 105 * 删除一条删除记录
108 106 *
109 107 * @param id 删除分娩记录
110   - *
111 108 * @return 返回
112 109 */
113   - @RequestMapping(value = "/matdel",method = RequestMethod.DELETE)
  110 + @RequestMapping(value = "/matdel", method = RequestMethod.DELETE)
114 111 @ResponseBody
115 112 @TokenRequired
116   - public BaseResponse delOneMatDeliver(@RequestParam("id") String id,HttpServletRequest httpServletRequest) {
117   - if(StringUtils.isEmpty(id)){
118   - return new BaseResponse().setErrorcode(ErrorCodeConstants.PARAMETER_ERROR).setErrormsg("id不能为空");
  113 + public BaseResponse delOneMatDeliver(@RequestParam("id") String id, HttpServletRequest httpServletRequest) {
  114 + if (StringUtils.isEmpty(id)) {
  115 + return new BaseResponse().setErrorcode(ErrorCodeConstants.PARAMETER_ERROR).setErrormsg("id不能为空");
119 116 }
120 117 LoginContext loginState = (LoginContext) httpServletRequest.getAttribute("loginContext");
121   - return matDeliverFacade.delOneMatDeliver(id,loginState.getId());
  118 + return matDeliverFacade.delOneMatDeliver(id, loginState.getId());
122 119 }
123 120  
124 121 /**
125 122 * 查看某条分娩记录
126 123 *
127 124 * @param id 删除记录id
128   - *
129 125 * @return 返回
130 126 */
131   - @RequestMapping(value = "/matdel",method = RequestMethod.GET)
  127 + @RequestMapping(value = "/matdel", method = RequestMethod.GET)
132 128 @ResponseBody
133 129 @TokenRequired
134 130 public BaseResponse findOneMatDeliver(@RequestParam("id") String id) {
135   - if(StringUtils.isEmpty(id)){
136   - return new BaseResponse().setErrorcode(ErrorCodeConstants.PARAMETER_ERROR).setErrormsg("id不能为空");
  131 + if (StringUtils.isEmpty(id)) {
  132 + return new BaseResponse().setErrorcode(ErrorCodeConstants.PARAMETER_ERROR).setErrormsg("id不能为空");
137 133 }
138 134 return matDeliverFacade.findOneMatDeliver(id);
139 135 }
  136 +
140 137 @RequestMapping(method = RequestMethod.GET, value = "/matdel/getenums")
141 138 @ResponseBody
142   - public BaseResponse getEnums(){
  139 + public BaseResponse getEnums() {
143 140 return matDeliverFacade.getEnums();
144 141 }
145 142  
... ... @@ -151,6 +148,7 @@
151 148 @TokenRequired
152 149 @ResponseBody
153 150 @RequestMapping(value = "childbirthManager", method = RequestMethod.POST)
  151 + //@RequestBody
154 152 public BaseListResponse childbirthManager(HttpServletRequest httpServletRequest, @RequestBody ChildbirthManagerRequest childbirthManagerRequest) {
155 153  
156 154 BaseListResponse baseListResponse;
... ... @@ -195,8 +193,8 @@
195 193 for (Object temp : childbirthManagerResult.getData()) {
196 194 Organization og = organizationService.getOrganization(Integer.valueOf(hospitalId));
197 195  
198   - if(og!=null&&"2".equals(og.getCityId())&&childbirthManagerRequest.getShowDetail()==1){//需要隐藏姓名、地址
199   - if(temp instanceof ChildbirthManagerQueryModel){
  196 + if (og != null && "2".equals(og.getCityId()) && childbirthManagerRequest.getShowDetail() == 1) {//需要隐藏姓名、地址
  197 + if (temp instanceof ChildbirthManagerQueryModel) {
200 198 ChildbirthManagerQueryModel result = (ChildbirthManagerQueryModel) temp;
201 199 //出生医学证明卫纪委修改分娩记录可以查看到孕妇名称2018-04-28
202 200 // result.setName(com.lyms.platform.common.utils.StringUtils.encryName(result.getName()));
203 201  
... ... @@ -291,13 +289,13 @@
291 289 try {
292 290 childbirthManagerRequest.setOperatorId(((LoginContext) httpServletRequest.getAttribute("loginContext")).getId());
293 291  
294   - Map<String, String> query = childbirthManagerRequest.getInitQueryMap();
  292 + Map<String, String> query = childbirthManagerRequest.getInitQueryMap();
295 293  
296 294 String queryStr = "";
297 295 for (String key : query.keySet()) {
298 296 queryStr += key + ",";
299 297 }
300   - childbirthManagerRequest.setInitQuery(queryStr+"fmTime");
  298 + childbirthManagerRequest.setInitQuery(queryStr + "fmTime");
301 299  
302 300 childbirthManagerRequest.setExcel(true);
303 301 // 这里返回的结果必然是这个泛型，之所以query返回的结果集没有用泛型是为了更好的传递数据
304 302  
305 303  
306 304  
... ... @@ -309,25 +307,25 @@
309 307  
310 308 Patients patients = patientsService.findOnePatientById(queryModel.getPatientId());
311 309 Map<String, Object> map = new LinkedHashMap<>();
312   - map.put("num",String.valueOf(num));
313   - map.put("dueDate",queryModel.getDueDate());
314   - map.put("fmTime",queryModel.getFmTime());
315   - if(StringUtils.isNotEmpty(queryModel.getBhnum())){
316   - map.put("zyNo"," "+queryModel.getBhnum());
317   - }else {
  310 + map.put("num", String.valueOf(num));
  311 + map.put("dueDate", queryModel.getDueDate());
  312 + map.put("fmTime", queryModel.getFmTime());
  313 + if (StringUtils.isNotEmpty(queryModel.getBhnum())) {
  314 + map.put("zyNo", " " + queryModel.getBhnum());
  315 + } else {
318 316 map.put("zyNo", "-");
319 317 }
320   - map.put("name",queryModel.getName());
  318 + map.put("name", queryModel.getName());
321 319 map.put("age", String.valueOf(queryModel.getAge()));
322 320 //居住地
323 321 String liveAddress = CommonsHelper.getResidence(patients.getProvinceId(), patients.getCityId(),
324 322 patients.getAreaId(), patients.getStreetId(), patients.getAddress(), basicConfigService);
325   - map.put("liveAddress",liveAddress);
  323 + map.put("liveAddress", liveAddress);
326 324 String regAddress = CommonsHelper.getResidence(patients.getProvinceRegisterId(),
327 325 patients.getCityRegisterId(), patients.getAreaRegisterId(), patients.getStreetRegisterId(), patients.getAddressRegister(), basicConfigService);
328 326  
329   - map.put("regAddress",regAddress);
330   - map.put("phone",queryModel.getPhone());
  327 + map.put("regAddress", regAddress);
  328 + map.put("phone", queryModel.getPhone());
331 329  
332 330 /* AntExChuQuery antExChuQuery = new AntExChuQuery();
333 331 antExChuQuery.setYn(YnEnums.YES.getId());
334 332  
335 333  
336 334  
337 335  
338 336  
339 337  
340 338  
341 339  
342 340  
343 341  
344 342  
345 343  
346 344  
347 345  
348 346  
349 347  
... ... @@ -345,89 +343,87 @@
345 343 map.put("yc","");
346 344 map.put("cc","");
347 345 }*/
348   - if(null == queryModel.getGravidity()){
349   - map.put("yc","");
350   - }else{
351   - map.put("yc",String.valueOf(queryModel.getGravidity()));
  346 + if (null == queryModel.getGravidity()) {
  347 + map.put("yc", "");
  348 + } else {
  349 + map.put("yc", String.valueOf(queryModel.getGravidity()));
352 350 }
353   - if(null == queryModel.getDueCount()){
354   - map.put("cc","");
355   - }else{
356   - map.put("cc",String.valueOf(queryModel.getDueCount()));
  351 + if (null == queryModel.getDueCount()) {
  352 + map.put("cc", "");
  353 + } else {
  354 + map.put("cc", String.valueOf(queryModel.getDueCount()));
357 355 }
358   - map.put("week",queryModel.getDueWeek());
  356 + map.put("week", queryModel.getDueWeek());
359 357 HighScoreResult highScoreResult = antenatalExaminationFacade.findLastRisk(patients.getPid(), false);
360 358 //妊娠期高危因素
361 359 map.put("risk", highScoreResult.gethighRiskStr());
362 360 String a = "";
363 361 String m = "";
364 362 String y = "";
365   - Map<String,Object> amy = queryModel.getMyzd();
366   - if(null != amy && amy.size() > 0){
367   - if(null != amy.get("0")){
368   - if(true == (boolean)amy.get("0")){
  363 + Map<String, Object> amy = queryModel.getMyzd();
  364 + if (null != amy && amy.size() > 0) {
  365 + if (null != amy.get("0")) {
  366 + if (true == (boolean) amy.get("0")) {
369 367 a = "√";
370 368 }
371 369 }
372   - if(null != amy.get("1")){
373   - if(true == (boolean)amy.get("1")){
  370 + if (null != amy.get("1")) {
  371 + if (true == (boolean) amy.get("1")) {
374 372 m = "√";
375 373 }
376 374 }
377   - if(null != amy.get("2")){
378   - if(true == (boolean)amy.get("2")){
  375 + if (null != amy.get("2")) {
  376 + if (true == (boolean) amy.get("2")) {
379 377 y = "√";
380 378 }
381 379 }
382 380 }
383   - map.put("A",a);
384   - map.put("M",m);
385   - map.put("Y",y);
  381 + map.put("A", a);
  382 + map.put("M", m);
  383 + map.put("Y", y);
386 384 String aModel1 = "";
387 385 String aModel2 = "";
388 386 String aModel3 = "";
389 387 String aModel4 = "";
390 388 //镇痛方式
391   - if("1".equals(queryModel.getZgnmz())){
  389 + if ("1".equals(queryModel.getZgnmz())) {
392 390 aModel1 = "√";
393 391 }
394   - if("1".equals(queryModel.getDlfm())){
  392 + if ("1".equals(queryModel.getDlfm())) {
395 393 aModel2 = "√";
396 394 }
397   - if("1".equals(queryModel.getFmzty())){
  395 + if ("1".equals(queryModel.getFmzty())) {
398 396 aModel3 = "√";
399 397 }
400   - if("1".equals(queryModel.getZypbfm())){
  398 + if ("1".equals(queryModel.getZypbfm())) {
401 399 aModel4 = "√";
402 400 }
403   - map.put("aModel1",aModel1);
404   - map.put("aModel2",aModel2);
405   - map.put("aModel3",aModel3);
406   - map.put("aModel4",aModel4);
  401 + map.put("aModel1", aModel1);
  402 + map.put("aModel2", aModel2);
  403 + map.put("aModel3", aModel3);
  404 + map.put("aModel4", aModel4);
407 405  
408 406 String yidu = "";
409 407 String erdu = "";
410 408 String sandu = "";
411 409 String ceqie = "";
412   - if(null != queryModel.getSiLielevel()){
413   - if(1 == queryModel.getSiLielevel()){
  410 + if (null != queryModel.getSiLielevel()) {
  411 + if (1 == queryModel.getSiLielevel()) {
414 412 yidu = "√";
415   - }
416   - else if(2 == queryModel.getSiLielevel()){
  413 + } else if (2 == queryModel.getSiLielevel()) {
417 414 erdu = "√";
418   - }
419   - else if(3 == queryModel.getSiLielevel()){
  415 + } else if (3 == queryModel.getSiLielevel()) {
420 416 sandu = "√";
421 417 }
422 418 }
423 419  
424   - map.put("yidu",yidu);
425   - map.put("erdu",erdu);
426   - map.put("sandu",sandu);
427   - if("2".equals(queryModel.getIncision())){
  420 + map.put("yidu", yidu);
  421 + map.put("erdu", erdu);
  422 + map.put("sandu", sandu);
  423 + if ("2".equals(queryModel.getIncision())) {
428 424 ceqie = "√";
429 425 }
430   - map.put("ceqie",ceqie);
  426 + map.put("ceqie", ceqie);
431 427 //map.put("perinealCondition",queryModel.getPerinealCondition() == null ? "" : queryModel.getPerinealCondition());
432 428 map.put("fetalPosition", queryModel.getFetalPosition() == null ? "" : queryModel.getFetalPosition());
433 429  
434 430  
435 431  
436 432  
437 433  
438 434  
439 435  
440 436  
441 437  
442 438  
443 439  
444 440  
445 441  
446 442  
447 443  
448 444  
449 445  
450 446  
451 447  
452 448  
453 449  
454 450  
455 451  
456 452  
457 453  
458 454  
459 455  
460 456  
461 457  
462 458  
... ... @@ -438,135 +434,119 @@
438 434 String reslult5 = "";
439 435 String deliveryMode = queryModel.getDeliveryMode();
440 436 String deliveryMode1 = queryModel.getDeliveryMode1();
441   - if (deliveryMode != null && deliveryMode.contains("顺产"))
442   - {
  437 + if (deliveryMode != null && deliveryMode.contains("顺产")) {
443 438 reslult1 = "√";
444 439 }
445   - if(deliveryMode1 != null && deliveryMode1.contains("胎吸")){
  440 + if (deliveryMode1 != null && deliveryMode1.contains("胎吸")) {
446 441 reslult2 = "√";
447   - }
448   - else if(deliveryMode1 != null && deliveryMode1.contains("自由体位")){
  442 + } else if (deliveryMode1 != null && deliveryMode1.contains("自由体位")) {
449 443 reslult3 = "√";
450   - }
451   - else if(deliveryMode1 != null && deliveryMode1.contains("臀牵引")){
  444 + } else if (deliveryMode1 != null && deliveryMode1.contains("臀牵引")) {
452 445 reslult4 = "√";
453 446 }
454   - if (deliveryMode != null && deliveryMode.contains("剖宫产"))
455   - {
  447 + if (deliveryMode != null && deliveryMode.contains("剖宫产")) {
456 448 reslult5 = "√";
457 449 }
458   - map.put("deliveryMode1",reslult1);
  450 + map.put("deliveryMode1", reslult1);
459 451 map.put("deliveryMode2", reslult2);
460 452 map.put("deliveryMode3", reslult3);
461   - map.put("deliveryMode4",reslult4);
462   - map.put("deliveryMode5",reslult5);
463   - map.put("thloseBloodL",queryModel.getThloseBloodL() == null ? "" : String.valueOf(queryModel.getThloseBloodL()));
464   - map.put("sex",queryModel.getSex());
465   - map.put("height",queryModel.getBabyHeight());
  453 + map.put("deliveryMode4", reslult4);
  454 + map.put("deliveryMode5", reslult5);
  455 + map.put("thloseBloodL", queryModel.getThloseBloodL() == null ? "" : String.valueOf(queryModel.getThloseBloodL()));
  456 + map.put("sex", queryModel.getSex());
  457 + map.put("height", queryModel.getBabyHeight());
466 458 int nu = 0;
467 459 String weight = "";
468   - if (StringUtils.isNotEmpty(queryModel.getBabyWeight()) && queryModel.getBabyWeight().contains(","))
469   - {
  460 + if (StringUtils.isNotEmpty(queryModel.getBabyWeight()) && queryModel.getBabyWeight().contains(",")) {
470 461 nu = 1;
471 462 String arrs[] = queryModel.getBabyWeight().split(",");
472   - for (int i = 0 ; i < arrs.length ; i++)
473   - {
  463 + for (int i = 0; i < arrs.length; i++) {
474 464 try {
475 465 String w = String.valueOf(Double.parseDouble(arrs[i]) * 1000);
476 466 int dex = w.indexOf(".");
477   - if(-1 == dex){
478   - weight+=w+"";
479   - }else{
480   - weight+=w.substring(0,dex)+"";
  467 + if (-1 == dex) {
  468 + weight += w + "";
  469 + } else {
  470 + weight += w.substring(0, dex) + "";
481 471 }
482 472 //weight+=(Double.parseDouble(arrs[i]) * 1000)+"";
  473 + } catch (Exception E) {
  474 + weight += arrs[i];
483 475 }
484   - catch (Exception E)
485   - {
486   - weight+=arrs[i];
487   - }
488   - if (i != arrs.length -1)
489   - {
  476 + if (i != arrs.length - 1) {
490 477 weight += ",";
491 478 }
492 479  
493 480 }
494 481 }
495   - if(0 == nu && !"-".equals(queryModel.getBabyWeight())){
496   - if(StringUtils.isNotEmpty(queryModel.getBabyWeight())){
  482 + if (0 == nu && !"-".equals(queryModel.getBabyWeight())) {
  483 + if (StringUtils.isNotEmpty(queryModel.getBabyWeight())) {
497 484 String w = String.valueOf(Double.parseDouble(queryModel.getBabyWeight()) * 1000);
498 485 int dex = w.indexOf(".");
499   - if(-1 == dex){
500   - weight=w+"";
501   - }else{
502   - weight=w.substring(0,dex)+"";
  486 + if (-1 == dex) {
  487 + weight = w + "";
  488 + } else {
  489 + weight = w.substring(0, dex) + "";
503 490 }
504 491 }
505 492 //weight = (Double.parseDouble(queryModel.getBabyWeight()) * 1000)+"";
506   - }
507   - else if(0 == nu && "-".equals(queryModel.getBabyWeight()) && StringUtils.isNotEmpty(queryModel.getBabyWeight())){
  493 + } else if (0 == nu && "-".equals(queryModel.getBabyWeight()) && StringUtils.isNotEmpty(queryModel.getBabyWeight())) {
508 494 weight = queryModel.getBabyWeight();
509 495 }
510   - map.put("weight",weight);
  496 + map.put("weight", weight);
511 497 //评分
512   - map.put("apgarScorePf1",queryModel.getApgarScorePf1());
513   - map.put("apgarScorePf5",queryModel.getApgarScorePf5());
514   - map.put("apgarScorePf10",queryModel.getApgarScorePf10());
  498 + map.put("apgarScorePf1", queryModel.getApgarScorePf1());
  499 + map.put("apgarScorePf5", queryModel.getApgarScorePf5());
  500 + map.put("apgarScorePf10", queryModel.getApgarScorePf10());
515 501  
516   - map.put("malformation",queryModel.getMalformation() == null ? "" : queryModel.getMalformation());
  502 + map.put("malformation", queryModel.getMalformation() == null ? "" : queryModel.getMalformation());
517 503 //queryModel.getTireNumber()-queryModel.getLivingNumber()
518   - map.put("sc",queryModel.getPregnancyOut());//死产
  504 + map.put("sc", queryModel.getPregnancyOut());//死产
519 505  
520 506 int bn = 0;
521 507 String jcsc = "";
522   - if (queryModel.getContactM() != null && queryModel.getContactM().contains(","))
523   - {
  508 + if (queryModel.getContactM() != null && queryModel.getContactM().contains(",")) {
524 509 bn = 1;
525 510 String[] arrs = queryModel.getContactM().split(",");
526   - for (int i = 0 ;i < arrs.length ; i++)
527   - {
528   - if ("1".equals(arrs[i]))
529   - {
  511 + for (int i = 0; i < arrs.length; i++) {
  512 + if ("1".equals(arrs[i])) {
530 513 jcsc += "√";
531 514  
532   - }
533   - else
534   - {
  515 + } else {
535 516 jcsc += "-";
536 517 }
537   - if (i != arrs.length -1)
538   - {
  518 + if (i != arrs.length - 1) {
539 519 jcsc += ",";
540 520 }
541 521 }
542 522 }
543   - if(bn == 0 && !"-".equals(queryModel.getContactM())){
  523 + if (bn == 0 && !"-".equals(queryModel.getContactM())) {
544 524 jcsc += "√";
545   - }else if(bn == 0 && "-".equals(queryModel.getContactM())){
  525 + } else if (bn == 0 && "-".equals(queryModel.getContactM())) {
546 526 jcsc += queryModel.getContactM();
547 527 }
548   - map.put("jzsx",jcsc);//皮肤接触及早吸吮≥30分钟
549   - map.put("xj","-");//宣教
550   - map.put("jsz",queryModel.getDeliverDoctor());//接生者
  528 + map.put("jzsx", jcsc);//皮肤接触及早吸吮≥30分钟
  529 + map.put("xj", "-");//宣教
  530 + map.put("jsz", queryModel.getDeliverDoctor());//接生者
551 531 //科室
552 532 String department1 = "";
553 533 String department2 = "";
554   - if("1".equals(queryModel.getDepartment())){
555   - department1= "√";
556   - }else if("2".equals(queryModel.getDepartment())){
557   - department2= "√";
  534 + if ("1".equals(queryModel.getDepartment())) {
  535 + department1 = "√";
  536 + } else if ("2".equals(queryModel.getDepartment())) {
  537 + department2 = "√";
558 538 }
559   - map.put("department1",department1);
560   - map.put("department2",department2);
  539 + map.put("department1", department1);
  540 + map.put("department2", department2);
561 541  
562   - map.put("remark",patients.getMremark() == null ? "" : patients.getMremark());//备注42列
  542 + map.put("remark", patients.getMremark() == null ? "" : patients.getMremark());//备注42列
563 543 num++;
564 544 list.add(map);
565 545 }
566 546  
567 547 httpServletResponse.setContentType("application/force-download");
568 548 httpServletResponse.setHeader("Content-Disposition", "attachment;filename=" + new String(("分娩登记表.xls").getBytes("UTF-8"), "ISO-8859-1"));
569   - String path = this.getClass().getResource("/").getPath()+ "fm_record.xls";
  549 + String path = this.getClass().getResource("/").getPath() + "fm_record.xls";
570 550 ExcelUtil.writeWhExclFile(path, httpServletResponse.getOutputStream(), list);
571 551  
572 552 } catch (Exception e) {
... ... @@ -575,7 +555,6 @@
575 555 }
576 556  
577 557  
578   -
579 558 /**
580 559 * @auther HuJiaqi
581 560 * @createTime 2016年12月07日 17时50分
... ... @@ -588,7 +567,7 @@
588 567 BaseListResponse baseListResponse;
589 568 try {
590 569 newBabyManagerRequest.setOperatorId(((LoginContext) httpServletRequest.getAttribute("loginContext")).getId());
591   - NewBabyManagerResult newBabyManagerResult = matDeliverFacade.newBabyManager(newBabyManagerRequest,getUserId(httpServletRequest));
  570 + NewBabyManagerResult newBabyManagerResult = matDeliverFacade.newBabyManager(newBabyManagerRequest, getUserId(httpServletRequest));
592 571 if (newBabyManagerResult.getErrorcode() != ErrorCodeConstants.SUCCESS) {
593 572 baseListResponse = new BaseListResponse().setErrorcode(newBabyManagerResult.getErrorcode()).setErrormsg(newBabyManagerResult.getErrormsg());
594 573 return baseListResponse;
... ... @@ -609,7 +588,7 @@
609 588 newBabyManagerRequest.setExcel(true);
610 589 // 这里返回的结果必然是这个泛型，之所以query返回的结果集没有用泛型是为了更好的传递数据
611 590 @SuppressWarnings("unchecked")
612   - List<NewBabyManagerQueryModel> newBabyManagerQueryModelList = matDeliverFacade.newBabyManager(newBabyManagerRequest,getUserId(httpServletRequest)).getData();
  591 + List<NewBabyManagerQueryModel> newBabyManagerQueryModelList = matDeliverFacade.newBabyManager(newBabyManagerRequest, getUserId(httpServletRequest)).getData();
613 592 List<Map<String, Object>> list = new ArrayList<>();
614 593 int num = 1;
615 594 for (NewBabyManagerQueryModel newBabyManagerQueryModel : newBabyManagerQueryModelList) {
616 595  
617 596  
... ... @@ -642,17 +621,16 @@
642 621 }
643 622  
644 623 Integer deformity = newBabyManagerQueryModel.getDeformity();
645   - map.put("jx",deformity == null ? "" : (deformity == 1 ? "是" : "否"));
  624 + map.put("jx", deformity == null ? "" : (deformity == 1 ? "是" : "否"));
646 625  
647 626 Patients patients = patientsService.findOnePatientById(newBabyManagerQueryModel.getPatientId());
648   - if (patients != null)
649   - {
  627 + if (patients != null) {
650 628  
651 629 //居住地
652 630 String liveAddress = CommonsHelper.getResidence(patients.getProvinceId(), patients.getCityId(),
653 631 patients.getAreaId(), patients.getStreetId(), patients.getAddress(), basicConfigService);
654 632  
655   - map.put("liveAddress",liveAddress);
  633 + map.put("liveAddress", liveAddress);
656 634  
657 635 //户籍地址
658 636 String addressRegister = CommonsHelper.getResidence(patients.getProvinceRegisterId(), patients.getCityRegisterId(),
659 637  
... ... @@ -669,11 +647,11 @@
669 647 //妊娠期高危因素
670 648 map.put("risk", highScoreResult.gethighRiskStr());
671 649  
672   - map.put("husbandName", patients.getHusbandName() == null ? "" : patients.getHusbandName());
673   - map.put("husbandPhone", patients.getHusbandPhone() == null ? "" : patients.getHusbandPhone());
  650 + map.put("husbandName", patients.getHusbandName() == null ? "" : patients.getHusbandName());
  651 + map.put("husbandPhone", patients.getHusbandPhone() == null ? "" : patients.getHusbandPhone());
674 652  
675   - map.put("yc",newBabyManagerQueryModel.getGravidity() == null ? "" : newBabyManagerQueryModel.getGravidity());
676   - map.put("cc",newBabyManagerQueryModel.getDueCount() == null ? "" : newBabyManagerQueryModel.getDueCount());
  653 + map.put("yc", newBabyManagerQueryModel.getGravidity() == null ? "" : newBabyManagerQueryModel.getGravidity());
  654 + map.put("cc", newBabyManagerQueryModel.getDueCount() == null ? "" : newBabyManagerQueryModel.getDueCount());
677 655  
678 656 // AntExChuQuery antExChuQuery = new AntExChuQuery();
679 657 // antExChuQuery.setYn(YnEnums.YES.getId());
680 658  
681 659  
682 660  
... ... @@ -686,15 +664,14 @@
686 664 // map.put("cc",antExChuModel.getProdTime() == null ? "" : antExChuModel.getProdTime());
687 665 //
688 666 // }
689   - map.put("ts",newBabyManagerQueryModel.getTireNumber() == null ? "" : newBabyManagerQueryModel.getTireNumber());
  667 + map.put("ts", newBabyManagerQueryModel.getTireNumber() == null ? "" : newBabyManagerQueryModel.getTireNumber());
690 668  
691   - if (StringUtils.isNotEmpty(patients.getFmHospital()))
692   - {
  669 + if (StringUtils.isNotEmpty(patients.getFmHospital())) {
693 670 Organization organization = organizationService.getOrganization(Integer.parseInt(patients.getFmHospital()));
694   - map.put("fmHospital",organization != null ? organization.getName() : "");
  671 + map.put("fmHospital", organization != null ? organization.getName() : "");
695 672 }
696 673  
697   - map.put("mremark", patients.getMremark() == null ? "" : patients.getMremark());
  674 + map.put("mremark", patients.getMremark() == null ? "" : patients.getMremark());
698 675 }
699 676 map.put("num", num);
700 677 list.add(map);
701 678  
702 679  
... ... @@ -710,23 +687,23 @@
710 687 header.put("babyWeight", "体重g");
711 688 header.put("fmDate", "出生时间(具体到分)");
712 689 header.put("addressRegister", "产妇户籍地");
713   - header.put("liveAddress","居住地");
  690 + header.put("liveAddress", "居住地");
714 691 header.put("postRest", "产后休养地址");
715 692 header.put("risk", "妊娠期高危因素");
716 693 header.put("mphone", "联系方式");
717 694 header.put("mcertNo", "母亲证件号");
718 695 header.put("husbandName", "丈夫姓名");
719 696 header.put("husbandPhone", "丈夫联系电话");
720   - header.put("yc","孕次");
721   - header.put("cc","产次");
722   - header.put("ts","胎数");
  697 + header.put("yc", "孕次");
  698 + header.put("cc", "产次");
  699 + header.put("ts", "胎数");
723 700 header.put("dueType", "分娩方式");
724 701 header.put("fmWeek", "分娩孕周");
725 702 header.put("jx", "外观是否正常");
726 703 header.put("deliverDoctor", "接生医生");
727 704 header.put("birthDays", "出生天数");
728 705 header.put("highRisk", "是否高危");
729   - header.put("fmHospital","接生医院");
  706 + header.put("fmHospital", "接生医院");
730 707 header.put("mremark", "备注");
731 708 httpServletResponse.setContentType("application/force-download");
732 709 httpServletResponse.setHeader("Content-Disposition", "attachment;filename=" + new String(("新生儿出生电子报告卡.xls").getBytes("UTF-8"), "ISO-8859-1"));
... ... @@ -738,6 +715,7 @@
738 715  
739 716 /**
740 717 * 育龄服务生孩统计
  718 + *
741 719 * @param request
742 720 * @param birth
743 721 * @return
744 722  
745 723  
... ... @@ -746,17 +724,18 @@
746 724 @ResponseBody
747 725 @RequestMapping(value = "getChildbearAgeCount", method = RequestMethod.GET)
748 726 public BaseObjectResponse getChildbearAgeCount(HttpServletRequest request,
749   - @RequestParam(required = false) String birth,
750   - @RequestParam(required = false) String hospitalId,
751   - @RequestParam(required = false) String proviceId,
752   - @RequestParam(required = false) String cityId,
753   - @RequestParam(required = false) String areaId) {
  727 + @RequestParam(required = false) String birth,
  728 + @RequestParam(required = false) String hospitalId,
  729 + @RequestParam(required = false) String proviceId,
  730 + @RequestParam(required = false) String cityId,
  731 + @RequestParam(required = false) String areaId) {
754 732 LoginContext loginState = (LoginContext) request.getAttribute("loginContext");
755   - return matDeliverFacade.getChildbearAgeCount(birth,loginState.getId(),hospitalId,proviceId,cityId,areaId);
  733 + return matDeliverFacade.getChildbearAgeCount(birth, loginState.getId(), hospitalId, proviceId, cityId, areaId);
756 734 }
757 735  
758 736 /**
759 737 * 育龄服务生孩统计导出
  738 + *
760 739 * @param request
761 740 * @param birth
762 741 * @return
... ... @@ -765,12 +744,12 @@
765 744 @ResponseBody
766 745 @RequestMapping(value = "exportChildbearAgeCount", method = RequestMethod.GET)
767 746 public void exportChildbearAgeCount(HttpServletRequest request,
768   - @RequestParam(required = false) String birth,
769   - @RequestParam(required = false) String hospitalId,
770   - @RequestParam(required = false) String proviceId,
771   - @RequestParam(required = false) String cityId,
772   - @RequestParam(required = false) String areaId,
773   - HttpServletResponse httpServletResponse) {
  747 + @RequestParam(required = false) String birth,
  748 + @RequestParam(required = false) String hospitalId,
  749 + @RequestParam(required = false) String proviceId,
  750 + @RequestParam(required = false) String cityId,
  751 + @RequestParam(required = false) String areaId,
  752 + HttpServletResponse httpServletResponse) {
774 753 LoginContext loginState = (LoginContext) request.getAttribute("loginContext");
775 754 matDeliverFacade.exportChildbearAgeCount(birth, loginState.getId(), hospitalId, proviceId, cityId, areaId, httpServletResponse);
776 755 }
... ... @@ -778,6 +757,7 @@
778 757  
779 758 /**
780 759 * 助产机构报表
  760 + *
781 761 * @param request
782 762 * @param time
783 763 * @param hospitalId
784 764  
... ... @@ -789,18 +769,19 @@
789 769 @ResponseBody
790 770 @RequestMapping(value = "getDueOrgCount", method = RequestMethod.GET)
791 771 public BaseObjectResponse getDueOrgCount(HttpServletRequest request,
792   - @RequestParam(required = true) String time,
793   - @RequestParam(required = false) String hospitalId,
794   - @RequestParam(required = true) String proviceId,
795   - @RequestParam(required = true) String cityId,
796   - @RequestParam(required = false) String areaId) {
  772 + @RequestParam(required = true) String time,
  773 + @RequestParam(required = false) String hospitalId,
  774 + @RequestParam(required = true) String proviceId,
  775 + @RequestParam(required = true) String cityId,
  776 + @RequestParam(required = false) String areaId) {
797 777 LoginContext loginState = (LoginContext) request.getAttribute("loginContext");
798 778 return matDeliverFacade.getDueOrgCount(time, loginState.getId(), hospitalId, proviceId, cityId, areaId);
799 779 }
800 780  
801 781  
802 782 /**
803   - *助产机构报表导出
  783 + * 助产机构报表导出
  784 + *
804 785 * @param request
805 786 * @param hospitalId
806 787 * @param proviceId
... ... @@ -812,12 +793,12 @@
812 793 @ResponseBody
813 794 @RequestMapping(value = "exporDueOrgCount", method = RequestMethod.GET)
814 795 public void exporDueOrgCount(HttpServletRequest request,
815   - @RequestParam(required = false) String time,
816   - @RequestParam(required = false) String hospitalId,
817   - @RequestParam(required = false) String proviceId,
818   - @RequestParam(required = false) String cityId,
819   - @RequestParam(required = false) String areaId,
820   - HttpServletResponse httpServletResponse) {
  796 + @RequestParam(required = false) String time,
  797 + @RequestParam(required = false) String hospitalId,
  798 + @RequestParam(required = false) String proviceId,
  799 + @RequestParam(required = false) String cityId,
  800 + @RequestParam(required = false) String areaId,
  801 + HttpServletResponse httpServletResponse) {
821 802 LoginContext loginState = (LoginContext) request.getAttribute("loginContext");
822 803 matDeliverFacade.exporDueOrgCount(time, loginState.getId(), hospitalId, proviceId, cityId, areaId, httpServletResponse);
823 804 }
platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/ChildbirthManagerRequest.java View file @ e4e9dc8
... ... @@ -484,8 +484,8 @@
484 484 initQueryMap.put("vcCardNo", "卡号");
485 485 initQueryMap.put("fileCode", "住院号（暂时塞的档案编号）");
486 486 initQueryMap.put("fmHospital", "分娩机构");
487   - initQueryMap.put("gcStatus","产后观察");
488   - initQueryMap.put("recordsNum","记录条数");
  487 + initQueryMap.put("gcStatus", "产后观察");
  488 + initQueryMap.put("recordsNum", "记录条数");
489 489 initQueryMap.put("maternalDeliverId", "");
490 490 initQueryMap.put("patientId", "");
491 491 initQueryMap.put("pid", "");
492 492  
493 493  
... ... @@ -503,12 +503,16 @@
503 503 normalQueryMap.put("tireNumber", "胎数");
504 504 normalQueryMap.put("livingNumber", "活产数");
505 505 normalQueryMap.put("deliverDoctor", "接生医生");
506   - normalQueryMap.put("phone", "联系方式");
507   - normalQueryMap.put("gcStatus","产后观察");
508   - normalQueryMap.put("recordsNum","记录条数");
  506 + normalQueryMap.put("gcStatus", "产后观察");
  507 + normalQueryMap.put("recordsNum", "记录条数");
509 508 normalQueryMap.put("maternalDeliverId", "");
  509 + normalQueryMap.put("phone", "联系方式");
510 510 normalQueryMap.put("patientId", "");
511 511 normalQueryMap.put("pid", "");
  512 + normalQueryMap.put("asphyxiaM", "窒息分钟数");
  513 + normalQueryMap.put("babyWeight", "儿童体重");
  514 + normalQueryMap.put("rhloseBloodL", "产后24小时内失血量");
  515 +
512 516 Map<String, String> areaQueryMap = new LinkedHashMap<>();
513 517 areaQueryMap.put("apgarScorePf1", "Apgar1分钟");
514 518 areaQueryMap.put("apgarScorePf5", "Apgar5分钟");
... ... @@ -524,8 +528,8 @@
524 528 areaQueryMap.put("livingNumber", "活产数");
525 529 areaQueryMap.put("address", "居住地");
526 530 areaQueryMap.put("fmHospital", "分娩机构");
527   - areaQueryMap.put("gcStatus","产后观察");
528   - areaQueryMap.put("recordsNum","记录条数");
  531 + areaQueryMap.put("gcStatus", "产后观察");
  532 + areaQueryMap.put("recordsNum", "记录条数");
529 533 areaQueryMap.put("maternalDeliverId", "");
530 534 areaQueryMap.put("patientId", "");
531 535 areaQueryMap.put("pid", "");
platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/TemporaryUserServiceImpl.java View file @ e4e9dc8
... ... @@ -189,6 +189,7 @@
189 189 }
190 190 map.put("name", basicConfig.getName());
191 191 map.put("id", basicConfig.getId());
  192 + map.put("code", basicConfig.getCode());
192 193 listMap.add(map);
193 194 }
194 195 }