diff --git a/platform-biz-service/src/main/java/com/lyms/platform/permission/model/BabyPatientExtendEarHearingDiagnose.java b/platform-biz-service/src/main/java/com/lyms/platform/permission/model/BabyPatientExtendEarHearingDiagnose.java index a31066c..b9c7b20 100644 --- a/platform-biz-service/src/main/java/com/lyms/platform/permission/model/BabyPatientExtendEarHearingDiagnose.java +++ b/platform-biz-service/src/main/java/com/lyms/platform/permission/model/BabyPatientExtendEarHearingDiagnose.java @@ -1,8 +1,10 @@ package com.lyms.platform.permission.model; +import com.lyms.platform.common.dao.BaseQuery; + import java.util.Date; -public class BabyPatientExtendEarHearingDiagnose { +public class BabyPatientExtendEarHearingDiagnose extends BaseQuery{ /** * 主键 diff --git a/platform-biz-service/src/main/resources/mainOrm/master/BabyPatientExtendEarHearingDiagnose.xml b/platform-biz-service/src/main/resources/mainOrm/master/BabyPatientExtendEarHearingDiagnose.xml index 09260e6..4655432 100644 --- a/platform-biz-service/src/main/resources/mainOrm/master/BabyPatientExtendEarHearingDiagnose.xml +++ b/platform-biz-service/src/main/resources/mainOrm/master/BabyPatientExtendEarHearingDiagnose.xml @@ -803,6 +803,87 @@ select id,baby_id,hospital_id,diagnose_time,high_factor,abr_left_dbnhl,abr_left_ + + + \ No newline at end of file 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 97c3e0e..7e2db59 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 @@ -237,6 +237,7 @@ public class FollowUpController extends BaseController { query.setFollowUpStartTime(fur.getFollowUpStartTime()); query.setFollowUpEndTime(fur.getFollowUpEndTime()); query.setFollowDoctorId(fur.getFollowDoctorId()); + query.setIfdel(0); //如果查询号不为空，根据查询号查询儿童档案表，获取儿童档案Id if (fur.getKeyWord() != null) {//关键字：姓名、联系方式、就诊卡 查询babyId diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/HearDiagnManageController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/HearDiagnManageController.java new file mode 100644 index 0000000..7acbc53 --- /dev/null +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/HearDiagnManageController.java @@ -0,0 +1,184 @@ +package com.lyms.platform.operate.web.controller; + +import com.lyms.platform.common.annotation.TokenRequired; +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.enums.ConfirmedEnums; +import com.lyms.platform.common.enums.HighRiskEnum; +import com.lyms.platform.common.result.BaseListResponse; +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.request.HearDiaManageRequest; +import com.lyms.platform.operate.web.result.HearingDiagnoseListResult; +import com.lyms.platform.permission.model.BabyPatientExtendEarHearingDiagnose; +import com.lyms.platform.permission.model.BabyPatientExtendEarHearingDiagnoseQuery; +import com.lyms.platform.permission.model.Users; +import com.lyms.platform.permission.service.BabyPatientExtendEarHearingDiagnoseService; +import com.lyms.platform.permission.service.UsersService; +import org.apache.commons.lang.StringUtils; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Controller; +import org.springframework.web.bind.annotation.RequestMapping; +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.HashMap; +import java.util.List; +import java.util.Map; + +/** + * @auther yangfei + * @createTime 2017年07月26日 15时56分 + * @discription 儿童听力管理 + */ +@Controller +@RequestMapping("hearDiaManage") +public class HearDiagnManageController extends BaseController { + @Autowired + private BabyPatientExtendEarHearingDiagnoseService hearingDiagnoseService; + @Autowired + private AutoMatchFacade autoMatchFacade; + @Autowired + private UsersService usersService; + + /** + * 获取确诊儿童列表（听力诊断表，当前医院的确诊的数据） + * + * @return + */ + @RequestMapping(method = RequestMethod.GET, value = "/getConfirmDiagList") + @ResponseBody + @TokenRequired + public BaseResponse getConfirmDiagList(HearDiaManageRequest hdReq, HttpServletRequest request) { + //获取当前登录用户ID + LoginContext loginState = (LoginContext) request.getAttribute("loginContext"); + if (loginState == null) { + return new BaseResponse().setErrorcode(ErrorCodeConstants.TOKEN_EXPIRE).setErrormsg("请重新登录"); + } +//当前登录人医院Id + String hospitalId = autoMatchFacade.getHospitalId(loginState.getId()); + + BabyPatientExtendEarHearingDiagnoseQuery query = new BabyPatientExtendEarHearingDiagnoseQuery(); + + query.setHospitalId(hospitalId); + if (hdReq.getDiagnDoctorId() != null) {//诊断医生 + query.setDiagnDoctorId(hdReq.getDiagnDoctorId()); + } + + if (hdReq.getConfirmStartTime() != null) {//确诊开始时间 + query.setConfirmStartTime(hdReq.getConfirmStartTime()); + } + + if (hdReq.getConfirmEndTime() != null) {//确诊结束时间 + query.setConfirmEndTime(hdReq.getConfirmEndTime()); + } + //设置确诊 + query.setIsconfirm(1); + if (hdReq.getConfirmDegree() != null) {//模糊查询确诊结果 + List cfList = new ArrayList<>(); + if (hdReq.getConfirmDegree() == 1) {//轻度 + cfList.add(",1,"); + cfList.add(",2,"); + cfList.add(",3,"); + } else if (hdReq.getConfirmDegree() == 2) {//中度 + cfList.add(",4,"); + cfList.add(",5,"); + cfList.add(",6,"); + } else if (hdReq.getConfirmDegree() == 3) {//重度 + cfList.add(",7,"); + cfList.add(",8,"); + cfList.add(",9,"); + cfList.add(",10,"); + cfList.add(",11,"); + cfList.add(",12,"); + } else if (hdReq.getConfirmDegree() == 4) {//极重度 + cfList.add(",13,"); + cfList.add(",14,"); + cfList.add(",15,"); + } + query.setConfirmResults(cfList.toArray(new String[cfList.size()])); + } + query.setSort("diagnose_time"); + query.setNeed("1"); + + List hearingDiagnoseList = hearingDiagnoseService.getHdAndScreen(query); + + List hdList = new ArrayList<>(); + + for(BabyPatientExtendEarHearingDiagnose hd :hearingDiagnoseList ){ + HearingDiagnoseListResult hea = new HearingDiagnoseListResult(); + hea.setIsconfirm(hd.getIsconfirm() == null ? "未确诊" : hd.getIsconfirm() == 0 ? "未确诊" : "已确诊"); + hea.setId(hd.getId()); + hea.setDiagnoseTime(DateUtil.getyyyy_MM_dd(hd.getDiagnoseTime())); + String docotorId = hd.getDiagnDoctorId(); + Users users = usersService.getUsers(Integer.parseInt(docotorId==null?"0":docotorId)); + if (users != null) { + hea.setDoctorName(users.getName() == null ? "-" : users.getName()); + } + hea.setHdTime(com.lyms.platform.common.utils.StringUtils.emptyDeal(DateUtil.getyyyy_MM_dd(hd.getDiagnoseTime()))); + if (hd.getHighFactor() != null) { + String hf[] = hd.getHighFactor().split(","); + // List> highRiskEnums = new ArrayList<>(); + StringBuffer hrSb = new StringBuffer(); + for (int b = 0; b < hf.length; b++) { + if (StringUtils.isNotEmpty(hf[b])) { + Map map = new HashMap<>(); + String title = HighRiskEnum.getTitle(Integer.parseInt(hf[b])); + map.put(Integer.parseInt(hf[b]), title); + // highRiskEnums.add(map); + hrSb.append(title+","); + } + } + // hea.setHighRiskEnums(highRiskEnums); + hea.setHighRiskEnums(hrSb.toString()); + } + //确诊结果 + if (hd.getConfirmResult() != null) { + String cr[] = hd.getConfirmResult().split(","); + // List> hdEnums = new ArrayList<>(); + StringBuffer hdSb = new StringBuffer(); + for (int b = 0; b < cr.length; b++) { + if (StringUtils.isNotEmpty(cr[b])) { + Map map = new HashMap<>(); + String title = ConfirmedEnums.getTitle(Integer.parseInt(cr[b])); + map.put(Integer.parseInt(cr[b]), title); + // hdEnums.add(map); + hdSb.append(title+"，"); + } + } + // hea.setDiagnResult(hdEnums); + hea.setDiagnResult(hdSb.toString()); + } + hdList.add(hea); + } + BaseListResponse result = new BaseListResponse(); + result.setData(hdList); + result.setPageInfo(query.getPageInfo()); + return result; + } + + /** + * 获取听力可疑儿童列表（听力筛查表，当前医院的复诊未通过的数据） + * + * @param request + * @return + */ + @RequestMapping(method = RequestMethod.GET, value = "/getSuspDiagList") + @ResponseBody + @TokenRequired + public BaseResponse getSuspDiagList(HearDiaManageRequest model, HttpServletRequest request) { + //获取当前登录用户ID + LoginContext loginState = (LoginContext) request.getAttribute("loginContext"); + if (loginState == null) { + return new BaseResponse().setErrorcode(ErrorCodeConstants.TOKEN_EXPIRE).setErrormsg("请重新登录"); + } +//当前登录人医院Id + String hospitalId = autoMatchFacade.getHospitalId(loginState.getId()); + return null; + } + +} 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 0b4339c..b51cb09 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 @@ -391,7 +391,6 @@ public class HearingDiagnoseController extends BaseController { cfList.add(",7,"); cfList.add(",8,"); cfList.add(",9,"); - } else if (hdReq.getConfirmDegree() == 3) {//重度 cfList.add(",10,"); cfList.add(",11,"); cfList.add(",12,"); diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/HearDiaManageRequest.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/HearDiaManageRequest.java new file mode 100644 index 0000000..1d8051d --- /dev/null +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/HearDiaManageRequest.java @@ -0,0 +1,171 @@ +package com.lyms.platform.operate.web.request; + +import java.util.Date; + +/** + * @auther yangfei + * @createTime 2017年07月26日 16时26分 + * @discription + */ +public class HearDiaManageRequest extends BasePageQueryRequest{ + /** + * 确诊开始时间 + */ + private Date confirmStartTime; + /** + * 确诊结束时间 + */ + private Date confirmEndTime; + + /** + * 出生日期开始时间 + */ + private Date birthStartTime; + /** + * 出生日期结束时间 + */ + private Date birthEndTime; + /** + * 确诊结果 0-全部，1-轻度耳聋，2-中度耳聋，3-重度耳聋，4-极重耳聋 + */ + private Integer confirmResult; + /** + * 确诊程度 0-全部，1-轻度，2-中度，3-重度，4-极重 + */ + private Integer confirmDegree; + + /** + * 诊断医生 + */ + private String diagnDoctorId; + /** + * 查询号：姓名、联系方式、就诊卡 + */ + private String keyWord; + + /** + * 听筛开始时间 + */ + private Date secrStartTime; + /** + * 听筛结束时间 + */ + private Date secrEndTime; + /** + * 状态 1-已诊断、2-待诊断、3-全部 + */ + private Integer status; + + /** + * 诊断开始时间 + */ + private Date diagnoseStartTime; + /** + * 诊断结束时间 + */ + private Date diagnoseEndTime; + + public Date getConfirmStartTime() { + return confirmStartTime; + } + + public void setConfirmStartTime(Date confirmStartTime) { + this.confirmStartTime = confirmStartTime; + } + + public Date getConfirmEndTime() { + return confirmEndTime; + } + + public void setConfirmEndTime(Date confirmEndTime) { + this.confirmEndTime = confirmEndTime; + } + + public Date getBirthStartTime() { + return birthStartTime; + } + + public void setBirthStartTime(Date birthStartTime) { + this.birthStartTime = birthStartTime; + } + + public Date getBirthEndTime() { + return birthEndTime; + } + + public void setBirthEndTime(Date birthEndTime) { + this.birthEndTime = birthEndTime; + } + + public Integer getConfirmResult() { + return confirmResult; + } + + public void setConfirmResult(Integer confirmResult) { + this.confirmResult = confirmResult; + } + + public Integer getConfirmDegree() { + return confirmDegree; + } + + public void setConfirmDegree(Integer confirmDegree) { + this.confirmDegree = confirmDegree; + } + + public String getDiagnDoctorId() { + return diagnDoctorId; + } + + public void setDiagnDoctorId(String diagnDoctorId) { + this.diagnDoctorId = diagnDoctorId; + } + + public String getKeyWord() { + return keyWord; + } + + public void setKeyWord(String keyWord) { + this.keyWord = keyWord; + } + + public Date getSecrStartTime() { + return secrStartTime; + } + + public void setSecrStartTime(Date secrStartTime) { + this.secrStartTime = secrStartTime; + } + + public Date getSecrEndTime() { + return secrEndTime; + } + + public void setSecrEndTime(Date secrEndTime) { + this.secrEndTime = secrEndTime; + } + + public Integer getStatus() { + return status; + } + + public void setStatus(Integer status) { + this.status = status; + } + + public Date getDiagnoseStartTime() { + return diagnoseStartTime; + } + + public void setDiagnoseStartTime(Date diagnoseStartTime) { + this.diagnoseStartTime = diagnoseStartTime; + } + + public Date getDiagnoseEndTime() { + return diagnoseEndTime; + } + + public void setDiagnoseEndTime(Date diagnoseEndTime) { + this.diagnoseEndTime = diagnoseEndTime; + } +} diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/HearingDiagnoseRequest.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/HearingDiagnoseRequest.java index a51a9c4..bd4258e 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/HearingDiagnoseRequest.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/HearingDiagnoseRequest.java @@ -63,6 +63,7 @@ public class HearingDiagnoseRequest extends BasePageQueryRequest{ private Date confirmEndTime; + public String getDiagnDoctorId() { return diagnDoctorId; }