shiyang / regional-platform

Download as
Browse Code »

Commit 7a9cf90ad3fdcbfbf7a0d59a85e9eb08abe3dab3

Authored by jiangjiazhi
2 parents 8ac7482094 ef7d90cfa5
Exists in master and in 1 other branch nobuildprocess

Merge remote-tracking branch 'origin/master'

Showing 6 changed files

platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyBookbuildingFacade.java View file @ 7a9cf90
... ... @@ -686,6 +686,8 @@
686 686 result = getBabyBuildResult(model);
687 687  
688 688 }
  689 +
  690 +
689 691 BaseObjectResponse objectResponse = new BaseObjectResponse();
690 692 objectResponse.setData(result);
691 693 objectResponse.setErrorcode(ErrorCodeConstants.SUCCESS);
692 694  
... ... @@ -773,8 +775,18 @@
773 775  
774 776 result.setServiceStatus(String.valueOf(model.getServiceStatus()));
775 777  
  778 + if (StringUtils.isNotEmpty(model.getBuildDoctor()))
  779 + {
  780 + Users users = usersService.getUsers(Integer.parseInt(model.getBuildDoctor()));
  781 + if (users != null)
  782 + {
  783 + Map<String,String> doctorObj = new HashMap<>();
  784 + doctorObj.put("id",model.getBuildDoctor());
  785 + doctorObj.put("name",users.getName());
  786 + result.setBuildDoctor(doctorObj);
  787 + }
  788 + }
776 789  
777   - result.setBuildDoctor(model.getBuildDoctor());
778 790 result.setBuildDate(DateUtil.getyyyy_MM_dd(model.getBuildDate()));
779 791 result.setServiceType(String.valueOf(model.getServiceType()));
780 792 result.setVcCardNo(model.getVcCardNo());
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyCheckFacade.java View file @ 7a9cf90
... ... @@ -12,7 +12,9 @@
12 12 import com.lyms.platform.common.utils.SystemConfig;
13 13 import com.lyms.platform.operate.web.request.BabyCheckRequest;
14 14 import com.lyms.platform.operate.web.result.*;
  15 +import com.lyms.platform.permission.model.Organization;
15 16 import com.lyms.platform.permission.model.Users;
  17 +import com.lyms.platform.permission.service.OrganizationService;
16 18 import com.lyms.platform.permission.service.UsersService;
17 19 import com.lyms.platform.pojo.*;
18 20 import com.lyms.platform.query.*;
... ... @@ -50,6 +52,9 @@
50 52  
51 53  
52 54 @Autowired
  55 + private OrganizationService organizationService;
  56 +
  57 + @Autowired
