From da4e6aa6887f91314634bc95fd03f8955c000d89 Mon Sep 17 00:00:00 2001 From: liquanyu Date: Thu, 18 Aug 2016 11:00:53 +0800 Subject: [PATCH] =?UTF-8?q?=E5=BB=BA=E6=A1=A3=E5=A4=96=E9=99=A2=E5=8C=BB?= =?UTF-8?q?=E7=94=9F=E6=98=BE=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../operate/web/facade/BabyBookbuildingFacade.java | 24 ++++++++++---------- .../operate/web/facade/BabyCheckFacade.java | 26 ++++++++++++---------- .../operate/web/facade/BookbuildingFacade.java | 26 ++++++++++++---------- .../operate/web/result/BabyBuildResult.java | 14 +++--------- .../operate/web/result/BabyCheckResult.java | 14 +++--------- .../operate/web/result/PregnantInfoResult.java | 19 +++++----------- 6 files changed, 52 insertions(+), 71 deletions(-) diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyBookbuildingFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyBookbuildingFacade.java index 02630a3..a17ffb0 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyBookbuildingFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyBookbuildingFacade.java @@ -687,17 +687,7 @@ public class BabyBookbuildingFacade { } - if (result != null && StringUtils.isNotEmpty(result.getBuildDoctor())) - { - Organization org = organizationService.getOrganization(Integer.parseInt(result.getBuildDoctor())); - if (org != null) - { - Map doctorObj = new HashMap<>(); - doctorObj.put("id",result.getBuildDoctor()); - doctorObj.put("name",org.getName()); - result.setBuildDoctorObj(doctorObj); - } - } + BaseObjectResponse objectResponse = new BaseObjectResponse(); objectResponse.setData(result); objectResponse.setErrorcode(ErrorCodeConstants.SUCCESS); @@ -785,8 +775,18 @@ public class BabyBookbuildingFacade { result.setServiceStatus(String.valueOf(model.getServiceStatus())); + if (StringUtils.isNotEmpty(model.getBuildDoctor())) + { + Organization org = organizationService.getOrganization(Integer.parseInt(model.getBuildDoctor())); + if (org != null) + { + Map doctorObj = new HashMap<>(); + doctorObj.put("id",model.getBuildDoctor()); + doctorObj.put("name",org.getName()); + result.setBuildDoctor(doctorObj); + } + } - result.setBuildDoctor(model.getBuildDoctor()); result.setBuildDate(DateUtil.getyyyy_MM_dd(model.getBuildDate())); result.setServiceType(String.valueOf(model.getServiceType())); result.setVcCardNo(model.getVcCardNo()); diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyCheckFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyCheckFacade.java index 19661fc..0054974 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyCheckFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyCheckFacade.java @@ -550,17 +550,7 @@ public class BabyCheckFacade { result = getBabyCheckResult(checkModel); } - if (result != null && StringUtils.isNotEmpty(result.getCheckDoctor())) - { - Organization org = organizationService.getOrganization(Integer.parseInt(result.getCheckDoctor())); - if (org != null) - { - Map doctorObj = new HashMap<>(); - doctorObj.put("id",result.getCheckDoctor()); - doctorObj.put("name",org.getName()); - result.setCheckDoctorObj(doctorObj); - } - } + } br.setData(result); @@ -662,7 +652,19 @@ public class BabyCheckFacade { model.setDiagnose(list); model.setHandlSuggest(checkModel.getHandlSuggest()); model.setGuideSuggest(checkModel.getGuideSuggest()); - model.setCheckDoctor(checkModel.getCheckDoctor()); + + if (StringUtils.isNotEmpty(checkModel.getCheckDoctor())) + { + Organization org = organizationService.getOrganization(Integer.parseInt(checkModel.getCheckDoctor())); + if (org != null) + { + Map doctorObj = new HashMap<>(); + doctorObj.put("id",checkModel.getCheckDoctor()); + doctorObj.put("name",org.getName()); + model.setCheckDoctor(doctorObj); + } + } + model.setNextDate(DateUtil.getyyyy_MM_dd(checkModel.getNextDate())); model.setHighRisk(checkModel.getHighRisk()); model.setCheckDate(DateUtil.getyyyy_MM_dd(checkModel.getCheckDate())); 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 fd0f467..2498475 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 @@ -611,17 +611,7 @@ public class BookbuildingFacade { Patients p = patients.get(0); result = getResult(p); } - if (result != null && StringUtils.isNotEmpty(result.getBookbuildingDoctor())) - { - Organization org = organizationService.getOrganization(Integer.parseInt(result.getBookbuildingDoctor())); - if (org != null) - { - Map doctorObj = new HashMap<>(); - doctorObj.put("id",result.getBookbuildingDoctor()); - doctorObj.put("name",org.getName()); - result.setBuildDoctorObj(doctorObj); - } - } + BaseObjectResponse objectResponse = new BaseObjectResponse(); objectResponse.setData(result); objectResponse.setErrorcode(ErrorCodeConstants.SUCCESS); @@ -698,7 +688,19 @@ public class BookbuildingFacade { result.setDueDate(DateUtil.getyyyy_MM_dd(p.getDueDate())); result.setFileCode(p.getFileCode()); result.setVcCardNo(p.getVcCardNo()); - result.setBookbuildingDoctor(p.getBookbuildingDoctor()); + + if (StringUtils.isNotEmpty(p.getBookbuildingDoctor())) + { + Organization org = organizationService.getOrganization(Integer.parseInt(p.getBookbuildingDoctor())); + if (org != null) + { + Map doctorObj = new HashMap<>(); + doctorObj.put("id",p.getBookbuildingDoctor()); + doctorObj.put("name",org.getName()); + result.setBookbuildingDoctor(doctorObj); + } + } + result.setBookbuildingDate(DateUtil.getyyyy_MM_dd(p.getBookbuildingDate())); result.setServiceType(p.getServiceType() == null ? "" : String.valueOf(p.getServiceType())); diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BabyBuildResult.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BabyBuildResult.java index e00d8e1..8de57c1 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BabyBuildResult.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BabyBuildResult.java @@ -95,7 +95,7 @@ public class BabyBuildResult { private Map apgar; //建档医生 - private String buildDoctor; + private Map buildDoctor; //建档日期 private String buildDate; //服务类型 @@ -130,15 +130,7 @@ public class BabyBuildResult { //体验类型 private Integer expType; - private Map buildDoctorObj; - public Map getBuildDoctorObj() { - return buildDoctorObj; - } - - public void setBuildDoctorObj(Map buildDoctorObj) { - this.buildDoctorObj = buildDoctorObj; - } public Integer getExpType() { return expType; @@ -463,11 +455,11 @@ public class BabyBuildResult { this.highRisk = highRisk; } - public String getBuildDoctor() { + public Map getBuildDoctor() { return buildDoctor; } - public void setBuildDoctor(String buildDoctor) { + public void setBuildDoctor(Map buildDoctor) { this.buildDoctor = buildDoctor; } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BabyCheckResult.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BabyCheckResult.java index 6d32935..d86503a 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BabyCheckResult.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BabyCheckResult.java @@ -197,7 +197,7 @@ public class BabyCheckResult { private String guideSuggest; //产检医生 - private String checkDoctor; + private Map checkDoctor; //下次预约 private String nextDate; @@ -209,15 +209,7 @@ public class BabyCheckResult { private String checkDate; private String monthAge; - private Map checkDoctorObj; - public Map getCheckDoctorObj() { - return checkDoctorObj; - } - - public void setCheckDoctorObj(Map checkDoctorObj) { - this.checkDoctorObj = checkDoctorObj; - } public String getMonthAge() { return monthAge; @@ -671,11 +663,11 @@ public class BabyCheckResult { this.guideSuggest = guideSuggest; } - public String getCheckDoctor() { + public Map getCheckDoctor() { return checkDoctor; } - public void setCheckDoctor(String checkDoctor) { + public void setCheckDoctor(Map checkDoctor) { this.checkDoctor = checkDoctor; } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/PregnantInfoResult.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/PregnantInfoResult.java index 8ca44a7..01ee8fc 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/PregnantInfoResult.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/PregnantInfoResult.java @@ -102,7 +102,7 @@ public class PregnantInfoResult { //建档号 private String fileCode; //建档医生 - private String bookbuildingDoctor; + private Map bookbuildingDoctor; //建档日期 private String bookbuildingDate; @@ -135,16 +135,6 @@ public class PregnantInfoResult { //分娩状态 0未终止妊娠 1终止妊娠 private Integer dueStatus; - //建档医生对象 - private Map buildDoctorObj; - - public Map getBuildDoctorObj() { - return buildDoctorObj; - } - - public void setBuildDoctorObj(Map buildDoctorObj) { - this.buildDoctorObj = buildDoctorObj; - } public Integer getDueStatus() { return dueStatus; @@ -379,12 +369,15 @@ public class PregnantInfoResult { public void setFileCode(String fileCode) { this.fileCode = fileCode; } - public String getBookbuildingDoctor() { + + public Map getBookbuildingDoctor() { return bookbuildingDoctor; } - public void setBookbuildingDoctor(String bookbuildingDoctor) { + + public void setBookbuildingDoctor(Map bookbuildingDoctor) { this.bookbuildingDoctor = bookbuildingDoctor; } + public String getBookbuildingDate() { return bookbuildingDate; } -- 1.8.3.1