diff --git a/platform-biz-service/src/main/resources/mainOrm/master/BabyPatientExtendEarFollowUp.xml b/platform-biz-service/src/main/resources/mainOrm/master/BabyPatientExtendEarFollowUp.xml
index c8b149d..d6b3221 100644
--- a/platform-biz-service/src/main/resources/mainOrm/master/BabyPatientExtendEarFollowUp.xml
+++ b/platform-biz-service/src/main/resources/mainOrm/master/BabyPatientExtendEarFollowUp.xml
@@ -287,9 +287,4 @@ select id,baby_id,follow_time,follow_addr,mark_time,mark_result,mark_detail,foll
and ifdel = 0
-
-
-
-
-
\ No newline at end of file
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 0b4c2a7..1cfc595 100644
--- a/platform-biz-service/src/main/resources/mainOrm/master/BabyPatientExtendEarHearingDiagnose.xml
+++ b/platform-biz-service/src/main/resources/mainOrm/master/BabyPatientExtendEarHearingDiagnose.xml
@@ -818,7 +818,7 @@ select id,baby_id,hospital_id,diagnose_time,high_factor,abr_left_dbnhl,abr_left_
select hd.id,hd.baby_id,max(hd.diagnose_time) diagnose_time,hd.high_factor,hd.confirm_result,hd.diagn_doctor_id,diagn_result,isconfirm,diagn_hand_sugge
from baby_patient_extend_ear_hearing_diagnose hd
-
+ 1 = 1
AND
-
+
and
hd.confirm_result like concat("%",#{confirmResult},"%")
@@ -887,9 +887,9 @@ select id,baby_id,hospital_id,diagnose_time,high_factor,abr_left_dbnhl,abr_left_
)
- group by baby_id
- )a
+ group by baby_id
+ )a
@@ -898,7 +898,7 @@ select id,baby_id,hospital_id,diagnose_time,high_factor,abr_left_dbnhl,abr_left_
select hd.id,hd.baby_id,max(hd.diagnose_time) diagnose_time,hd.high_factor,hd.confirm_result,hd.diagn_doctor_id,diagn_result,isconfirm,diagn_hand_sugge
from baby_patient_extend_ear_hearing_diagnose hd
-
+ 1=1
AND
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");
+
+ 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());
+ }
+ BabyModel babyModel = babyService.getOneBabyById(hd.getBabyId());
+ if (babyModel != null) {
+ hea.setBabyName(babyModel.getName());
+ hea.setBabyId(hd.getBabyId());
+ hea.setMommyName(com.lyms.platform.common.utils.StringUtils.emptyDeal(babyModel.getMname()));
+ hea.setMommnyPhone(com.lyms.platform.common.utils.StringUtils.emptyDeal(babyModel.getMphone()));
+ hea.setMommnyEncryptPhone(com.lyms.platform.common.utils.StringUtils.encryPhone(babyModel.getMphone()));
+ hea.setMonthAge(DateUtil.getBabyMonthAge(babyModel.getBirth(), new Date()));
+ hea.setBirthday(com.lyms.platform.common.utils.StringUtils.emptyDeal(DateUtil.getyyyy_MM_dd(babyModel.getBirth())));
+ hea.setSex(com.lyms.platform.common.utils.StringUtils.emptyDeal(SexEnum.getTextById(babyModel.getSex())));
+ }
+ hea.setHdTime(com.lyms.platform.common.utils.StringUtils.emptyDeal(DateUtil.getyyyy_MM_dd(hd.getDiagnoseTime())));
+ if (hd.getHighFactor() != null) {
+ String hf[] = hd.getHighFactor().split(",");
+ 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(",");
+ 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);
+ }
+
+ Map cnames = new LinkedHashMap<>();
+ cnames.put("id", "#");
+ cnames.put("babyName", "儿童姓名");
+ cnames.put("mommyName", "母亲姓名");
+ cnames.put("monthAge", "月龄");
+ cnames.put("birthday", "出生日期");
+ cnames.put("screenType", "诊断日期");
+ cnames.put("sex", "性别");
+ cnames.put("highRiskEnums", "高危因素");
+ cnames.put("diagnResult", "确诊结果");
+ cnames.put("doctorName", "诊断医生");
+ cnames.put("mommnyPhone", "联系电话");
+
+ List> results = new ArrayList<>();
+ for (int i =0;i result = new LinkedHashMap<>();
+ result.put("id", i + 1);
+ result.put("babyName", ch.getBabyName());
+ result.put("mommyName", ch.getMommyName());
+ result.put("monthAge", ch.getMonthAge());
+ result.put("birthday", ch.getBirthday());
+ result.put("hdTime", ch.getHdTime());
+ result.put("sex", ch.getSex());
+ result.put("highRiskEnums", ch.getHighRiskEnums());
+ result.put("diagnResult", ch.getDiagnResult());
+ result.put("doctorName", ch.getDoctorName());
+ result.put("mommnyPhone", ch.getMommnyPhone());
+ results.add(result);
+ }
+ ResponseUtil.responseExcel(cnames,results, resp);
+ }
+
+ /**
* 获取确诊儿童列表（听力诊断表，当前医院的确诊的数据）
*
* @return
@@ -360,7 +515,7 @@ public class HearDiagnManageController extends BaseController {
hearDiagnManageListResults.add(hdm);
}
}else{
- return new BaseResponse().setErrorcode(ErrorCodeConstants.NO_DATA).setErrormsg("没有数据");
+ return new BaseResponse().setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("没有数据");
}
BaseListResponse result = new BaseListResponse();
PageInfo pageInfo = new PageInfo();
@@ -400,6 +555,254 @@ public class HearDiagnManageController extends BaseController {
return result;
}
+ /**
+ * 导出获取听力可疑儿童列表（听力筛查表，当前医院的复诊未通过的数据）
+ *
+ * @param request
+ * @return
+ */
+ @RequestMapping(method = RequestMethod.GET, value = "/extSuspDiagList")
+ @ResponseBody
+ @TokenRequired
+ public void extSuspDiagList(HearDiaManageRequest model, HttpServletRequest request, HttpServletResponse resp) {
+ //获取当前登录用户ID
+ LoginContext loginState = (LoginContext) request.getAttribute("loginContext");
+ if (loginState == null) {
+ return ;
+ }
+//当前登录人医院Id
+ String hospitalId = autoMatchFacade.getHospitalId(loginState.getId());
+
+ ChildrenPersonQuery query = new ChildrenPersonQuery();
+ if (StringUtils.isNotEmpty(model.getKeyWord())) {//查询号不为空
+ query.setKeyWord(model.getKeyWord());
+ }
+
+ if (model.getBirthStartTime() != null) {//儿童出生开始日期
+ query.setStartBirthday(model.getBirthStartTime());
+ }
+
+ if (model.getBirthEndTime() != null) {//儿童出生结束日期
+ query.setEndBirthday(model.getBirthEndTime());
+ }
+ List babyIds = new ArrayList<>();
+ // List childrenPersonList = childrenPersonService.queryChildrenPerson(query);
+ // if (CollectionUtils.isNotEmpty(childrenPersonList)) {
+ // for (ChildrenPerson cp : childrenPersonList) {
+ // //获取babyid,还未表还未增加
+ // }
+ // }
+
+
+ BabyPatientExtendEarScreenQuery screenQuery = new BabyPatientExtendEarScreenQuery();
+ //听筛开始时间
+ if (model.getSecrStartTime() != null) {
+ screenQuery.setScreenStartDate(model.getSecrStartTime());
+ }
+ //开始结束时间
+ if (model.getSecrEndTime() != null) {
+ screenQuery.setScreenEndDate(model.getSecrEndTime());
+ }
+ //检测医生ID
+ if (model.getDiagnDoctorId() != null) {
+ screenQuery.setCheckDoctorId(model.getDiagnDoctorId());
+ }
+ //查询全部数据
+ List earScreens = screenService.dubiousScreen(screenQuery);
+
+ //已诊断数据
+ List alrScreens = new ArrayList<>();
+ //未诊断数据
+ List notScreens = new ArrayList<>();
+ //全部数据
+ List hearDiagnManageListResults = new ArrayList<>();
+ //要返回的数据
+ List hdmResult = new ArrayList<>();
+ if (CollectionUtils.isNotEmpty(earScreens)) {
+ for (BabyPatientExtendEarScreen es : earScreens) {
+ HearDiagnManageListResult hdm = new HearDiagnManageListResult();
+ hdm.setId(es.getId());
+ String docotorId = es.getCheckDoctorId();
+ Users users = usersService.getUsers(Integer.parseInt(docotorId == null ? "0" : docotorId));
+ if (users != null) {
+ hdm.setDoctorName(users.getName() == null ? "-" : users.getName());
+ }
+ hdm.setSecrTime(DateUtil.getyyyy_MM_dd(es.getScreenDate()));
+ BabyModel babyModel = babyService.getOneBabyById(es.getBabyId());
+ if (babyModel != null) {
+ hdm.setBabyName(babyModel.getName());
+ hdm.setBabyId(es.getBabyId());
+ hdm.setMommyName(com.lyms.platform.common.utils.StringUtils.emptyDeal(babyModel.getMname()));
+ hdm.setMommnyPhone(com.lyms.platform.common.utils.StringUtils.emptyDeal(babyModel.getMphone()));
+ hdm.setMommnyEncryptPhone(com.lyms.platform.common.utils.StringUtils.encryPhone(babyModel.getMphone()));
+ hdm.setMonthAge(DateUtil.getBabyMonthAge(babyModel.getBirth(), new Date()));
+ hdm.setBirthday(com.lyms.platform.common.utils.StringUtils.emptyDeal(DateUtil.getyyyy_MM_dd(babyModel.getBirth())));
+ hdm.setSex(com.lyms.platform.common.utils.StringUtils.emptyDeal(SexEnum.getTextById(babyModel.getSex())));
+ }
+ String babyId = es.getBabyId();
+ BabyPatientExtendEarHearingDiagnoseQuery hdQuery = new BabyPatientExtendEarHearingDiagnoseQuery();
+ hdQuery.setBabyId(babyId);
+ //根据babyId查询听力诊断，如果有数据则已诊断
+ int count = hearingDiagnoseService.queryBabyPatientExtendEarHearingDiagnoseCount(hdQuery);
+ hdm.setSecrType("复诊");
+ hdm.setSecrResult("未通过");
+ if(count>0){//儿童在医院里做过听力诊断记录，标记为已诊断
+ hdm.setStatus("已诊断");
+ alrScreens.add(hdm);
+ }else{
+ hdm.setStatus("未诊断");
+ notScreens.add(hdm);
+ }
+ hearDiagnManageListResults.add(hdm);
+ }
+ }else{
+ return ;
+ }
+ if(model.getStatus()==null){
+ hdmResult.addAll(hearDiagnManageListResults);
+ }else {
+ // 1-已诊断、2-待诊断
+ if (model.getStatus() == 1) {
+ hdmResult.addAll(alrScreens);
+ } else if (model.getStatus() == 2) {
+ hdmResult.addAll(notScreens);
+ } else {
+ hdmResult.addAll(hearDiagnManageListResults);
+ }
+ }
+
+ Map cnames = new LinkedHashMap<>();
+ cnames.put("id", "#");
+ cnames.put("babyName", "儿童姓名");
+ cnames.put("mommyName", "母亲姓名");
+ cnames.put("monthAge", "月龄");
+ cnames.put("birthday", "出生日期");
+ cnames.put("highRiskEnums", "高危因素");
+ cnames.put("secrTime", "筛查日期");
+ cnames.put("sex", "性别");
+ cnames.put("secrType", "筛查类型");
+ cnames.put("secrResult", "筛查结果");
+ cnames.put("status", "状态");
+ cnames.put("doctorName", "筛查医生");
+ cnames.put("mommnyPhone", "联系电话");
+
+ List> results = new ArrayList<>();
+ for (int i =0;i result = new LinkedHashMap<>();
+ result.put("id", i + 1);
+ result.put("babyName", ch.getBabyName());
+ result.put("mommyName", ch.getMommyName());
+ result.put("monthAge", ch.getMonthAge());
+ result.put("birthday", ch.getBirthday());
+ result.put("highRiskEnums", ch.getHighRiskEnums());
+ result.put("secrTime", ch.getSecrTime());
+ result.put("sex", ch.getSex());
+ result.put("secrType", ch.getSecrType());
+ result.put("secrResult", ch.getSecrResult());
+ result.put("status", ch.getStatus());
+ result.put("doctorName", ch.getDoctorName());
+ result.put("mommnyPhone", ch.getMommnyPhone());
+ results.add(result);
+ }
+ ResponseUtil.responseExcel(cnames,results, resp);
+
+ }
+
+
+ /**
+ * 导出听力可疑儿童列表（听力筛查表，当前医院的复诊未通过的数据）
+ *
+ * @param request
+ * @return
+ */
+ @RequestMapping(method = RequestMethod.GET, value = "/extAllDiagList")
+ @ResponseBody
+ @TokenRequired
+ public void extAllDiagList(HearDiaManageRequest model, HttpServletRequest request,HttpServletResponse resp) {
+ //获取当前登录用户ID
+ LoginContext loginState = (LoginContext) request.getAttribute("loginContext");
+ if (loginState == null) {
+ return ;
+ }
+//当前登录人医院Id
+ String hospitalId = autoMatchFacade.getHospitalId(loginState.getId());
+ BabyPatientExtendEarScreenQuery screenQuery = new BabyPatientExtendEarScreenQuery();
+ //检测医生ID
+ if (model.getDiagnDoctorId() != null) {
+ screenQuery.setCheckDoctorId(model.getDiagnDoctorId());
+ }
+ screenQuery.setCheckHospitalId(hospitalId);
+ List earScreens = screenService.notAuscultationBabyPatientExtendEarScreen(screenQuery);
+ //查询全部数据
+ List hdmResult = new ArrayList<>();
+ if (CollectionUtils.isNotEmpty(earScreens)) {
+ for (BabyPatientExtendEarScreen es : earScreens) {
+ HearDiagnManageListResult hdm = new HearDiagnManageListResult();
+ hdm.setId(es.getId());
+ String docotorId = es.getCheckDoctorId();
+ Users users = usersService.getUsers(Integer.parseInt(docotorId == null ? "0" : docotorId));
+ if (users != null) {
+ hdm.setDoctorName(users.getName() == null ? "-" : users.getName());
+ }
+ hdm.setSecrTime(DateUtil.getyyyy_MM_dd(es.getScreenDate()));
+ BabyModel babyModel = babyService.getOneBabyById(es.getBabyId());
+ if (babyModel != null) {
+ hdm.setBabyName(babyModel.getName());
+ hdm.setBabyId(es.getBabyId());
+ hdm.setMommyName(com.lyms.platform.common.utils.StringUtils.emptyDeal(babyModel.getMname()));
+ hdm.setMommnyPhone(com.lyms.platform.common.utils.StringUtils.emptyDeal(babyModel.getMphone()));
+ hdm.setMommnyEncryptPhone(com.lyms.platform.common.utils.StringUtils.encryPhone(babyModel.getMphone()));
+ hdm.setMonthAge(DateUtil.getBabyMonthAge(babyModel.getBirth(), new Date()));
+ hdm.setBirthday(com.lyms.platform.common.utils.StringUtils.emptyDeal(DateUtil.getyyyy_MM_dd(babyModel.getBirth())));
+ hdm.setSex(com.lyms.platform.common.utils.StringUtils.emptyDeal(SexEnum.getTextById(babyModel.getSex())));
+ }
+ String babyId = es.getBabyId();
+ BabyPatientExtendEarHearingDiagnoseQuery hdQuery = new BabyPatientExtendEarHearingDiagnoseQuery();
+ hdQuery.setBabyId(babyId);
+ //根据babyId查询听力诊断，如果有数据则已诊断
+ int count = hearingDiagnoseService.queryBabyPatientExtendEarHearingDiagnoseCount(hdQuery);
+ hdm.setSecrType("复诊");
+ hdm.setSecrResult("未通过");
+ if (count > 0) {//儿童在医院里做过听力诊断记录，标记为已诊断
+ hdm.setStatus("已诊断");
+ } else {
+ hdm.setStatus("未诊断");
+ }
+ hdmResult.add(hdm);
+ }
+
+ Map cnames = new LinkedHashMap<>();
+ cnames.put("id", "#");
+ cnames.put("babyName", "儿童姓名");
+ cnames.put("mommyName", "母亲姓名");
+ cnames.put("monthAge", "月龄");
+ cnames.put("birthday", "出生日期");
+ cnames.put("highRiskEnums", "高危因素");
+ cnames.put("secrTime", "筛查日期");
+ cnames.put("sex", "性别");
+ cnames.put("doctorName", "筛查医生");
+ cnames.put("mommnyPhone", "联系电话");
+
+ List> results = new ArrayList<>();
+ for (int i =0;i result = new LinkedHashMap<>();
+ result.put("id", i + 1);
+ result.put("babyName", ch.getBabyName());
+ result.put("mommyName", ch.getMommyName());
+ result.put("monthAge", ch.getMonthAge());
+ result.put("birthday", ch.getBirthday());
+ result.put("highRiskEnums", ch.getHighRiskEnums());
+ result.put("secrTime", ch.getSecrTime());
+ result.put("sex", ch.getSex());
+ result.put("doctorName", ch.getDoctorName());
+ result.put("mommnyPhone", ch.getMommnyPhone());
+ results.add(result);
+ }
+ ResponseUtil.responseExcel(cnames,results, resp);
+ }
+ }
/**
* 获取听力可疑儿童列表（听力筛查表，当前医院的复诊未通过的数据）
@@ -418,6 +821,82 @@ public class HearDiagnManageController extends BaseController {
}
//当前登录人医院Id
String hospitalId = autoMatchFacade.getHospitalId(loginState.getId());
+
+ BabyModelQuery babyQuery = new BabyModelQuery();
+
+ Date currentDate = DateUtil.formatDate(new Date());
+ if(com.lyms.platform.common.utils.StringUtils.isNotEmpty(model.getBirth()) && model.getMonthAgeStart() != null && model.getMonthAgeEnd() != null)
+ {
+
+ Date start = DateUtil.addMonth(currentDate, -model.getMonthAgeStart());
+ String birthStr = model.getBirth();
+ String[] dates = birthStr.split(" - ");
+
+ if (DateUtil.parseYMD(dates[1]).getTime() < start.getTime())
+ {
+ babyQuery.setBirthEnd(DateUtil.parseYMD(dates[1]));
+ }
+ else
+ {
+ babyQuery.setBirthEnd(start);
+ }
+
+ Date end = DateUtil.addDay(DateUtil.addMonth(currentDate, -model.getMonthAgeEnd() - 1), 1);
+
+ if (DateUtil.parseYMD(dates[0]).getTime() < end.getTime())
+ {
+ babyQuery.setBirthStart(end);
+ }
+ else
+ {
+ babyQuery.setBirthStart(DateUtil.parseYMD(dates[0]));
+ }
+ }
+ else if (com.lyms.platform.common.utils.StringUtils.isNotEmpty(model.getBirth()) && model.getMonthAgeStart() != null )
+ {
+
+ Date start = DateUtil.addMonth(currentDate, -model.getMonthAgeStart());
+ String birthStr = model.getBirth();
+ String[] dates = birthStr.split(" - ");
+
+ if (DateUtil.parseYMD(dates[1]).getTime() < start.getTime())
+ {
+ babyQuery.setBirthEnd(DateUtil.parseYMD(dates[1]));
+ }
+ else
+ {
+ babyQuery.setBirthEnd(start);
+ }
+
+ babyQuery.setBirthStart(DateUtil.parseYMD(dates[0]));
+
+ }
+ else if (com.lyms.platform.common.utils.StringUtils.isNotEmpty(model.getBirth()))
+ {
+ String birthStr = model.getBirth();
+ String[] dates = birthStr.split(" - ");
+ babyQuery.setBirthStart(DateUtil.parseYMD(dates[0]));
+ babyQuery.setBirthEnd(new Date(DateUtil.parseYMD(dates[1]).getTime()+24*60*60*1000 -1 ));
+ }
+ else if (model.getMonthAgeStart() != null && model.getMonthAgeEnd() != null)
+ {
+ Date start = DateUtil.addMonth(currentDate, -model.getMonthAgeStart());
+ babyQuery.setBirthEnd(start);
+
+ Date end = DateUtil.addDay(DateUtil.addMonth(currentDate, -model.getMonthAgeEnd() - 1), 1);
+ babyQuery.setBirthStart(end);
+ }
+ else if (model.getMonthAgeStart() != null)
+ {
+ Date start = DateUtil.addMonth(currentDate, -model.getMonthAgeStart());
+ babyQuery.setBirthEnd(start);
+ }
+ else if (model.getMonthAgeEnd() != null)
+ {
+ Date end = DateUtil.addDay(DateUtil.addMonth(currentDate, -model.getMonthAgeEnd() - 1), 1);
+ babyQuery.setBirthStart(end);
+ }
+
BabyPatientExtendEarScreenQuery screenQuery = new BabyPatientExtendEarScreenQuery();
//检测医生ID
if (model.getDiagnDoctorId() != null) {
@@ -472,7 +951,7 @@ public class HearDiagnManageController extends BaseController {
result.setData(hdmResult);
return result;
} else {
- return new BaseResponse().setErrorcode(ErrorCodeConstants.NO_DATA).setErrormsg("没有数据");
+ return new BaseResponse().setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("没有数据");
}
}
}
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 c0e36df..f4b9853 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
@@ -5,7 +5,6 @@ import com.lyms.hospitalapi.fnfy.FnfyHisService;
import com.lyms.hospitalapi.qhdfy.QhdfyHisService;
import com.lyms.hospitalapi.qinglongxian.QingLongXianHisService;
import com.lyms.hospitalapi.v2.HisService;
-import com.lyms.platform.beans.*;
import com.lyms.platform.biz.service.*;
import com.lyms.platform.common.constants.ErrorCodeConstants;
import com.lyms.platform.common.dao.operator.MongoQuery;
@@ -15,8 +14,6 @@ import com.lyms.platform.common.result.BaseObjectResponse;
import com.lyms.platform.common.result.BaseResponse;
import com.lyms.platform.common.utils.*;
import com.lyms.platform.operate.web.request.*;
-import com.lyms.platform.operate.web.request.MessageListRequest;
-import com.lyms.platform.operate.web.request.MessageRequest;
import com.lyms.platform.operate.web.result.*;
import com.lyms.platform.operate.web.utils.BabyListTask;
import com.lyms.platform.operate.web.utils.GrowthCountTask;
@@ -2103,7 +2100,6 @@ public class BabyBookbuildingFacade {
if (DateUtil.parseYMD(dates[1]).getTime() < start.getTime())
{
babyQuery.setBirthEnd(DateUtil.parseYMD(dates[1]));
-
}
else
{
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
index 1d8051d..deff425 100644
--- 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
@@ -64,6 +64,36 @@ public class HearDiaManageRequest extends BasePageQueryRequest{
* 诊断结束时间
*/
private Date diagnoseEndTime;
+ //生日
+ private String birth;
+ //开始月龄
+ private Integer monthAgeStart;
+ //结束月龄
+ private Integer monthAgeEnd;
+
+ public String getBirth() {
+ return birth;
+ }
+
+ public void setBirth(String birth) {
+ this.birth = birth;
+ }
+
+ public Integer getMonthAgeStart() {
+ return monthAgeStart;
+ }
+
+ public void setMonthAgeStart(Integer monthAgeStart) {
+ this.monthAgeStart = monthAgeStart;
+ }
+
+ public Integer getMonthAgeEnd() {
+ return monthAgeEnd;
+ }
+
+ public void setMonthAgeEnd(Integer monthAgeEnd) {
+ this.monthAgeEnd = monthAgeEnd;
+ }
public Date getConfirmStartTime() {
return confirmStartTime;