53 58 private AntenatalExaminationFacade antenatalExaminationFacade;
54 59 /**
55 60 * 更新检查
... ... @@ -545,6 +550,7 @@
545 550 result = getBabyCheckResult(checkModel);
546 551  
547 552 }
  553 +
548 554 }
549 555  
550 556 br.setData(result);
... ... @@ -646,7 +652,19 @@
646 652 model.setDiagnose(list);
647 653 model.setHandlSuggest(checkModel.getHandlSuggest());
648 654 model.setGuideSuggest(checkModel.getGuideSuggest());
649   - model.setCheckDoctor(checkModel.getCheckDoctor());
  655 +
  656 + if (StringUtils.isNotEmpty(checkModel.getCheckDoctor()))
  657 + {
  658 + Users users = usersService.getUsers(Integer.parseInt(checkModel.getCheckDoctor()));
  659 + if (users != null)
  660 + {
  661 + Map<String,String> doctorObj = new HashMap<>();
  662 + doctorObj.put("id",checkModel.getCheckDoctor());
  663 + doctorObj.put("name",users.getName());
  664 + model.setCheckDoctor(doctorObj);
  665 + }
  666 + }
  667 +
650 668 model.setNextDate(DateUtil.getyyyy_MM_dd(checkModel.getNextDate()));
651 669 model.setHighRisk(checkModel.getHighRisk());
652 670 model.setCheckDate(DateUtil.getyyyy_MM_dd(checkModel.getCheckDate()));
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BookbuildingFacade.java View file @ 7a9cf90
... ... @@ -611,6 +611,7 @@
611 611 Patients p = patients.get(0);
612 612 result = getResult(p);
613 613 }
  614 +
614 615 BaseObjectResponse objectResponse = new BaseObjectResponse();
615 616 objectResponse.setData(result);
616 617 objectResponse.setErrorcode(ErrorCodeConstants.SUCCESS);
... ... @@ -687,7 +688,19 @@
687 688 result.setDueDate(DateUtil.getyyyy_MM_dd(p.getDueDate()));
688 689 result.setFileCode(p.getFileCode());
689 690 result.setVcCardNo(p.getVcCardNo());
690   - result.setBookbuildingDoctor(p.getBookbuildingDoctor());
  691 +
  692 + if (StringUtils.isNotEmpty(p.getBookbuildingDoctor()))
  693 + {
  694 + Users users = usersService.getUsers(Integer.parseInt(p.getBookbuildingDoctor()));
  695 + if (users != null)
  696 + {
  697 + Map<String,String> doctorObj = new HashMap<>();
  698 + doctorObj.put("id",p.getBookbuildingDoctor());
  699 + doctorObj.put("name",users.getName());
  700 + result.setBookbuildingDoctor(doctorObj);
  701 + }
  702 + }
  703 +
691 704 result.setBookbuildingDate(DateUtil.getyyyy_MM_dd(p.getBookbuildingDate()));
692 705 result.setServiceType(p.getServiceType() == null ? "" : String.valueOf(p.getServiceType()));
693 706  
platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BabyBuildResult.java View file @ 7a9cf90
... ... @@ -95,7 +95,7 @@
95 95 private Map<String,Object> apgar;
96 96  
97 97 //建档医生
98   - private String buildDoctor;
  98 + private Map<String,String> buildDoctor;
99 99 //建档日期
100 100 private String buildDate;
101 101 //服务类型
... ... @@ -130,6 +130,8 @@
130 130 //体验类型
131 131 private Integer expType;
132 132  
  133 +
  134 +
133 135 public Integer getExpType() {
134 136 return expType;
135 137 }
136 138  
... ... @@ -453,11 +455,11 @@
453 455 this.highRisk = highRisk;
454 456 }
455 457  
456   - public String getBuildDoctor() {
  458 + public Map<String, String> getBuildDoctor() {
457 459 return buildDoctor;
458 460 }
459 461  
460   - public void setBuildDoctor(String buildDoctor) {
  462 + public void setBuildDoctor(Map<String, String> buildDoctor) {
461 463 this.buildDoctor = buildDoctor;
462 464 }
463 465  
platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BabyCheckResult.java View file @ 7a9cf90
... ... @@ -197,7 +197,7 @@
197 197 private String guideSuggest;
198 198  
199 199 //产检医生
200   - private String checkDoctor;
  200 + private Map<String,String> checkDoctor;
201 201  
202 202 //下次预约
203 203 private String nextDate;
... ... @@ -210,6 +210,7 @@
210 210 private String monthAge;
211 211  
212 212  
  213 +
213 214 public String getMonthAge() {
214 215 return monthAge;
215 216 }
216 217  
... ... @@ -662,11 +663,11 @@
662 663 this.guideSuggest = guideSuggest;
663 664 }
664 665  
665   - public String getCheckDoctor() {
  666 + public Map<String, String> getCheckDoctor() {
666 667 return checkDoctor;
667 668 }
668 669  
669   - public void setCheckDoctor(String checkDoctor) {
  670 + public void setCheckDoctor(Map<String, String> checkDoctor) {
670 671 this.checkDoctor = checkDoctor;
671 672 }
672 673  
platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/PregnantInfoResult.java View file @ 7a9cf90
1 1 package com.lyms.platform.operate.web.result;
2 2  
  3 +import java.util.Map;
  4 +
3 5 /**
4 6 * Created by Administrator on 2016/6/15.
5 7 */
... ... @@ -100,7 +102,7 @@
100 102 //建档号
101 103 private String fileCode;
102 104 //建档医生
103   - private String bookbuildingDoctor;
  105 + private Map<String,String> bookbuildingDoctor;
104 106  
105 107 //建档日期
106 108 private String bookbuildingDate;
... ... @@ -133,6 +135,7 @@
133 135 //分娩状态 0未终止妊娠 1终止妊娠
134 136 private Integer dueStatus;
135 137  
  138 +
136 139 public Integer getDueStatus() {
137 140 return dueStatus;
138 141 }
139 142  
140 143  
... ... @@ -366,12 +369,15 @@
366 369 public void setFileCode(String fileCode) {
367 370 this.fileCode = fileCode;
368 371 }
369   - public String getBookbuildingDoctor() {
  372 +
  373 + public Map<String, String> getBookbuildingDoctor() {
370 374 return bookbuildingDoctor;
371 375 }
372   - public void setBookbuildingDoctor(String bookbuildingDoctor) {
  376 +
  377 + public void setBookbuildingDoctor(Map<String, String> bookbuildingDoctor) {
373 378 this.bookbuildingDoctor = bookbuildingDoctor;
374 379 }
  380 +
375 381 public String getBookbuildingDate() {
376 382 return bookbuildingDate;
377 383 }