Commit d2602ca10a1b3cd8be2ca8ca42b6298e772c4ae5
1 parent
2222af8b18
Exists in
master
and in
6 other branches
随访记录
Showing 6 changed files with 321 additions and 44 deletions
- platform-biz-service/src/main/java/com/lyms/platform/permission/model/HighriskChangeHospital.java
- platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/FollowUpController.java
- platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/HearingDiagnoseController.java
- platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/FollowUpListResult.java
- platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/HearingDiagnoseListResult.java
- platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/HighriskChangeHospitalListResult.java
platform-biz-service/src/main/java/com/lyms/platform/permission/model/HighriskChangeHospital.java
View file @
d2602ca
platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/FollowUpController.java
View file @
d2602ca
| 1 | 1 | package com.lyms.platform.operate.web.controller; |
| 2 | 2 | |
| 3 | +import com.lyms.platform.biz.service.BabyService; | |
| 3 | 4 | import com.lyms.platform.common.base.BaseController; |
| 4 | 5 | import com.lyms.platform.common.base.LoginContext; |
| 5 | 6 | import com.lyms.platform.common.constants.ErrorCodeConstants; |
| 6 | 7 | import com.lyms.platform.common.result.BaseResponse; |
| 8 | +import com.lyms.platform.common.utils.DateUtil; | |
| 7 | 9 | import com.lyms.platform.operate.web.facade.AutoMatchFacade; |
| 10 | +import com.lyms.platform.operate.web.result.FollowUpListResult; | |
| 8 | 11 | import com.lyms.platform.operate.web.result.FrontEndResult; |
| 9 | 12 | import com.lyms.platform.permission.model.FollowUp; |
| 10 | 13 | import com.lyms.platform.permission.model.FollowUpQuery; |
| 11 | 14 | import com.lyms.platform.permission.service.FollowUpService; |
| 15 | +import com.lyms.platform.pojo.BabyModel; | |
| 12 | 16 | import org.apache.commons.lang.StringUtils; |
| 13 | 17 | import org.springframework.beans.factory.annotation.Autowired; |
| 14 | 18 | import org.springframework.stereotype.Controller; |
| ... | ... | @@ -17,6 +21,7 @@ |
| 17 | 21 | import org.springframework.web.bind.annotation.ResponseBody; |
| 18 | 22 | |
| 19 | 23 | import javax.servlet.http.HttpServletRequest; |
| 24 | +import java.util.ArrayList; | |
| 20 | 25 | import java.util.Date; |
| 21 | 26 | import java.util.List; |
| 22 | 27 | |
| ... | ... | @@ -31,6 +36,8 @@ |
| 31 | 36 | private FollowUpService followUpService; |
| 32 | 37 | @Autowired |
| 33 | 38 | private AutoMatchFacade autoMatchFacade; |
| 39 | + @Autowired | |
| 40 | + private BabyService babyService; | |
| 34 | 41 | |
| 35 | 42 | |
| 36 | 43 | /** |
| 37 | 44 | |
| ... | ... | @@ -51,14 +58,22 @@ |
| 51 | 58 | //医院id |
| 52 | 59 | String hospitalId = autoMatchFacade.getHospitalId(loginState.getId()); |
| 53 | 60 | List<FollowUp> followUpList = followUpService.queryFollowUp(query); |
| 54 | - for(FollowUp fu : followUpList){ | |
| 55 | - //查询儿童信息 | |
| 61 | + List<FollowUpListResult> fuResult = new ArrayList<>(); | |
| 56 | 62 | |
| 57 | - //查询母亲信息 | |
| 58 | - | |
| 59 | - //查询医生信息 | |
| 60 | - | |
| 61 | - | |
| 63 | + for(FollowUp fu : followUpList){ | |
| 64 | + FollowUpListResult res = new FollowUpListResult(); | |
| 65 | + String babyId = fu.getBabyId(); | |
| 66 | + //根据babyId查询档案信息 | |
| 67 | + BabyModel mb = babyService.getOneBabyById(String.valueOf(babyId)); | |
| 68 | + if(mb!=null){//没有找打儿童档案信息 | |
| 69 | + continue; | |
| 70 | + } | |
| 71 | + res.setId(fu.getId()); | |
| 72 | + res.setBabyName(mb.getName()); | |
| 73 | + res.setMommyName(mb.getMname()); | |
| 74 | + res.setMonthAge(DateUtil.getBabyMonthAge(mb.getBirth(),new Date())); | |
| 75 | + res.setBirthday(DateUtil.getyyyy_MM_dd(mb.getBirth())); | |
| 76 | + //诊断时间 | |
| 62 | 77 | } |
| 63 | 78 | |
| 64 | 79 | |
| ... | ... | @@ -168,7 +183,7 @@ |
| 168 | 183 | public BaseResponse validata(FollowUp obj) { |
| 169 | 184 | BaseResponse baseResp = new BaseResponse().setErrorcode(ErrorCodeConstants.SUCCESS); |
| 170 | 185 | |
| 171 | - if (obj.getChildrenFileId() == null) {//请传入儿童档案ID | |
| 186 | + if (obj.getBabyId() == null) {//请传入儿童档案ID | |
| 172 | 187 | return new BaseResponse().setErrorcode(ErrorCodeConstants.PARAMETER_ERROR).setErrormsg("请传入儿童档案ID"); |
| 173 | 188 | } |
| 174 | 189 |
platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/HearingDiagnoseController.java
View file @
d2602ca
| ... | ... | @@ -56,8 +56,6 @@ |
| 56 | 56 | BabyModel babyModel = babyService.getOneBabyById(hd.getBabyId()); |
| 57 | 57 | hd.setBabyModel(babyModel); |
| 58 | 58 | } |
| 59 | - | |
| 60 | - | |
| 61 | 59 | return FrontEndResult.ini().setData(hearingDiagnoseList).setPageInfo(query.getPageInfo()).setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("查询成功"); |
| 62 | 60 | } |
| 63 | 61 |
platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/FollowUpListResult.java
View file @
d2602ca
| 1 | +package com.lyms.platform.operate.web.result; | |
| 2 | + | |
| 3 | +/** | |
| 4 | + * 随访管理列表 | |
| 5 | + * Created by yf on 2017/5/11. | |
| 6 | + */ | |
| 7 | +public class FollowUpListResult { | |
| 8 | + //主键 | |
| 9 | + private String id; | |
| 10 | + //儿童名称 | |
| 11 | + private String babyName; | |
| 12 | + //母亲姓名 | |
| 13 | + private String mommyName; | |
| 14 | + //月龄 | |
| 15 | + private String monthAge; | |
| 16 | + //出生日期 | |
| 17 | + private String birthday; | |
| 18 | + //诊断时间 | |
| 19 | + private String hdTime; | |
| 20 | + //性别 | |
| 21 | + private String sex; | |
| 22 | + //确诊结果 | |
| 23 | + private String diagnose; | |
| 24 | + //是否结案 | |
| 25 | + private String isColse; | |
| 26 | + //随访医生名称 | |
| 27 | + private String doctorName; | |
| 28 | + //母亲联系方式 | |
| 29 | + private String mommnyPhone; | |
| 30 | + //母亲加密联系方式 | |
| 31 | + private String mommnyEncryptPhone; | |
| 32 | + | |
| 33 | + public String getId() { | |
| 34 | + return id; | |
| 35 | + } | |
| 36 | + | |
| 37 | + public void setId(String id) { | |
| 38 | + this.id = id; | |
| 39 | + } | |
| 40 | + | |
| 41 | + public String getBabyName() { | |
| 42 | + return babyName; | |
| 43 | + } | |
| 44 | + | |
| 45 | + public void setBabyName(String babyName) { | |
| 46 | + this.babyName = babyName; | |
| 47 | + } | |
| 48 | + | |
| 49 | + public String getMommyName() { | |
| 50 | + return mommyName; | |
| 51 | + } | |
| 52 | + | |
| 53 | + public void setMommyName(String mommyName) { | |
| 54 | + this.mommyName = mommyName; | |
| 55 | + } | |
| 56 | + | |
| 57 | + public String getMonthAge() { | |
| 58 | + return monthAge; | |
| 59 | + } | |
| 60 | + | |
| 61 | + public void setMonthAge(String monthAge) { | |
| 62 | + this.monthAge = monthAge; | |
| 63 | + } | |
| 64 | + | |
| 65 | + public String getBirthday() { | |
| 66 | + return birthday; | |
| 67 | + } | |
| 68 | + | |
| 69 | + public void setBirthday(String birthday) { | |
| 70 | + this.birthday = birthday; | |
| 71 | + } | |
| 72 | + | |
| 73 | + public String getHdTime() { | |
| 74 | + return hdTime; | |
| 75 | + } | |
| 76 | + | |
| 77 | + public void setHdTime(String hdTime) { | |
| 78 | + this.hdTime = hdTime; | |
| 79 | + } | |
| 80 | + | |
| 81 | + public String getSex() { | |
| 82 | + return sex; | |
| 83 | + } | |
| 84 | + | |
| 85 | + public void setSex(String sex) { | |
| 86 | + this.sex = sex; | |
| 87 | + } | |
| 88 | + | |
| 89 | + public String getDiagnose() { | |
| 90 | + return diagnose; | |
| 91 | + } | |
| 92 | + | |
| 93 | + public void setDiagnose(String diagnose) { | |
| 94 | + this.diagnose = diagnose; | |
| 95 | + } | |
| 96 | + | |
| 97 | + public String getIsColse() { | |
| 98 | + return isColse; | |
| 99 | + } | |
| 100 | + | |
| 101 | + public void setIsColse(String isColse) { | |
| 102 | + this.isColse = isColse; | |
| 103 | + } | |
| 104 | + | |
| 105 | + public String getDoctorName() { | |
| 106 | + return doctorName; | |
| 107 | + } | |
| 108 | + | |
| 109 | + public void setDoctorName(String doctorName) { | |
| 110 | + this.doctorName = doctorName; | |
| 111 | + } | |
| 112 | + | |
| 113 | + public String getMommnyPhone() { | |
| 114 | + return mommnyPhone; | |
| 115 | + } | |
| 116 | + | |
| 117 | + public void setMommnyPhone(String mommnyPhone) { | |
| 118 | + this.mommnyPhone = mommnyPhone; | |
| 119 | + } | |
| 120 | + | |
| 121 | + public String getMommnyEncryptPhone() { | |
| 122 | + return mommnyEncryptPhone; | |
| 123 | + } | |
| 124 | + | |
| 125 | + public void setMommnyEncryptPhone(String mommnyEncryptPhone) { | |
| 126 | + this.mommnyEncryptPhone = mommnyEncryptPhone; | |
| 127 | + } | |
| 128 | +} |
platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/HearingDiagnoseListResult.java
View file @
d2602ca
| 1 | 1 | package com.lyms.platform.operate.web.result; |
| 2 | 2 | |
| 3 | 3 | /** |
| 4 | - * Created by lqy on 2016/6/17. | |
| 4 | + * 听力诊断列表 | |
| 5 | + * Created by yf on 2017/5/11. | |
| 5 | 6 | */ |
| 6 | 7 | public class HearingDiagnoseListResult { |
| 7 | 8 | //主键 |
| 8 | 9 | |
| 9 | 10 | |
| 10 | 11 | |
| 11 | 12 | |
| ... | ... | @@ -14,32 +15,26 @@ |
| 14 | 15 | private String monthAge; |
| 15 | 16 | //出生日期 |
| 16 | 17 | private String birthday; |
| 17 | - /** | |
| 18 | - * 诊断时间 | |
| 19 | - */ | |
| 18 | + //诊断时间 | |
| 20 | 19 | private String hdTime; |
| 21 | 20 | //性别 |
| 22 | 21 | private String sex; |
| 23 | - /** | |
| 24 | - * 高危因素 1=早产 2=晚产 | |
| 25 | - */ | |
| 26 | - private Integer highRiskCause; | |
| 27 | - //母亲联系方式 | |
| 28 | - private String mommnyPhone; | |
| 29 | - //母亲加密联系方式 | |
| 30 | - private String mommnyEncryptPhone; | |
| 22 | + //高危因素 1=早产 2=晚产 | |
| 23 | + private String highRiskCause; | |
| 31 | 24 | //诊断结果 |
| 32 | 25 | private String diagnose; |
| 33 | 26 | //是否确诊 0-待确诊,1-确诊 |
| 34 | 27 | private String enalble; |
| 35 | - /** | |
| 36 | - * 诊断指导处理意见 | |
| 37 | - */ | |
| 28 | + //诊断指导处理意见 | |
| 38 | 29 | private String diagnHandSugge; |
| 39 | 30 | //创建时间 |
| 40 | 31 | private String buildTime; |
| 41 | - //医院名称 | |
| 32 | + //医生名称 | |
| 42 | 33 | private String doctorName; |
| 34 | + //母亲联系方式 | |
| 35 | + private String mommnyPhone; | |
| 36 | + //母亲加密联系方式 | |
| 37 | + private String mommnyEncryptPhone; | |
| 43 | 38 | |
| 44 | 39 | public String getId() { |
| 45 | 40 | return id; |
| 46 | 41 | |
| 47 | 42 | |
| ... | ... | @@ -97,30 +92,14 @@ |
| 97 | 92 | this.sex = sex; |
| 98 | 93 | } |
| 99 | 94 | |
| 100 | - public Integer getHighRiskCause() { | |
| 95 | + public String getHighRiskCause() { | |
| 101 | 96 | return highRiskCause; |
| 102 | 97 | } |
| 103 | 98 | |
| 104 | - public void setHighRiskCause(Integer highRiskCause) { | |
| 99 | + public void setHighRiskCause(String highRiskCause) { | |
| 105 | 100 | this.highRiskCause = highRiskCause; |
| 106 | 101 | } |
| 107 | 102 | |
| 108 | - public String getMommnyPhone() { | |
| 109 | - return mommnyPhone; | |
| 110 | - } | |
| 111 | - | |
| 112 | - public void setMommnyPhone(String mommnyPhone) { | |
| 113 | - this.mommnyPhone = mommnyPhone; | |
| 114 | - } | |
| 115 | - | |
| 116 | - public String getMommnyEncryptPhone() { | |
| 117 | - return mommnyEncryptPhone; | |
| 118 | - } | |
| 119 | - | |
| 120 | - public void setMommnyEncryptPhone(String mommnyEncryptPhone) { | |
| 121 | - this.mommnyEncryptPhone = mommnyEncryptPhone; | |
| 122 | - } | |
| 123 | - | |
| 124 | 103 | public String getDiagnose() { |
| 125 | 104 | return diagnose; |
| 126 | 105 | } |
| ... | ... | @@ -159,6 +138,22 @@ |
| 159 | 138 | |
| 160 | 139 | public void setDoctorName(String doctorName) { |
| 161 | 140 | this.doctorName = doctorName; |
| 141 | + } | |
| 142 | + | |
| 143 | + public String getMommnyPhone() { | |
| 144 | + return mommnyPhone; | |
| 145 | + } | |
| 146 | + | |
| 147 | + public void setMommnyPhone(String mommnyPhone) { | |
| 148 | + this.mommnyPhone = mommnyPhone; | |
| 149 | + } | |
| 150 | + | |
| 151 | + public String getMommnyEncryptPhone() { | |
| 152 | + return mommnyEncryptPhone; | |
| 153 | + } | |
| 154 | + | |
| 155 | + public void setMommnyEncryptPhone(String mommnyEncryptPhone) { | |
| 156 | + this.mommnyEncryptPhone = mommnyEncryptPhone; | |
| 162 | 157 | } |
| 163 | 158 | } |
platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/HighriskChangeHospitalListResult.java
View file @
d2602ca
| 1 | +package com.lyms.platform.operate.web.result; | |
| 2 | + | |
| 3 | +/** | |
| 4 | + * 听力转诊列表 | |
| 5 | + * Created by yf on 2017/5/11. | |
| 6 | + */ | |
| 7 | +public class HighriskChangeHospitalListResult { | |
| 8 | + //主键 | |
| 9 | + private String id; | |
| 10 | + //儿童名称 | |
| 11 | + private String babyName; | |
| 12 | + //母亲姓名 | |
| 13 | + private String mommyName; | |
| 14 | + //月龄 | |
| 15 | + private String monthAge; | |
| 16 | + //出生日期 | |
| 17 | + private String birthday; | |
| 18 | + //筛查类型 1=初筛 2=复筛 | |
| 19 | + private String screenType; | |
| 20 | + //筛查是否通过 1-未通过 2-通过 | |
| 21 | + private String isPass; | |
| 22 | + //医院名称 | |
| 23 | + private String hospitalName; | |
| 24 | + //医生名称 | |
| 25 | + private String doctorName; | |
| 26 | + //母亲联系方式 | |
| 27 | + private String mommnyPhone; | |
| 28 | + //母亲加密联系方式 | |
| 29 | + private String mommnyEncryptPhone; | |
| 30 | + //接受时间 | |
| 31 | + private String receiveTime; | |
| 32 | + //状态 0-未接受 1-已接受 | |
| 33 | + private String status; | |
| 34 | + | |
| 35 | + public String getId() { | |
| 36 | + return id; | |
| 37 | + } | |
| 38 | + | |
| 39 | + public void setId(String id) { | |
| 40 | + this.id = id; | |
| 41 | + } | |
| 42 | + | |
| 43 | + public String getBabyName() { | |
| 44 | + return babyName; | |
| 45 | + } | |
| 46 | + | |
| 47 | + public void setBabyName(String babyName) { | |
| 48 | + this.babyName = babyName; | |
| 49 | + } | |
| 50 | + | |
| 51 | + public String getMommyName() { | |
| 52 | + return mommyName; | |
| 53 | + } | |
| 54 | + | |
| 55 | + public void setMommyName(String mommyName) { | |
| 56 | + this.mommyName = mommyName; | |
| 57 | + } | |
| 58 | + | |
| 59 | + public String getMonthAge() { | |
| 60 | + return monthAge; | |
| 61 | + } | |
| 62 | + | |
| 63 | + public void setMonthAge(String monthAge) { | |
| 64 | + this.monthAge = monthAge; | |
| 65 | + } | |
| 66 | + | |
| 67 | + public String getBirthday() { | |
| 68 | + return birthday; | |
| 69 | + } | |
| 70 | + | |
| 71 | + public void setBirthday(String birthday) { | |
| 72 | + this.birthday = birthday; | |
| 73 | + } | |
| 74 | + | |
| 75 | + public String getScreenType() { | |
| 76 | + return screenType; | |
| 77 | + } | |
| 78 | + | |
| 79 | + public void setScreenType(String screenType) { | |
| 80 | + this.screenType = screenType; | |
| 81 | + } | |
| 82 | + | |
| 83 | + public String getIsPass() { | |
| 84 | + return isPass; | |
| 85 | + } | |
| 86 | + | |
| 87 | + public void setIsPass(String isPass) { | |
| 88 | + this.isPass = isPass; | |
| 89 | + } | |
| 90 | + | |
| 91 | + public String getHospitalName() { | |
| 92 | + return hospitalName; | |
| 93 | + } | |
| 94 | + | |
| 95 | + public void setHospitalName(String hospitalName) { | |
| 96 | + this.hospitalName = hospitalName; | |
| 97 | + } | |
| 98 | + | |
| 99 | + public String getDoctorName() { | |
| 100 | + return doctorName; | |
| 101 | + } | |
| 102 | + | |
| 103 | + public void setDoctorName(String doctorName) { | |
| 104 | + this.doctorName = doctorName; | |
| 105 | + } | |
| 106 | + | |
| 107 | + public String getMommnyPhone() { | |
| 108 | + return mommnyPhone; | |
| 109 | + } | |
| 110 | + | |
| 111 | + public void setMommnyPhone(String mommnyPhone) { | |
| 112 | + this.mommnyPhone = mommnyPhone; | |
| 113 | + } | |
| 114 | + | |
| 115 | + public String getMommnyEncryptPhone() { | |
| 116 | + return mommnyEncryptPhone; | |
| 117 | + } | |
| 118 | + | |
| 119 | + public void setMommnyEncryptPhone(String mommnyEncryptPhone) { | |
| 120 | + this.mommnyEncryptPhone = mommnyEncryptPhone; | |
| 121 | + } | |
| 122 | + | |
| 123 | + public String getReceiveTime() { | |
| 124 | + return receiveTime; | |
| 125 | + } | |
| 126 | + | |
| 127 | + public void setReceiveTime(String receiveTime) { | |
| 128 | + this.receiveTime = receiveTime; | |
| 129 | + } | |
| 130 | + | |
| 131 | + public String getStatus() { | |
| 132 | + return status; | |
| 133 | + } | |
| 134 | + | |
| 135 | + public void setStatus(String status) { | |
| 136 | + this.status = status; | |
| 137 | + } | |
| 138 | +} |