fangcheng / regional-platform

Download as
Browse Code »

Commit da4e6aa6887f91314634bc95fd03f8955c000d89

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

建档外院医生显示

Showing 6 changed files with 52 additions and 71 deletions

platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyBookbuildingFacade.java View file @ da4e6aa
... ... @@ -687,17 +687,7 @@
687 687  
688 688 }
689 689  
690   - if (result != null && StringUtils.isNotEmpty(result.getBuildDoctor()))
691   - {
692   - Organization org = organizationService.getOrganization(Integer.parseInt(result.getBuildDoctor()));
693   - if (org != null)
694   - {
695   - Map<String,String> doctorObj = new HashMap<>();
696   - doctorObj.put("id",result.getBuildDoctor());
697   - doctorObj.put("name",org.getName());
698   - result.setBuildDoctorObj(doctorObj);
699   - }
700   - }
  690 +
701 691 BaseObjectResponse objectResponse = new BaseObjectResponse();
702 692 objectResponse.setData(result);
703 693 objectResponse.setErrorcode(ErrorCodeConstants.SUCCESS);
704 694  
... ... @@ -785,8 +775,18 @@
785 775  
786 776 result.setServiceStatus(String.valueOf(model.getServiceStatus()));
787 777  
  778 + if (StringUtils.isNotEmpty(model.getBuildDoctor()))
  779 + {
  780 + Organization org = organizationService.getOrganization(Integer.parseInt(model.getBuildDoctor()));
  781 + if (org != null)
  782 + {
  783 + Map<String,String> doctorObj = new HashMap<>();
  784 + doctorObj.put("id",model.getBuildDoctor());
  785 + doctorObj.put("name",org.getName());
  786 + result.setBuildDoctor(doctorObj);
  787 + }
  788 + }
788 789  
789   - result.setBuildDoctor(model.getBuildDoctor());
790 790 result.setBuildDate(DateUtil.getyyyy_MM_dd(model.getBuildDate()));
791 791 result.setServiceType(String.valueOf(model.getServiceType()));
792 792 result.setVcCardNo(model.getVcCardNo());
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyCheckFacade.java View file @ da4e6aa
... ... @@ -550,17 +550,7 @@
550 550 result = getBabyCheckResult(checkModel);
551 551  
552 552 }
553   - if (result != null && StringUtils.isNotEmpty(result.getCheckDoctor()))
554   - {
555   - Organization org = organizationService.getOrganization(Integer.parseInt(result.getCheckDoctor()));
556   - if (org != null)
557   - {
558   - Map<String,String> doctorObj = new HashMap<>();
559   - doctorObj.put("id",result.getCheckDoctor());
560   - doctorObj.put("name",org.getName());
561   - result.setCheckDoctorObj(doctorObj);
562   - }
563   - }
  553 +
564 554 }
565 555  
566 556 br.setData(result);
... ... @@ -662,7 +652,19 @@
662 652 model.setDiagnose(list);
663 653 model.setHandlSuggest(checkModel.getHandlSuggest());
664 654 model.setGuideSuggest(checkModel.getGuideSuggest());
665   - model.setCheckDoctor(checkModel.getCheckDoctor());
  655 +
  656 + if (StringUtils.isNotEmpty(checkModel.getCheckDoctor()))
  657 + {
  658 + Organization org = organizationService.getOrganization(Integer.parseInt(checkModel.getCheckDoctor()));
  659 + if (org != null)
  660 + {
  661 + Map<String,String> doctorObj = new HashMap<>();
  662 + doctorObj.put("id",checkModel.getCheckDoctor());
  663 + doctorObj.put("name",org.getName());
  664 + model.setCheckDoctor(doctorObj);
  665 + }
  666 + }
  667 +
666 668 model.setNextDate(DateUtil.getyyyy_MM_dd(checkModel.getNextDate()));
667 669 model.setHighRisk(checkModel.getHighRisk());
668 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 @ da4e6aa
... ... @@ -611,17 +611,7 @@
611 611 Patients p = patients.get(0);
612 612 result = getResult(p);
613 613 }
614   - if (result != null && StringUtils.isNotEmpty(result.getBookbuildingDoctor()))
615   - {
616   - Organization org = organizationService.getOrganization(Integer.parseInt(result.getBookbuildingDoctor()));
617   - if (org != null)
618   - {
619   - Map<String,String> doctorObj = new HashMap<>();
620   - doctorObj.put("id",result.getBookbuildingDoctor());
621   - doctorObj.put("name",org.getName());
622   - result.setBuildDoctorObj(doctorObj);
623   - }
624   - }
  614 +
