From 5f95c21d83d576a7c66eb0daa8cb717b562d7b6e Mon Sep 17 00:00:00 2001 From: gengxiaokai Date: Fri, 7 Sep 2018 23:18:39 +0800 Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E7=94=9F=E5=84=BF=E5=AE=9E=E9=AA=8C?= =?UTF-8?q?=E5=AE=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../platform/biz/service/BabySieveService.java | 5 + .../com/lyms/platform/pojo/BabySieveModel.java | 12 + .../com/lyms/platform/query/BabyModelQuery.java | 15 +- .../com/lyms/platform/query/BabySieveQuery.java | 30 +- .../lyms/hospitalapi/qhdfy/QhdJbgwInterface.java | 6 + .../operate/web/facade/BabySieveFacede.java | 322 ++++++++++++--------- .../operate/web/request/BabySieveAddRequest.java | 11 + 7 files changed, 263 insertions(+), 138 deletions(-) diff --git a/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/BabySieveService.java b/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/BabySieveService.java index b01a9b0..e425c4f 100644 --- a/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/BabySieveService.java +++ b/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/BabySieveService.java @@ -4,6 +4,7 @@ import com.lyms.platform.biz.dal.IbabySieveDao; import com.lyms.platform.common.dao.operator.MongoQuery; import com.lyms.platform.pojo.BabySieveModel; import com.lyms.platform.query.BabySieveQuery; +import org.apache.commons.lang.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.data.domain.Sort; import org.springframework.stereotype.Service; @@ -22,6 +23,10 @@ public class BabySieveService { public List getBabySieveQuery(BabySieveQuery babySieveQuery){ MongoQuery query = babySieveQuery.convertToQuery(); + if (StringUtils.isNotEmpty(babySieveQuery.getNeed())) { + babySieveQuery.mysqlBuild(babySieveDao.queryBabySieveCount(query)); + query.start(babySieveQuery.getOffset()).end(babySieveQuery.getLimit()); + } return babySieveDao.queryBabySieve(query.addOrder(Sort.Direction.DESC, "created")); } diff --git a/platform-dal/src/main/java/com/lyms/platform/pojo/BabySieveModel.java b/platform-dal/src/main/java/com/lyms/platform/pojo/BabySieveModel.java index 255e422..88ddb4a 100644 --- a/platform-dal/src/main/java/com/lyms/platform/pojo/BabySieveModel.java +++ b/platform-dal/src/main/java/com/lyms/platform/pojo/BabySieveModel.java @@ -36,6 +36,9 @@ public class BabySieveModel extends BaseModel { //采血日期 private Date collectDate; + //筛查日期 + private Date sieveDate; + /****母亲信息*********/ //母亲姓名 @@ -91,6 +94,14 @@ public class BabySieveModel extends BaseModel { //修改时间 private Date modified; + public Date getSieveDate() { + return sieveDate; + } + + public void setSieveDate(Date sieveDate) { + this.sieveDate = sieveDate; + } + public String getDuescfs() { return duescfs; } @@ -320,6 +331,7 @@ public class BabySieveModel extends BaseModel { map.put("patientId",patientId); map.put("created",DateUtil.getyyyy_MM_dd(created)); map.put("modified",DateUtil.getyyyy_MM_dd(modified)); + map.put("sieveDate",DateUtil.getyyyy_MM_dd(sieveDate)); return map; } } diff --git a/platform-dal/src/main/java/com/lyms/platform/query/BabyModelQuery.java b/platform-dal/src/main/java/com/lyms/platform/query/BabyModelQuery.java index eb4e7c5..d538753 100644 --- a/platform-dal/src/main/java/com/lyms/platform/query/BabyModelQuery.java +++ b/platform-dal/src/main/java/com/lyms/platform/query/BabyModelQuery.java @@ -187,6 +187,17 @@ public class BabyModelQuery extends BaseQuery implements IConvertToNativeQuery { private List sieveStatusList; + //用来配合查询新筛实验室列表数据 + private List sieveStatusList2; + + public List getSieveStatusList2() { + return sieveStatusList2; + } + + public void setSieveStatusList2(List sieveStatusList2) { + this.sieveStatusList2 = sieveStatusList2; + } + public List getSieveStatusList() { return sieveStatusList; } @@ -943,7 +954,9 @@ public class BabyModelQuery extends BaseQuery implements IConvertToNativeQuery { } if(null != sieveStatusList){ condition = condition.and("sieveStatus", sieveStatusList, MongoOper.NIN); - + } + if(null != sieveStatusList2){ + condition = condition.and("sieveStatus", sieveStatusList2, MongoOper.IN); } diff --git a/platform-dal/src/main/java/com/lyms/platform/query/BabySieveQuery.java b/platform-dal/src/main/java/com/lyms/platform/query/BabySieveQuery.java index 9acd15e..c7408f9 100644 --- a/platform-dal/src/main/java/com/lyms/platform/query/BabySieveQuery.java +++ b/platform-dal/src/main/java/com/lyms/platform/query/BabySieveQuery.java @@ -26,7 +26,25 @@ public class BabySieveQuery extends BaseQuery implements IConvertToNativeQuery { private String testNumber;//血样码 private String collectHospitalId;//申请医院（采血单位） private String sendCheckHospitalId;//送检医院 - private String order; + private String order;//排序 + private Date sieveDateStart;//筛查开始时间 + private Date sieveDateEnd;//筛查结束时间 + + public Date getSieveDateStart() { + return sieveDateStart; + } + + public void setSieveDateStart(Date sieveDateStart) { + this.sieveDateStart = sieveDateStart; + } + + public Date getSieveDateEnd() { + return sieveDateEnd; + } + + public void setSieveDateEnd(Date sieveDateEnd) { + this.sieveDateEnd = sieveDateEnd; + } public String getOrder() { return order; @@ -154,6 +172,16 @@ public class BabySieveQuery extends BaseQuery implements IConvertToNativeQuery { c = Criteria.where("created").lte(applyDateEnd); } } + if(null != sieveDateStart){ + c = Criteria.where("sieveDate").gte(sieveDateStart); + } + if(null != sieveDateEnd){ + if (null != c) { + c = c.lte(sieveDateEnd); + } else { + c = Criteria.where("sieveDate").lte(sieveDateEnd); + } + } return condition.toMongoQuery(); } diff --git a/platform-operate-api/src/main/java/com/lyms/hospitalapi/qhdfy/QhdJbgwInterface.java b/platform-operate-api/src/main/java/com/lyms/hospitalapi/qhdfy/QhdJbgwInterface.java index 17a0860..a2a52a7 100644 --- a/platform-operate-api/src/main/java/com/lyms/hospitalapi/qhdfy/QhdJbgwInterface.java +++ b/platform-operate-api/src/main/java/com/lyms/hospitalapi/qhdfy/QhdJbgwInterface.java @@ -78,7 +78,13 @@ public class QhdJbgwInterface { if(list != null && list.size() > 0){ for(Patients patients : list){ try{ + AntExChuQuery antExChuQuery = new AntExChuQuery(); + antExChuQuery.setParentId(patients.getId()); + List aList = antExService.queryAntExChu(antExChuQuery); Map map = new HashMap(); + if(aList != null && aList.size() > 0){ + + } map.put("MATERNALINFOID",patients.getId()); map.put("NAME",patients.getUsername()); if("70ae1d93-2964-46bc-83fa-bec9ff605b1c".equals(patients.getHcertificateTypeId())){ diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabySieveFacede.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabySieveFacede.java index 3ccfef4..2b73012 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabySieveFacede.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabySieveFacede.java @@ -444,6 +444,7 @@ public class BabySieveFacede { */ public BabySieveManagerResult getBabySieveLab(BabySieveAddRequest babySieveAddRequest){ int status = 0; + int sta = 0; BabySieveManagerResult babySieveManagerResult = new BabySieveManagerResult(); BabySieveQuery babySieveQuery = new BabySieveQuery(); //只能查询出送检医院为本机构的筛查信息 @@ -455,7 +456,7 @@ public class BabySieveFacede { babySieveQuery.setOrder("created"); List babySieveList = babySieveService.getBabySieveQuery(babySieveQuery); List babySieveManagerLiat = new ArrayList(); - //判断是否有筛查申请及结果数据 + //判断是否有筛查申请及筛查结果数据 if(babySieveList != null && babySieveList.size() > 0){ if(StringUtils.isNotEmpty(babySieveAddRequest.getCollectHospitalId())){ babySieveQuery.setCollectHospitalId(babySieveAddRequest.getCollectHospitalId()); @@ -474,28 +475,188 @@ public class BabySieveFacede { babySieveQuery.setTestNumber(babySieveAddRequest.getTestNumber()); status = 1; } + if(StringUtils.isNotEmpty(babySieveAddRequest.getSieveDate())){ + try { + babySieveQuery.setSieveDateStart(DateUtil.getSNDate(babySieveAddRequest.getSieveDate())[0]); + babySieveQuery.setSieveDateEnd(DateUtil.getSNDate(babySieveAddRequest.getSieveDate())[1]); + status = 1; + } catch (Exception e) { + e.printStackTrace(); + } + } if(status == 1){ + int count = 0; + BabyModelQuery babyModelQuery = new BabyModelQuery(); + if(StringUtils.isNotEmpty(babySieveAddRequest.getQueryNo())){ + babyModelQuery.setQueryNo(babySieveAddRequest.getQueryNo()); + } + if(StringUtils.isNotEmpty(babySieveAddRequest.getSieveStatus())){ + babyModelQuery.setSieveStatus(babySieveAddRequest.getSieveStatus()); + sta = 1; + } + babyModelQuery.setDataStatus(false); + if(sta == 0){ + List sieveList = new ArrayList(); + sieveList.add("1"); + sieveList.add("2"); + sieveList.add("3"); + babyModelQuery.setSieveStatusList2(sieveList); + } + List bayModelList = babyService.queryBabyWithQuery(babyModelQuery); List list = babySieveService.getBabySieveQuery(babySieveQuery); - if(list != null && list.size() > 0){ - for(BabySieveModel babySieveModel : list){ - BabyModelQuery babyModelQuery = new BabyModelQuery(); - if(StringUtils.isNotEmpty(babySieveAddRequest.getQueryNo())){ - babyModelQuery.setQueryNo(babySieveAddRequest.getQueryNo()); - } - if(StringUtils.isNotEmpty(babySieveAddRequest.getSieveStatus())){ - babyModelQuery.setSieveStatus(babySieveAddRequest.getSieveStatus()); + babySieveQuery.setNeed(null); + List bslist = babySieveService.getBabySieveQuery(babySieveQuery); + for(BabySieveModel bsModel : bslist){ + for(BabyModel bModel : bayModelList){ + if(bsModel.getBabyId().equals(bModel.getId())){ + count += 1; + continue; } - babyModelQuery.setDataStatus(false); - babyModelQuery.setId(babySieveModel.getBabyId()); + } + } + if(list != null && list.size() > 0){ + for(BabySieveModel babySieveModel : list) { List babyModelList = babyService.queryBabyWithQuery(babyModelQuery); - BabyModel model = null; if (babyModelList != null && babyModelList.size() > 0) { - model = babyModelList.get(0); + for(BabyModel model : babyModelList){ + MatDeliverQuery matDeliverQuery = new MatDeliverQuery(); + matDeliverQuery.setYn(YnEnums.YES.getId()); + matDeliverQuery.setParentId(model.getParentId()); + List maternalDeliverModelList = matDeliverService.query(matDeliverQuery); + if (maternalDeliverModelList != null && maternalDeliverModelList.size() > 0) { + BabySieveManager babySieveManager = new BabySieveManager(); + babySieveManager.setId(babySieveModel.getId()); + babySieveManager.setTestNumber(babySieveModel.getTestNumber()); + //获取母亲基本信息 + Patients patients = patientsService.findOnePatientById(model.getParentId()); + //获取高危因素，高危评分 + HighScoreResult highScoreResult = antenatalExaminationFacade.findLastRisk(patients.getPid(), false); + babySieveManager.setRiskFactor(highScoreResult.getHighRisk()); + babySieveManager.setRiskScore(highScoreResult.getScoreStr()); + if (null != patients.getDueDate()) { + babySieveManager.setyChanQi(DateUtil.getyyyy_MM_dd(patients.getDueDate())); + } + babySieveManager.setPatientId(patients.getId()); + babySieveManager.setCardNo(patients.getCardNo()); + babySieveManager.setPhone(patients.getPhone()); + babySieveManager.setBabyId(model.getId()); + if (patients.getBirth() != null) { + babySieveManager.setAge(DateUtil.getAge(patients.getBirth())); + } + List babies = maternalDeliverModelList.get(0).getBaby(); + if (babies != null && babies.size() > 0) { + for (MaternalDeliverModel.Baby baby : babies) { + if (StringUtils.isNotEmpty(baby.getId()) && model.getId().equals(baby.getId())) { + if (maternalDeliverModelList.get(0).getDueWeek() != null) { + babySieveManager.setDueWeek(maternalDeliverModelList.get(0).getDueWeek()); + } + String time = baby.getDueTime(); + if (StringUtils.isNotEmpty(time)) { + SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd HH:mm"); + try { + Date date = format.parse(time); + babySieveManager.setBirthHM(new SimpleDateFormat("HH:mm").format(date)); + babySieveManager.setBirthYMD(DateUtil.getyyyy_MM_dd(date)); + } catch (ParseException e) { + ExceptionUtils.catchException(e, "新生儿管理娩出时间格式异常" + time); + } + } else { + babySieveManager.setBirthHM(new SimpleDateFormat("HH:mm").format(model.getBirth())); + babySieveManager.setBirthYMD(DateUtil.getyyyy_MM_dd(model.getBirth())); + } + break; + } + } + } else { + babySieveManager.setBirthHM(new SimpleDateFormat("HH:mm").format(model.getBirth())); + babySieveManager.setBirthYMD(DateUtil.getyyyy_MM_dd(model.getBirth())); + } + + babySieveManager.setBabyName(model.getName()); + for (SexEnum sexEnum : SexEnum.values()) { + if (sexEnum.getId().equals(model.getSex())) { + babySieveManager.setSex(sexEnum.getText()); + break; + } + } + babySieveManager.setBirthDays(DateUtil.getDays(model.getBirth(), new Date())); + Integer highRisk = model.getHighRisk(); + if (new Integer(0).equals(highRisk)) { + babySieveManager.setHighRisk("健康"); + } + if (new Integer(1).equals(highRisk)) { + babySieveManager.setHighRisk("高危"); + } + String dueType = babySieveManager.getDueType(); + if ("1".equals(dueType)) { + babySieveManager.setDueType("顺产"); + } + if ("2".equals(dueType)) { + babySieveManager.setDueType("剖宫产"); + } + babySieveManager.setSieveStatus(StringUtils.isEmpty(model.getSieveStatus()) ? "0" : model.getSieveStatus()); + babySieveManager.setmName(model.getMname()); + + babySieveManagerLiat.add(babySieveManager); + } + } + } + babySieveQuery.mysqlBuild(count); + babySieveManagerResult.setData(babySieveManagerLiat); + babySieveManagerResult.setPageInfo(babySieveQuery.getPageInfo()); + babySieveManagerResult.setErrorcode(ErrorCodeConstants.SUCCESS); + babySieveManagerResult.setErrormsg(ErrorCodeConstants.SUCCESS_DESCRIPTION); + return babySieveManagerResult; + } + }else{ + babySieveManagerResult.setData(babySieveManagerLiat); + babySieveManagerResult.setPageInfo(babyModelQuery.getPageInfo()); + babySieveManagerResult.setErrorcode(ErrorCodeConstants.SUCCESS); + babySieveManagerResult.setErrormsg(ErrorCodeConstants.SUCCESS_DESCRIPTION); + return babySieveManagerResult; + } + }else{ + //记录总数 + int count = 0; + BabyModelQuery babyModelQuery = new BabyModelQuery(); + if(StringUtils.isNotEmpty(babySieveAddRequest.getQueryNo())){ + babyModelQuery.setQueryNo(babySieveAddRequest.getQueryNo()); + } + if(StringUtils.isNotEmpty(babySieveAddRequest.getSieveStatus())){ + babyModelQuery.setSieveStatus(babySieveAddRequest.getSieveStatus()); + sta = 1; + } + babyModelQuery.setDataStatus(false); + if(sta == 0){ + List sieveList = new ArrayList(); + sieveList.add("1"); + sieveList.add("2"); + sieveList.add("3"); + babyModelQuery.setSieveStatusList2(sieveList); + } + //为了分页查询总数据 + babySieveQuery.setNeed(null); + List list = babySieveService.getBabySieveQuery(babySieveQuery); + List bayModelList = babyService.queryBabyWithQuery(babyModelQuery); + for(BabySieveModel babySieveModel : list){ + for(BabyModel bay : bayModelList){ + if(babySieveModel.getBabyId().equals(bay.getId())){ + count += 1; + continue; + } + } + } + + for(BabySieveModel babySieveModel : babySieveList){ + babyModelQuery.setId(babySieveModel.getBabyId()); + List babyModelList = babyService.queryBabyWithQuery(babyModelQuery); + if (babyModelList != null && babyModelList.size() > 0) { + for(BabyModel model : babyModelList){ MatDeliverQuery matDeliverQuery = new MatDeliverQuery(); matDeliverQuery.setYn(YnEnums.YES.getId()); matDeliverQuery.setParentId(model.getParentId()); List maternalDeliverModelList = matDeliverService.query(matDeliverQuery); - if(maternalDeliverModelList != null && maternalDeliverModelList.size() > 0){ + if (maternalDeliverModelList != null && maternalDeliverModelList.size() > 0) { BabySieveManager babySieveManager = new BabySieveManager(); babySieveManager.setId(babySieveModel.getId()); babySieveManager.setTestNumber(babySieveModel.getTestNumber()); @@ -505,25 +666,25 @@ public class BabySieveFacede { HighScoreResult highScoreResult = antenatalExaminationFacade.findLastRisk(patients.getPid(), false); babySieveManager.setRiskFactor(highScoreResult.getHighRisk()); babySieveManager.setRiskScore(highScoreResult.getScoreStr()); - if(null != patients.getDueDate()){ + if (null != patients.getDueDate()) { babySieveManager.setyChanQi(DateUtil.getyyyy_MM_dd(patients.getDueDate())); } babySieveManager.setPatientId(patients.getId()); babySieveManager.setCardNo(patients.getCardNo()); babySieveManager.setPhone(patients.getPhone()); babySieveManager.setBabyId(model.getId()); - if(patients.getBirth() != null){ + if (patients.getBirth() != null) { babySieveManager.setAge(DateUtil.getAge(patients.getBirth())); } List babies = maternalDeliverModelList.get(0).getBaby(); - if(babies != null && babies.size() > 0){ - for(MaternalDeliverModel.Baby baby : babies){ - if(StringUtils.isNotEmpty(baby.getId()) && model.getId().equals(baby.getId())){ - if(maternalDeliverModelList.get(0).getDueWeek() != null){ + if (babies != null && babies.size() > 0) { + for (MaternalDeliverModel.Baby baby : babies) { + if (StringUtils.isNotEmpty(baby.getId()) && model.getId().equals(baby.getId())) { + if (maternalDeliverModelList.get(0).getDueWeek() != null) { babySieveManager.setDueWeek(maternalDeliverModelList.get(0).getDueWeek()); } String time = baby.getDueTime(); - if(StringUtils.isNotEmpty(time)){ + if (StringUtils.isNotEmpty(time)) { SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd HH:mm"); try { Date date = format.parse(time); @@ -532,14 +693,14 @@ public class BabySieveFacede { } catch (ParseException e) { ExceptionUtils.catchException(e, "新生儿管理娩出时间格式异常" + time); } - }else{ + } else { babySieveManager.setBirthHM(new SimpleDateFormat("HH:mm").format(model.getBirth())); babySieveManager.setBirthYMD(DateUtil.getyyyy_MM_dd(model.getBirth())); } break; } } - }else{ + } else { babySieveManager.setBirthHM(new SimpleDateFormat("HH:mm").format(model.getBirth())); babySieveManager.setBirthYMD(DateUtil.getyyyy_MM_dd(model.getBirth())); } @@ -570,124 +731,13 @@ public class BabySieveFacede { babySieveManager.setmName(model.getMname()); babySieveManagerLiat.add(babySieveManager); - } } - - babySieveManagerResult.setData(babySieveManagerLiat); - babySieveManagerResult.setPageInfo(babyModelQuery.getPageInfo()); - babySieveManagerResult.setErrorcode(ErrorCodeConstants.SUCCESS); - babySieveManagerResult.setErrormsg(ErrorCodeConstants.SUCCESS_DESCRIPTION); - return babySieveManagerResult; - } - }else{ - babySieveManagerResult.setData(babySieveManagerLiat); - babySieveManagerResult.setPageInfo(babySieveQuery.getPageInfo()); - babySieveManagerResult.setErrorcode(ErrorCodeConstants.SUCCESS); - babySieveManagerResult.setErrormsg(ErrorCodeConstants.SUCCESS_DESCRIPTION); - return babySieveManagerResult; - } - - }else{ - BabyModelQuery babyModelQuery = new BabyModelQuery(); - for(BabySieveModel babySieveModel : babySieveList){ - if(StringUtils.isNotEmpty(babySieveAddRequest.getQueryNo())){ - babyModelQuery.setQueryNo(babySieveAddRequest.getQueryNo()); - } - if(StringUtils.isNotEmpty(babySieveAddRequest.getSieveStatus())){ - babyModelQuery.setSieveStatus(babySieveAddRequest.getSieveStatus()); - } - babyModelQuery.setDataStatus(false); - babyModelQuery.setId(babySieveModel.getBabyId()); - List babyModelList = babyService.queryBabyWithQuery(babyModelQuery); - BabyModel model = null; - if (babyModelList != null && babyModelList.size() > 0) { - model = babyModelList.get(0); - MatDeliverQuery matDeliverQuery = new MatDeliverQuery(); - matDeliverQuery.setYn(YnEnums.YES.getId()); - matDeliverQuery.setParentId(model.getParentId()); - List maternalDeliverModelList = matDeliverService.query(matDeliverQuery); - if(maternalDeliverModelList != null && maternalDeliverModelList.size() > 0){ - BabySieveManager babySieveManager = new BabySieveManager(); - babySieveManager.setId(babySieveModel.getId()); - babySieveManager.setTestNumber(babySieveModel.getTestNumber()); - //获取母亲基本信息 - Patients patients = patientsService.findOnePatientById(model.getParentId()); - //获取高危因素，高危评分 - HighScoreResult highScoreResult = antenatalExaminationFacade.findLastRisk(patients.getPid(), false); - babySieveManager.setRiskFactor(highScoreResult.getHighRisk()); - babySieveManager.setRiskScore(highScoreResult.getScoreStr()); - if(null != patients.getDueDate()){ - babySieveManager.setyChanQi(DateUtil.getyyyy_MM_dd(patients.getDueDate())); - } - babySieveManager.setPatientId(patients.getId()); - babySieveManager.setCardNo(patients.getCardNo()); - babySieveManager.setPhone(patients.getPhone()); - babySieveManager.setBabyId(model.getId()); - if(patients.getBirth() != null){ - babySieveManager.setAge(DateUtil.getAge(patients.getBirth())); - } - List babies = maternalDeliverModelList.get(0).getBaby(); - if(babies != null && babies.size() > 0){ - for(MaternalDeliverModel.Baby baby : babies){ - if(StringUtils.isNotEmpty(baby.getId()) && model.getId().equals(baby.getId())){ - if(maternalDeliverModelList.get(0).getDueWeek() != null){ - babySieveManager.setDueWeek(maternalDeliverModelList.get(0).getDueWeek()); - } - String time = baby.getDueTime(); - if(StringUtils.isNotEmpty(time)){ - SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd HH:mm"); - try { - Date date = format.parse(time); - babySieveManager.setBirthHM(new SimpleDateFormat("HH:mm").format(date)); - babySieveManager.setBirthYMD(DateUtil.getyyyy_MM_dd(date)); - } catch (ParseException e) { - ExceptionUtils.catchException(e, "新生儿管理娩出时间格式异常" + time); - } - }else{ - babySieveManager.setBirthHM(new SimpleDateFormat("HH:mm").format(model.getBirth())); - babySieveManager.setBirthYMD(DateUtil.getyyyy_MM_dd(model.getBirth())); - } - break; - } - } - }else{ - babySieveManager.setBirthHM(new SimpleDateFormat("HH:mm").format(model.getBirth())); - babySieveManager.setBirthYMD(DateUtil.getyyyy_MM_dd(model.getBirth())); - } - - babySieveManager.setBabyName(model.getName()); - for (SexEnum sexEnum : SexEnum.values()) { - if (sexEnum.getId().equals(model.getSex())) { - babySieveManager.setSex(sexEnum.getText()); - break; - } - } - babySieveManager.setBirthDays(DateUtil.getDays(model.getBirth(), new Date())); - Integer highRisk = model.getHighRisk(); - if (new Integer(0).equals(highRisk)) { - babySieveManager.setHighRisk("健康"); - } - if (new Integer(1).equals(highRisk)) { - babySieveManager.setHighRisk("高危"); - } - String dueType = babySieveManager.getDueType(); - if ("1".equals(dueType)) { - babySieveManager.setDueType("顺产"); - } - if ("2".equals(dueType)) { - babySieveManager.setDueType("剖宫产"); - } - babySieveManager.setSieveStatus(StringUtils.isEmpty(model.getSieveStatus()) ? "0" : model.getSieveStatus()); - babySieveManager.setmName(model.getMname()); - - babySieveManagerLiat.add(babySieveManager); - } } } - + babySieveQuery.mysqlBuild(count); babySieveManagerResult.setData(babySieveManagerLiat); - babySieveManagerResult.setPageInfo(babyModelQuery.getPageInfo()); + babySieveManagerResult.setPageInfo(babySieveQuery.getPageInfo()); babySieveManagerResult.setErrorcode(ErrorCodeConstants.SUCCESS); babySieveManagerResult.setErrormsg(ErrorCodeConstants.SUCCESS_DESCRIPTION); return babySieveManagerResult; diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/BabySieveAddRequest.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/BabySieveAddRequest.java index 3673fdf..bb4e6af 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/BabySieveAddRequest.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/BabySieveAddRequest.java @@ -119,6 +119,17 @@ public class BabySieveAddRequest implements IBasicRequestConvert //申请时间 private String applyDate; + //筛查时间 + private String sieveDate; + + public String getSieveDate() { + return sieveDate; + } + + public void setSieveDate(String sieveDate) { + this.sieveDate = sieveDate; + } + public String getApplyDate() { return applyDate; } -- 1.8.3.1