diff --git a/platform-biz-service/src/main/java/com/lyms/platform/permission/model/HighriskChangeHospital.java b/platform-biz-service/src/main/java/com/lyms/platform/permission/model/HighriskChangeHospital.java index 961e8fa..eb51024 100644 --- a/platform-biz-service/src/main/java/com/lyms/platform/permission/model/HighriskChangeHospital.java +++ b/platform-biz-service/src/main/java/com/lyms/platform/permission/model/HighriskChangeHospital.java @@ -2,6 +2,9 @@ package com.lyms.platform.permission.model; import java.util.Date; +/** + * ת + */ public class HighriskChangeHospital { /** * IDת 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 991ecd3..4928d04 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 @@ -1,14 +1,18 @@ package com.lyms.platform.operate.web.controller; +import com.lyms.platform.biz.service.BabyService; import com.lyms.platform.common.base.BaseController; import com.lyms.platform.common.base.LoginContext; import com.lyms.platform.common.constants.ErrorCodeConstants; import com.lyms.platform.common.result.BaseResponse; +import com.lyms.platform.common.utils.DateUtil; import com.lyms.platform.operate.web.facade.AutoMatchFacade; +import com.lyms.platform.operate.web.result.FollowUpListResult; import com.lyms.platform.operate.web.result.FrontEndResult; import com.lyms.platform.permission.model.FollowUp; import com.lyms.platform.permission.model.FollowUpQuery; import com.lyms.platform.permission.service.FollowUpService; +import com.lyms.platform.pojo.BabyModel; import org.apache.commons.lang.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Controller; @@ -17,6 +21,7 @@ import org.springframework.web.bind.annotation.RequestMethod; import org.springframework.web.bind.annotation.ResponseBody; import javax.servlet.http.HttpServletRequest; +import java.util.ArrayList; import java.util.Date; import java.util.List; @@ -31,6 +36,8 @@ public class FollowUpController extends BaseController { private FollowUpService followUpService; @Autowired private AutoMatchFacade autoMatchFacade; + @Autowired + private BabyService babyService; /** @@ -51,14 +58,22 @@ public class FollowUpController extends BaseController { //医院id String hospitalId = autoMatchFacade.getHospitalId(loginState.getId()); List followUpList = followUpService.queryFollowUp(query); - for(FollowUp fu : followUpList){ - //查询儿童信息 - - //查询母亲信息 - - //查询医生信息 - + List fuResult = new ArrayList<>(); + for(FollowUp fu : followUpList){ + FollowUpListResult res = new FollowUpListResult(); + String babyId = fu.getBabyId(); + //根据babyId查询档案信息 + BabyModel mb = babyService.getOneBabyById(String.valueOf(babyId)); + if(mb!=null){//没有找打儿童档案信息 + continue; + } + res.setId(fu.getId()); + res.setBabyName(mb.getName()); + res.setMommyName(mb.getMname()); + res.setMonthAge(DateUtil.getBabyMonthAge(mb.getBirth(),new Date())); + res.setBirthday(DateUtil.getyyyy_MM_dd(mb.getBirth())); + //诊断时间 } @@ -168,7 +183,7 @@ public class FollowUpController extends BaseController { public BaseResponse validata(FollowUp obj) { BaseResponse baseResp = new BaseResponse().setErrorcode(ErrorCodeConstants.SUCCESS); - if (obj.getChildrenFileId() == null) {//请传入儿童档案ID + if (obj.getBabyId() == null) {//请传入儿童档案ID return new BaseResponse().setErrorcode(ErrorCodeConstants.PARAMETER_ERROR).setErrormsg("请传入儿童档案ID"); } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/HearingDiagnoseController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/HearingDiagnoseController.java index 42d73de..e78af4b 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/HearingDiagnoseController.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/HearingDiagnoseController.java @@ -56,8 +56,6 @@ public class HearingDiagnoseController extends BaseController { BabyModel babyModel = babyService.getOneBabyById(hd.getBabyId()); hd.setBabyModel(babyModel); } - - return FrontEndResult.ini().setData(hearingDiagnoseList).setPageInfo(query.getPageInfo()).setErrorcode(ErrorCodeConstants.SUCCESS).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 new file mode 100644 index 0000000..ab2d0bd --- /dev/null +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/FollowUpListResult.java @@ -0,0 +1,128 @@ +package com.lyms.platform.operate.web.result; + +/** + * 随访管理列表 + * Created by yf on 2017/5/11. + */ +public class FollowUpListResult { + //主键 + private String id; + //儿童名称 + private String babyName; + //母亲姓名 + private String mommyName; + //月龄 + private String monthAge; + //出生日期 + private String birthday; + //诊断时间 + private String hdTime; + //性别 + private String sex; + //确诊结果 + private String diagnose; + //是否结案 + private String isColse; + //随访医生名称 + private String doctorName; + //母亲联系方式 + private String mommnyPhone; + //母亲加密联系方式 + private String mommnyEncryptPhone; + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getBabyName() { + return babyName; + } + + public void setBabyName(String babyName) { + this.babyName = babyName; + } + + public String getMommyName() { + return mommyName; + } + + public void setMommyName(String mommyName) { + this.mommyName = mommyName; + } + + public String getMonthAge() { + return monthAge; + } + + public void setMonthAge(String monthAge) { + this.monthAge = monthAge; + } + + public String getBirthday() { + return birthday; + } + + public void setBirthday(String birthday) { + this.birthday = birthday; + } + + public String getHdTime() { + return hdTime; + } + + public void setHdTime(String hdTime) { + this.hdTime = hdTime; + } + + public String getSex() { + return sex; + } + + public void setSex(String sex) { + this.sex = sex; + } + + public String getDiagnose() { + return diagnose; + } + + public void setDiagnose(String diagnose) { + this.diagnose = diagnose; + } + + public String getIsColse() { + return isColse; + } + + public void setIsColse(String isColse) { + this.isColse = isColse; + } + + public String getDoctorName() { + return doctorName; + } + + public void setDoctorName(String doctorName) { + this.doctorName = doctorName; + } + + public String getMommnyPhone() { + return mommnyPhone; + } + + public void setMommnyPhone(String mommnyPhone) { + this.mommnyPhone = mommnyPhone; + } + + public String getMommnyEncryptPhone() { + return mommnyEncryptPhone; + } + + public void setMommnyEncryptPhone(String mommnyEncryptPhone) { + this.mommnyEncryptPhone = mommnyEncryptPhone; + } +} diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/HearingDiagnoseListResult.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/HearingDiagnoseListResult.java index 9931319..eb29278 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/HearingDiagnoseListResult.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/HearingDiagnoseListResult.java @@ -1,7 +1,8 @@ package com.lyms.platform.operate.web.result; /** - * Created by lqy on 2016/6/17. + * 听力诊断列表 + * Created by yf on 2017/5/11. */ public class HearingDiagnoseListResult { //主键 @@ -14,32 +15,26 @@ public class HearingDiagnoseListResult { private String monthAge; //出生日期 private String birthday; - /** - * 诊断时间 - */ + //诊断时间 private String hdTime; //性别 private String sex; - /** - * 高危因素 1=早产 2=晚产 - */ - private Integer highRiskCause; - //母亲联系方式 - private String mommnyPhone; - //母亲加密联系方式 - private String mommnyEncryptPhone; + //高危因素 1=早产 2=晚产 + private String highRiskCause; //诊断结果 private String diagnose; //是否确诊 0-待确诊，1-确诊 private String enalble; - /** - * 诊断指导处理意见 - */ + //诊断指导处理意见 private String diagnHandSugge; //创建时间 private String buildTime; - //医院名称 + //医生名称 private String doctorName; + //母亲联系方式 + private String mommnyPhone; + //母亲加密联系方式 + private String mommnyEncryptPhone; public String getId() { return id; @@ -97,30 +92,14 @@ public class HearingDiagnoseListResult { this.sex = sex; } - public Integer getHighRiskCause() { + public String getHighRiskCause() { return highRiskCause; } - public void setHighRiskCause(Integer highRiskCause) { + public void setHighRiskCause(String highRiskCause) { this.highRiskCause = highRiskCause; } - public String getMommnyPhone() { - return mommnyPhone; - } - - public void setMommnyPhone(String mommnyPhone) { - this.mommnyPhone = mommnyPhone; - } - - public String getMommnyEncryptPhone() { - return mommnyEncryptPhone; - } - - public void setMommnyEncryptPhone(String mommnyEncryptPhone) { - this.mommnyEncryptPhone = mommnyEncryptPhone; - } - public String getDiagnose() { return diagnose; } @@ -160,4 +139,20 @@ public class HearingDiagnoseListResult { public void setDoctorName(String doctorName) { this.doctorName = doctorName; } + + public String getMommnyPhone() { + return mommnyPhone; + } + + public void setMommnyPhone(String mommnyPhone) { + this.mommnyPhone = mommnyPhone; + } + + public String getMommnyEncryptPhone() { + return mommnyEncryptPhone; + } + + public void setMommnyEncryptPhone(String mommnyEncryptPhone) { + this.mommnyEncryptPhone = mommnyEncryptPhone; + } } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/HighriskChangeHospitalListResult.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/HighriskChangeHospitalListResult.java new file mode 100644 index 0000000..caa7e7e --- /dev/null +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/HighriskChangeHospitalListResult.java @@ -0,0 +1,138 @@ +package com.lyms.platform.operate.web.result; + +/** + * 听力转诊列表 + * Created by yf on 2017/5/11. + */ +public class HighriskChangeHospitalListResult { + //主键 + private String id; + //儿童名称 + private String babyName; + //母亲姓名 + private String mommyName; + //月龄 + private String monthAge; + //出生日期 + private String birthday; + //筛查类型 1=初筛 2=复筛 + private String screenType; + //筛查是否通过 1-未通过 2-通过 + private String isPass; + //医院名称 + private String hospitalName; + //医生名称 + private String doctorName; + //母亲联系方式 + private String mommnyPhone; + //母亲加密联系方式 + private String mommnyEncryptPhone; + //接受时间 + private String receiveTime; + //状态 0-未接受 1-已接受 + private String status; + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getBabyName() { + return babyName; + } + + public void setBabyName(String babyName) { + this.babyName = babyName; + } + + public String getMommyName() { + return mommyName; + } + + public void setMommyName(String mommyName) { + this.mommyName = mommyName; + } + + public String getMonthAge() { + return monthAge; + } + + public void setMonthAge(String monthAge) { + this.monthAge = monthAge; + } + + public String getBirthday() { + return birthday; + } + + public void setBirthday(String birthday) { + this.birthday = birthday; + } + + public String getScreenType() { + return screenType; + } + + public void setScreenType(String screenType) { + this.screenType = screenType; + } + + public String getIsPass() { + return isPass; + } + + public void setIsPass(String isPass) { + this.isPass = isPass; + } + + public String getHospitalName() { + return hospitalName; + } + + public void setHospitalName(String hospitalName) { + this.hospitalName = hospitalName; + } + + public String getDoctorName() { + return doctorName; + } + + public void setDoctorName(String doctorName) { + this.doctorName = doctorName; + } + + public String getMommnyPhone() { + return mommnyPhone; + } + + public void setMommnyPhone(String mommnyPhone) { + this.mommnyPhone = mommnyPhone; + } + + public String getMommnyEncryptPhone() { + return mommnyEncryptPhone; + } + + public void setMommnyEncryptPhone(String mommnyEncryptPhone) { + this.mommnyEncryptPhone = mommnyEncryptPhone; + } + + public String getReceiveTime() { + return receiveTime; + } + + public void setReceiveTime(String receiveTime) { + this.receiveTime = receiveTime; + } + + public String getStatus() { + return status; + } + + public void setStatus(String status) { + this.status = status; + } +}