625 615 BaseObjectResponse objectResponse = new BaseObjectResponse();
626 616 objectResponse.setData(result);
627 617 objectResponse.setErrorcode(ErrorCodeConstants.SUCCESS);
... ... @@ -698,7 +688,19 @@
698 688 result.setDueDate(DateUtil.getyyyy_MM_dd(p.getDueDate()));
699 689 result.setFileCode(p.getFileCode());
700 690 result.setVcCardNo(p.getVcCardNo());
701   - result.setBookbuildingDoctor(p.getBookbuildingDoctor());
  691 +
  692 + if (StringUtils.isNotEmpty(p.getBookbuildingDoctor()))
  693 + {
  694 + Organization org = organizationService.getOrganization(Integer.parseInt(p.getBookbuildingDoctor()));
  695 + if (org != null)
  696 + {
  697 + Map<String,String> doctorObj = new HashMap<>();
  698 + doctorObj.put("id",p.getBookbuildingDoctor());
  699 + doctorObj.put("name",org.getName());
  700 + result.setBookbuildingDoctor(doctorObj);
  701 + }
  702 + }
  703 +
702 704 result.setBookbuildingDate(DateUtil.getyyyy_MM_dd(p.getBookbuildingDate()));
703 705 result.setServiceType(p.getServiceType() == null ? "" : String.valueOf(p.getServiceType()));
704 706  
platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BabyBuildResult.java View file @ da4e6aa
... ... @@ -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 //服务类型
102 102  
103 103  
... ... @@ -130,16 +130,8 @@
130 130 //体验类型
131 131 private Integer expType;
132 132  
133   - private Map<String,String> buildDoctorObj;
134 133  
135   - public Map<String, String> getBuildDoctorObj() {
136   - return buildDoctorObj;
137   - }
138 134  
139   - public void setBuildDoctorObj(Map<String, String> buildDoctorObj) {
140   - this.buildDoctorObj = buildDoctorObj;
141   - }
142   -
143 135 public Integer getExpType() {
144 136 return expType;
145 137 }
146 138  
... ... @@ -463,11 +455,11 @@
463 455 this.highRisk = highRisk;
464 456 }
465 457  
466   - public String getBuildDoctor() {
  458 + public Map<String, String> getBuildDoctor() {
467 459 return buildDoctor;
468 460 }
469 461  
470   - public void setBuildDoctor(String buildDoctor) {
  462 + public void setBuildDoctor(Map<String, String> buildDoctor) {
471 463 this.buildDoctor = buildDoctor;
472 464 }
473 465  
platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BabyCheckResult.java View file @ da4e6aa
... ... @@ -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;
204 204  
205 205  
... ... @@ -209,16 +209,8 @@
209 209 private String checkDate;
210 210 private String monthAge;
211 211  
212   - private Map<String,String> checkDoctorObj;
213 212  
214   - public Map<String, String> getCheckDoctorObj() {
215   - return checkDoctorObj;
216   - }
217 213  
218   - public void setCheckDoctorObj(Map<String, String> checkDoctorObj) {
219   - this.checkDoctorObj = checkDoctorObj;
220   - }
221   -
222 214 public String getMonthAge() {
223 215 return monthAge;
224 216 }
225 217  
... ... @@ -671,11 +663,11 @@
671 663 this.guideSuggest = guideSuggest;
672 664 }
673 665  
674   - public String getCheckDoctor() {
  666 + public Map<String, String> getCheckDoctor() {
675 667 return checkDoctor;
676 668 }
677 669  
678   - public void setCheckDoctor(String checkDoctor) {
  670 + public void setCheckDoctor(Map<String, String> checkDoctor) {
679 671 this.checkDoctor = checkDoctor;
680 672 }
681 673  
platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/PregnantInfoResult.java View file @ da4e6aa
... ... @@ -102,7 +102,7 @@
102 102 //建档号
103 103 private String fileCode;
104 104 //建档医生
105   - private String bookbuildingDoctor;
  105 + private Map<String,String> bookbuildingDoctor;
106 106  
107 107 //建档日期
108 108 private String bookbuildingDate;
109 109  
... ... @@ -135,17 +135,7 @@
135 135 //分娩状态 0未终止妊娠 1终止妊娠
136 136 private Integer dueStatus;
137 137  
138   - //建档医生对象
139   - private Map<String,String> buildDoctorObj;
140 138  
141   - public Map<String, String> getBuildDoctorObj() {
142   - return buildDoctorObj;
143   - }
144   -
145   - public void setBuildDoctorObj(Map<String, String> buildDoctorObj) {
146   - this.buildDoctorObj = buildDoctorObj;
147   - }
148   -
149 139 public Integer getDueStatus() {
150 140 return dueStatus;
151 141 }
152 142  
153 143  
... ... @@ -379,12 +369,15 @@
379 369 public void setFileCode(String fileCode) {
380 370 this.fileCode = fileCode;
381 371 }
382   - public String getBookbuildingDoctor() {
  372 +
  373 + public Map<String, String> getBookbuildingDoctor() {
383 374 return bookbuildingDoctor;
384 375 }
385   - public void setBookbuildingDoctor(String bookbuildingDoctor) {
  376 +
  377 + public void setBookbuildingDoctor(Map<String, String> bookbuildingDoctor) {
386 378 this.bookbuildingDoctor = bookbuildingDoctor;
387 379 }
  380 +
388 381 public String getBookbuildingDate() {
389 382 return bookbuildingDate;
390 383 }