From 36b368662ff104da4de83f4d2fe7a41c923a8302 Mon Sep 17 00:00:00 2001 From: yangfei Date: Wed, 12 Jul 2017 16:11:22 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BA=A7=E6=A3=80=E5=8C=BB=E7=94=9F=E7=BB=9F?= =?UTF-8?q?=E8=AE=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../operate/web/controller/FollowUpController.java | 34 +++++-- .../operate/web/result/FollowUpListResult.java | 11 ++ .../operate/web/result/FollowUpOneResult.java | 112 +++++++++------------ 3 files changed, 82 insertions(+), 75 deletions(-) diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/FollowUpController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/FollowUpController.java index 9fac529..9f8134d 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/FollowUpController.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/FollowUpController.java @@ -116,19 +116,30 @@ public class FollowUpController extends BaseController { fuResult.setArtifiCochlea(followUp.getArtifiCochlea()); fuResult.setGuideOpinion(followUp.getGuideOpinion()); fuResult.setMonthAge(followUp.getMonthAge()); + fuResult.setIsArtifiCochlea(followUp.getIsArtifiCochlea()); + fuResult.setIsAudiphone(followUp.getIsAudiphone()); + fuResult.setIsOperation(followUp.getIsOperation()); + StringBuffer interStrate = new StringBuffer(); + if(followUp.getAudiphone()!=null){ //1-左耳，2-右耳，3-全部 - fuResult.setAudiphoneStr(followUp.getAudiphone()==1?"左耳":followUp.getAudiphone()==2?"右耳":"全部"); + interStrate.append("助听器:"+(followUp.getAudiphone()==1?"左耳":followUp.getAudiphone()==2?"右耳":"全部")); } if(followUp.getOperation()!=null){ //1-左耳，2-右耳，3-全部 - fuResult.setOperationStr(followUp.getOperation()==1?"左耳":followUp.getOperation()==2?"右耳":"全部"); + if(StringUtils.isNotEmpty(interStrate.toString())){//如果不为空 + interStrate.append(","); + } + interStrate.append("手术："+(followUp.getOperation()==1?"左耳":followUp.getOperation()==2?"右耳":"全部")); } if(followUp.getArtifiCochlea()!=null){ //1-左耳，2-右耳，3-全部 - fuResult.setArtifiCochleaStr(followUp.getArtifiCochlea()==1?"左耳":followUp.getArtifiCochlea()==2?"右耳":"全部"); + if(StringUtils.isNotEmpty(interStrate.toString())){//如果不为空 + interStrate.append(","); + } + interStrate.append("人工耳蜗："+(followUp.getArtifiCochlea()==1?"左耳":followUp.getArtifiCochlea()==2?"右耳":"全部")); } if(StringUtils.isNotEmpty(followUp.getFollowDoctorId())){ @@ -142,17 +153,18 @@ public class FollowUpController extends BaseController { //随访时间 if(followUp.getFollowTime()!=null){ - fuResult.setFollowTime(followUp.getFollowTime()); - fuResult.setFollowTimeStr(DateUtil.getyyyy_MM_dd(followUp.getFollowTime())); + fuResult.setFollowTime(DateUtil.getyyyy_MM_dd(followUp.getFollowTime())); + BabyModel babyModel = babyService.getOneBabyById(followUp.getBabyId()); + if (babyModel != null) { + fuResult.setcMonthAge(DateUtil.getBabyMonthAge(babyModel.getBirth(), followUp.getFollowTime())); + } } if(followUp.getMarkTime()!=null){ - fuResult.setMarkTime(followUp.getMarkTime()); - fuResult.setMarkTimeStr(DateUtil.getyyyy_MM_dd(followUp.getMarkTime())); + fuResult.setMarkTime(DateUtil.getyyyy_MM_dd(followUp.getMarkTime())); } if(followUp.getNextTime()!=null){ - fuResult.setNextTime(followUp.getNextTime()); - fuResult.setNextTimeStr(DateUtil.getyyyy_MM_dd(followUp.getNextTime())); + fuResult.setNextTime(DateUtil.getyyyy_MM_dd(followUp.getNextTime())); } if(followUp.getIfclose()!=null){ fuResult.setIfclose(followUp.getIfclose()); @@ -310,7 +322,7 @@ public class FollowUpController extends BaseController { res.setMommyName(mb.getMname()); if(fu.getFollowTime()!=null){ //根据诊断时间获取月龄 - res.setMonthAge(DateUtil.getBabyMonthAge(mb.getBirth(), fu.getFollowTime())); + res.setcMonthAge(DateUtil.getBabyMonthAge(mb.getBirth(), fu.getFollowTime())); } res.setBirthday(DateUtil.getyyyy_MM_dd(mb.getBirth())); res.setSex(mb.getSex() == 0 ? "女" : mb.getSex() == 1 ? "男" : "未知"); @@ -387,7 +399,7 @@ public class FollowUpController extends BaseController { } //医院id String hospitalId = autoMatchFacade.getHospitalId(loginState.getId()); - BabyModel follow = babyService.getOneBabyById(obj.getId()); + BabyPatientExtendEarFollowUp follow = babyPatientExtendEarFollowUpService.getBabyPatientExtendEarFollowUp(obj.getId()); if (follow == null) {// return new BaseResponse().setErrorcode(ErrorCodeConstants.DATA_EXIST).setErrormsg("没有找到要修改的数据"); } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/FollowUpListResult.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/FollowUpListResult.java index bff71fb..f73958c 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/FollowUpListResult.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/FollowUpListResult.java @@ -32,7 +32,18 @@ public class FollowUpListResult { private String mommnyPhone; //母亲加密联系方式 private String mommnyEncryptPhone; + /** + * 当前月龄 + */ + private String cMonthAge; + public String getcMonthAge() { + return cMonthAge; + } + + public void setcMonthAge(String cMonthAge) { + this.cMonthAge = cMonthAge; + } public String getMommnyEncryptPhone() { return mommnyEncryptPhone; } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/FollowUpOneResult.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/FollowUpOneResult.java index 31369d6..6f32be5 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/FollowUpOneResult.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/FollowUpOneResult.java @@ -1,7 +1,5 @@ package com.lyms.platform.operate.web.result; -import java.util.Date; - /** * @auther yangfei * @createTime 2017年05月25日 09时29分 @@ -19,11 +17,7 @@ public class FollowUpOneResult { /** * 随访时间 */ - private Date followTime; - /** - * 随访时间 - */ - private String followTimeStr; + private String followTime; /** * 随访地点 */ @@ -31,11 +25,7 @@ public class FollowUpOneResult { /** * 确诊时间 */ - private Date markTime; - /** - * 确诊时间 - */ - private String markTimeStr; + private String markTime; /** * 确诊结果 */ @@ -48,6 +38,7 @@ public class FollowUpOneResult { * 随访记录 */ private String followInfo; + private String interStrate; /** * 助听器(0-左耳，2-右耳，3-全部) */ @@ -90,11 +81,7 @@ public class FollowUpOneResult { /** * 预约复查时间 */ - private Date nextTime; - /** - * 预约复查时间 - */ - private String nextTimeStr; + private String nextTime; /** * 是否结案 0-未结案，1-结案 */ @@ -115,6 +102,18 @@ public class FollowUpOneResult { * 月龄 */ private Integer monthAge; + /** + * 当前月龄 + */ + private String cMonthAge; + + public String getcMonthAge() { + return cMonthAge; + } + + public void setcMonthAge(String cMonthAge) { + this.cMonthAge = cMonthAge; + } public String getAudiphoneStr() { return audiphoneStr; @@ -124,6 +123,14 @@ public class FollowUpOneResult { this.audiphoneStr = audiphoneStr; } + public String getInterStrate() { + return interStrate; + } + + public void setInterStrate(String interStrate) { + this.interStrate = interStrate; + } + public String getOperationStr() { return operationStr; } @@ -156,21 +163,6 @@ public class FollowUpOneResult { this.babyId = babyId; } - public Date getFollowTime() { - return followTime; - } - - public void setFollowTime(Date followTime) { - this.followTime = followTime; - } - - public String getFollowTimeStr() { - return followTimeStr; - } - - public void setFollowTimeStr(String followTimeStr) { - this.followTimeStr = followTimeStr; - } public String getFollowAddr() { return followAddr; @@ -180,22 +172,6 @@ public class FollowUpOneResult { this.followAddr = followAddr; } - public Date getMarkTime() { - return markTime; - } - - public void setMarkTime(Date markTime) { - this.markTime = markTime; - } - - public String getMarkTimeStr() { - return markTimeStr; - } - - public void setMarkTimeStr(String markTimeStr) { - this.markTimeStr = markTimeStr; - } - public String getMarkResult() { return markResult; } @@ -268,22 +244,6 @@ public class FollowUpOneResult { this.followDoctorId = followDoctorId; } - public Date getNextTime() { - return nextTime; - } - - public void setNextTime(Date nextTime) { - this.nextTime = nextTime; - } - - public String getNextTimeStr() { - return nextTimeStr; - } - - public void setNextTimeStr(String nextTimeStr) { - this.nextTimeStr = nextTimeStr; - } - public Integer getIfclose() { return ifclose; } @@ -347,4 +307,28 @@ public class FollowUpOneResult { public void setMonthAge(Integer monthAge) { this.monthAge = monthAge; } + + public String getFollowTime() { + return followTime; + } + + public void setFollowTime(String followTime) { + this.followTime = followTime; + } + + public String getMarkTime() { + return markTime; + } + + public void setMarkTime(String markTime) { + this.markTime = markTime; + } + + public String getNextTime() { + return nextTime; + } + + public void setNextTime(String nextTime) { + this.nextTime = nextTime; + } } -- 1.8.3.1