From d06bb674133b09fe39e2fe55e63f5fb91031ef94 Mon Sep 17 00:00:00 2001 From: liquanyu Date: Wed, 19 Oct 2022 13:49:50 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BD=93=E9=87=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../platform/biz/dal/impl/BabyCheckDaoImpl.java | 2 +- .../java/com/lyms/platform/pojo/BabyModel.java | 12 ++ .../web/controller/BabyBuildController.java | 34 ++++++ .../operate/web/controller/RemoteController.java | 32 ++++- .../operate/web/facade/BabyBookbuildingFacade.java | 135 +++++++++++++++++++-- .../operate/web/facade/BabyCheckFacade.java | 5 +- .../platform/operate/web/facade/ViewFacade.java | 92 +++++++++----- .../web/request/BookbuildingQueryRequest.java | 19 +++ .../operate/web/request/SmnQueryRequest.java | 11 +- .../src/main/resources/mybatis.xml | 10 +- 10 files changed, 297 insertions(+), 55 deletions(-) diff --git a/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/dal/impl/BabyCheckDaoImpl.java b/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/dal/impl/BabyCheckDaoImpl.java index 15b9f07..7b2c2b8 100644 --- a/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/dal/impl/BabyCheckDaoImpl.java +++ b/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/dal/impl/BabyCheckDaoImpl.java @@ -101,7 +101,7 @@ public class BabyCheckDaoImpl extends BaseMongoDAOImpl implement @Override public List babyCheckBuildIdGroup(MongoQuery mongoQuery) { AggregationOperation match = Aggregation.match(mongoQuery.getCriteria()); - AggregationOperation group = Aggregation.group("buildId").max("created").as("created");; + AggregationOperation group = Aggregation.group("_id").max("created").as("created"); Aggregation aggregation = Aggregation.newAggregation(match, group); AggregationResults result = mongoTemplate.aggregate(aggregation, "lyms_babycheck", HashMap.class); return result.getMappedResults(); diff --git a/platform-dal/src/main/java/com/lyms/platform/pojo/BabyModel.java b/platform-dal/src/main/java/com/lyms/platform/pojo/BabyModel.java index f244561..ba80cbd 100644 --- a/platform-dal/src/main/java/com/lyms/platform/pojo/BabyModel.java +++ b/platform-dal/src/main/java/com/lyms/platform/pojo/BabyModel.java @@ -1444,6 +1444,18 @@ public class BabyModel extends BaseModel { */ private String vcCardNoArticle; + + //隆化儿童顺序编号 + private String seqNum; + + public String getSeqNum() { + return seqNum; + } + + public void setSeqNum(String seqNum) { + this.seqNum = seqNum; + } + public String getVcCardNoArticle() { return vcCardNoArticle; } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/BabyBuildController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/BabyBuildController.java index 7017ea0..0e1b400 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/BabyBuildController.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/BabyBuildController.java @@ -178,6 +178,8 @@ public class BabyBuildController extends BaseController { @RequestParam(required = false) String encoded, @RequestParam(required = false) String sINCard, @RequestParam(required = false) String vcCardNo, + @RequestParam(required = false) String name, + @RequestParam(required = false) String babyCardNo, @RequestParam(required = false) String hospitalId) { BookbuildingQueryRequest param = new BookbuildingQueryRequest(); param.setEncoded(encoded); @@ -185,6 +187,8 @@ public class BabyBuildController extends BaseController { param.setVcCardNo(vcCardNo); param.setHospitalId(hospitalId); param.setsINCard(sINCard); + param.setName(name); + param.setBabyCardNo(babyCardNo); LoginContext loginState = (LoginContext) request.getAttribute("loginContext"); return babyBookbuildingFacade.queryBabyBuildRecord(param, loginState.getId()); } @@ -1093,6 +1097,36 @@ public class BabyBuildController extends BaseController { return babyBookbuildingFacade.queryBabyCheck0_6Toll(checkDateStart,checkDateEnd,babyProvinceId,babyCityId,babyAreaId,babyStreetId ,loginState.getId()); } + + /** + * 河北省 0-6岁儿童保健系统管理登记表 + * @param httpServletRequest + * @param birthStart + * @param birthEnd + * @param babyProvinceId + * @param babyCityId + * @param babyAreaId + * @param babyStreetId + * @return + */ + @RequestMapping(method = RequestMethod.GET, value = "/queryBabyAllRecord") + @ResponseBody + @TokenRequired + public BaseResponse queryBabyAllRecord(HttpServletRequest httpServletRequest, + @RequestParam(value = "page") Integer page, + @RequestParam(value = "limit") Integer limit, + @RequestParam(value = "birthStart", required = false) Date birthStart, + @RequestParam(value = "birthEnd", required = false) Date birthEnd, + @RequestParam(value = "babyProvinceId", required = false) String babyProvinceId, + @RequestParam(value = "babyCityId", required = false) String babyCityId, + @RequestParam(value = "babyAreaId", required = false) String babyAreaId, + @RequestParam(value = "babyStreetId", required = false) String babyStreetId) { + LoginContext loginState = (LoginContext) httpServletRequest.getAttribute("loginContext"); + return babyBookbuildingFacade.queryBabyAllRecord(page,limit,birthStart,birthEnd,babyProvinceId, + babyCityId,babyAreaId,babyStreetId ,loginState.getId()); + } + + /** * 小程序app 儿童预建档(2022.9.6改为直接建档) * @param request diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/RemoteController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/RemoteController.java index 8264c49..6d6df43 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/RemoteController.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/RemoteController.java @@ -1,5 +1,6 @@ package com.lyms.platform.operate.web.controller; +import com.fasterxml.jackson.annotation.JsonAlias; import com.lyms.platform.biz.service.ArchiveDataServicer; import com.lyms.platform.biz.service.PatientsService; import com.lyms.platform.common.annotation.TokenRequired; @@ -14,11 +15,9 @@ import com.lyms.platform.common.result.RespBuilder; import com.lyms.platform.common.utils.*; import com.lyms.platform.operate.web.facade.AutoMatchFacade; import com.lyms.platform.operate.web.facade.RemoteFacade; +import com.lyms.platform.operate.web.request.PreEugenicsBaseListRequest; import com.lyms.platform.permission.service.AssistBuildService; -import com.lyms.platform.pojo.ArchiveData; -import com.lyms.platform.pojo.AssistBuildUserModel; -import com.lyms.platform.pojo.Patients; -import com.lyms.platform.pojo.WomanArchive; +import com.lyms.platform.pojo.*; import com.lyms.platform.query.ArchiveDataQuery; import com.lyms.platform.query.PatientsQuery; import net.sf.json.JSONObject; @@ -290,6 +289,31 @@ public class RemoteController extends BaseController { } @ResponseBody + @RequestMapping(value = "/queryWomanBookArchiveList",method = RequestMethod.GET) + public BaseResponse getWomanBookArchiveList(HttpServletResponse response, + @JsonAlias PreEugenicsBaseListRequest param) { + Query query = new Query(); + + String createTime = param.getCreateTime(); + if (StringUtils.isNotEmpty(createTime)) { + String[] arrs = createTime.split(" - "); + + Date start = DateUtil.parseYMD(arrs[0]); + Date end = DateUtil.parseYMD(arrs[1]); + end = DateUtil.getDayLastSecond(end); + query.addCriteria(Criteria.where("created").gte(start).lte(end)); + } + + query.with(new Sort(Sort.Direction.DESC, "created")); + long count = mongoTemplate.count(query, WomanArchive.class); + param.mysqlBuild((int) count); + query.skip(param.getOffset()).limit(param.getLimit()); + List list = mongoTemplate.find(query,WomanArchive.class); + return new BaseListResponse().setData(list).setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("成功").setPageInfo(param.getPageInfo()); + } + + + @ResponseBody @RequestMapping(value = "/getWomanBookArchive",method = RequestMethod.GET) public BaseObjectResponse queryBookArchive(HttpServletResponse response, String cardNo) { Query query = new Query(); 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 5aeab8d..ea0a993 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 @@ -2501,6 +2501,15 @@ public class BabyBookbuildingFacade { if (StringUtils.isNotEmpty(param.getsINCard())) { babyQuery.setsINCard(param.getsINCard()); } + if (StringUtils.isNotEmpty(param.getName())) + { + babyQuery.setName(param.getName()); + } + if (StringUtils.isNotEmpty(param.getBabyCardNo())) + { + babyQuery.setCardNo(param.getBabyCardNo()); + } + if (org.apache.commons.lang.StringUtils.isNotEmpty(groupsFacade.findByCurrentUserId(autoMatchFacade.getHospitalId(userId)))) { List list = new ArrayList(); list.add("1"); @@ -6363,18 +6372,20 @@ public class BabyBookbuildingFacade { BabyCheckModelQuery babyCheckModelQuery=new BabyCheckModelQuery(); babyCheckModelQuery.setHospitalId(hospitalId); babyCheckModelQuery.setYn(YnEnums.YES.getId()); - Date currentDate = DateUtil.formatDate(new Date()); - Date end_6 = DateUtil.addDay(DateUtil.addMonth(currentDate, -72 - 1), 1); - babyCheckModelQuery.setBirthStart(end_6); - babyCheckModelQuery.setBirthEnd(currentDate); +// Date currentDate = DateUtil.formatDate(new Date()); +// Date end_6 = DateUtil.addDay(DateUtil.addMonth(currentDate, -72 - 1), 1); +// babyCheckModelQuery.setBirthStart(end_6); +// babyCheckModelQuery.setBirthEnd(currentDate); babyCheckModelQuery.setCheckDateStart(checkDateStart); babyCheckModelQuery.setCheckDateEnd(DateUtil.getDayLastSecond(checkDateEnd)); - List hashMaps = babyCheckService.babyCheckBuildIdGroup(babyCheckModelQuery); + System.out.println(babyCheckModelQuery.convertToQuery().convertToMongoQuery().toString()); + //List hashMaps = babyCheckService.babyCheckBuildIdGroup(babyCheckModelQuery); + List checkModels = babyCheckService.queryBabyCheckRecord(babyCheckModelQuery); List result=new ArrayList<>(); - for (Map map : hashMaps) { + for (BabyCheckModel checkModel : checkModels) { //儿童档案 BabyModelQuery babyModelQuery=new BabyModelQuery(); - babyModelQuery.setId(map.get("_id").toString()); + babyModelQuery.setId(checkModel.getBuildId()); if(StringUtils.isNotEmpty(babyProvinceId) && StringUtils.isNotEmpty(babyCityId) && StringUtils.isNotEmpty(babyAreaId) && StringUtils.isNotEmpty(babyStreetId)){ babyModelQuery.setBabyProvinceId(babyProvinceId); @@ -6418,10 +6429,10 @@ public class BabyBookbuildingFacade { BabyCheckModelQuery babyCheckModelQuery=new BabyCheckModelQuery(); babyCheckModelQuery.setHospitalId(hospitalId); babyCheckModelQuery.setYn(YnEnums.YES.getId()); - Date currentDate = DateUtil.formatDate(new Date()); - Date end_6 = DateUtil.addDay(DateUtil.addMonth(currentDate, -72 - 1), 1); - babyCheckModelQuery.setBirthStart(end_6); - babyCheckModelQuery.setBirthEnd(currentDate); +// Date currentDate = DateUtil.formatDate(new Date()); +// Date end_6 = DateUtil.addDay(DateUtil.addMonth(currentDate, -72 - 1), 1); +// babyCheckModelQuery.setBirthStart(end_6); +// babyCheckModelQuery.setBirthEnd(currentDate); babyCheckModelQuery.setCheckDateStart(checkDateStart); babyCheckModelQuery.setCheckDateEnd(DateUtil.getDayLastSecond(checkDateEnd)); List babyCheckModels = babyCheckService.queryBabyCheckRecord(babyCheckModelQuery); @@ -6609,4 +6620,106 @@ public class BabyBookbuildingFacade { BabyModel model = babyBookbuildingService.queryBabyById(id); return new BaseObjectResponse().setData(model); } + + public BaseResponse queryBabyAllRecord(Integer page , Integer limit, + Date birthStart, Date birthEnd, + String babyProvinceId, String babyCityId, + String babyAreaId, String babyStreetId, + Integer userId) { + String hospitalId = autoMatchFacade.getHospitalId(userId); + + //儿童档案 + BabyModelQuery babyModelQuery=new BabyModelQuery(); + babyModelQuery.setHospitalId(hospitalId); + babyModelQuery.setYn(YnEnums.YES.getId()); + if(StringUtils.isNotEmpty(babyProvinceId)){ + babyModelQuery.setBabyProvinceId(babyProvinceId); + } + if(StringUtils.isNotEmpty(babyCityId)){ + babyModelQuery.setBabyCityId(babyCityId); + } + if(StringUtils.isNotEmpty(babyAreaId)){ + babyModelQuery.setBabyAreaId(babyAreaId); + } + if(StringUtils.isNotEmpty(babyStreetId)){ + babyModelQuery.setBabyStreetId(babyStreetId); + } + if(birthStart != null) + { + babyModelQuery.setBirthStart(birthStart); + } + if(birthEnd != null) + { + babyModelQuery.setBirthEnd(birthEnd); + } + babyModelQuery.setNeed("true"); + babyModelQuery.setPage(page); + babyModelQuery.setLimit(limit); + List babyModels = babyBookbuildingService.queryBabyBuildByCond(babyModelQuery); + List> list = new ArrayList<>(); + if (CollectionUtils.isNotEmpty(babyModels)) + { + for (BabyModel babyModel : babyModels) + { + Map data = new HashMap<>(); + data.put("seqNum",babyModel.getSeqNum()); + data.put("babyName",babyModel.getName()); + data.put("babySex",SexEnum.getTextById(babyModel.getSex())); + data.put("babyBirth",DateUtil.getyyyy_MM_dd(babyModel.getBirth())); + data.put("mommyName",babyModel.getMname()); + data.put("address",CommonsHelper.getResidence(babyModel.getBabyProvinceId(),babyModel.getBabyCityId(), + babyModel.getBabyAreaId(),babyModel.getBabyStreetId(),babyModel.getBabyAddress(),basicConfigService)); + + List newbornVisits = mongoTemplate.find(Query.query(Criteria.where("babyId").is(babyModel.getId()) + .and("yn").ne("0")), NewbornVisit.class); + String zz = ""; + String feedType = ""; + if (CollectionUtils.isNotEmpty(newbornVisits)) + { + NewbornVisit newbornVisit = newbornVisits.get(0); + if (StringUtils.isNotEmpty(newbornVisit.getWeight()) && StringUtils.isNotEmpty(newbornVisit.getWeightNow())) + { + feedType = FeedTypeEnums.getName(newbornVisit.getFeedType()); + Double zzd = Double.valueOf(newbornVisit.getWeightNow()) - Double.valueOf(newbornVisit.getWeight()); + zz = String.format("%.1f",zzd); + } + } + data.put("fszz",zz); + data.put("fscs",newbornVisits.size()+""); + data.put("feedType",feedType); + + BabyCheckModelQuery babyCheckModelQuery=new BabyCheckModelQuery(); + babyCheckModelQuery.setYn(YnEnums.YES.getId()); + babyCheckModelQuery.setBuildId(babyModel.getId()); + List babyCheckModels = babyCheckService.queryBabyCheckRecord(babyCheckModelQuery); + String high = "0"; + if (babyModel.getHighRisk() != null && babyModel.getHighRisk() == 1) + { + high = "1"; + } + if (CollectionUtils.isNotEmpty(babyCheckModels)) + { + for (BabyCheckModel checkModel : babyCheckModels) + { + data.put("weight"+checkModel.getTcType(),checkModel.getWeight()); + data.put("height"+checkModel.getTcType(),checkModel.getHeight()); + data.put("weightEvaluate"+checkModel.getTcType(),checkModel.getWeightEvaluate()); + data.put("heightEvaluate"+checkModel.getTcType(),checkModel.getHeightEvaluate()); + + if (!"1".equals(high)) + { + if (checkModel.getHighRisk() != null && checkModel.getHighRisk() == 1) + { + high = "1"; + } + } + } + } + data.put("high",high); //是否高危管理过 0 未管理 1 已管理 + data.put("phone",babyModel.getMphone()); //联系电话 + list.add(data); + } + } + return new BaseListResponse().setData(list).setPageInfo(babyModelQuery.getPageInfo()).setErrormsg("成功").setErrorcode(0); + } } \ No newline at end of file diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyCheckFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyCheckFacade.java index c082a8e..86c08f0 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyCheckFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyCheckFacade.java @@ -1511,7 +1511,9 @@ public class BabyCheckFacade extends BaseServiceImpl { if (null != checkMonthAge && null != endCheckMonthAge) { criteria.and("checkMonth").gte(checkMonthAge).lte(endCheckMonthAge); } - PageResult pageResult = findMongoPage(BabyCheckModel.class, new Query(criteria).with(new Sort(Sort.Direction.DESC, "created")), page, limit); + Query query = new Query(criteria); + System.out.println(query.toString()); + PageResult pageResult = findMongoPage(BabyCheckModel.class, query.with(new Sort(Sort.Direction.DESC, "created")), page, limit); List babyCheckModelList = (List ) pageResult.getGrid(); List > list = new ArrayList(); for (BabyCheckModel babyCheckModel : babyCheckModelList) { @@ -1519,6 +1521,7 @@ public class BabyCheckFacade extends BaseServiceImpl { if (StringUtils.isNotEmpty(babyCheckModel.getBuildId())) { BabyModel babyModel = mongoTemplate.findOne(Query.query(Criteria.where("_id").is(babyCheckModel.getBuildId())), BabyModel.class); if (babyModel == null) { + System.out.println("no baby "+ babyCheckModel.getBuildId()); continue; } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ViewFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ViewFacade.java index abb8ca7..76062da 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ViewFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ViewFacade.java @@ -7934,6 +7934,7 @@ public class ViewFacade { } } + private static List FILE_NAME = new ArrayList<>(); public BaseResponse uploadUpgradePackage(MultipartFile file) { //如果文件不为空，写入上传路径 @@ -7953,6 +7954,18 @@ public class ViewFacade { File filepath = new File(path + File.separator, fileName); + if (!FILE_NAME.contains(fileName)) + { + FILE_NAME.add(fileName); + } + else + { + objectResponse.setErrorcode(ErrorCodeConstants.NO_DATA); + objectResponse.setErrormsg("不要重复上传"+fileName); + return objectResponse; + } + + //删除当天上传的文件 if (filepath.exists()) { filepath.delete(); @@ -7967,6 +7980,7 @@ public class ViewFacade { List list = pareExclBaby(filepath); if (CollectionUtils.isNotEmpty(list)) { + System.out.println("list siz " + list.size()); for (BabyBookbuildingAddRequest request : list) { if (StringUtils.isEmpty(request.getHospitalId()) || StringUtils.isEmpty(request.getBuildDoctor())) @@ -7974,13 +7988,10 @@ public class ViewFacade { System.out.println("baby name "+request.getBabyName()); continue; } - List babyModels = mongoTemplate.find(Query.query(Criteria.where("mcertNo"). - is(request.getMommyCertificateNum()).and("yn").is(1).and("name").is(request.getBabyName())), BabyModel.class); - if (CollectionUtils.isEmpty(babyModels)) - { - babyBookbuildingFacade.addBabyBookbuilding(request, Integer.parseInt(request.getBuildDoctor())); - } + sync(request); } + FILE_NAME.remove(fileName); + System.out.println("finshed fileName " + fileName); } objectResponse.setErrorcode(ErrorCodeConstants.SUCCESS); objectResponse.setErrormsg("成功"); @@ -7992,6 +8003,16 @@ public class ViewFacade { return objectResponse; } } + private synchronized void sync(BabyBookbuildingAddRequest request) + { + List babyModels = mongoTemplate.find(Query.query(Criteria.where("mcertNo"). + is(request.getMommyCertificateNum()).and("yn").is(1).and("name").is(request.getBabyName())), BabyModel.class); + if (CollectionUtils.isEmpty(babyModels)) + { + System.out.println(request.getMommyPhone()); + babyBookbuildingFacade.addBabyBookbuilding(request, Integer.parseInt(request.getBuildDoctor())); + } + } private List pareExclBaby(File file) { @@ -8009,37 +8030,41 @@ public class ViewFacade { Cell[] cells = s.getRow(i); if (cells.length > 0) { for (int j = 0; j < cells.length; j++) { - if (StringUtils.isEmpty(cells[j].getContents())) + String str = ""; + if (StringUtils.isNotEmpty(cells[j].getContents())) { - continue; + str = cells[j].getContents().trim(); } - String str = cells[j].getContents().trim(); switch (j) { case 7: - model.setBabyName(str); + model.setBabyName(str == null ? "无" : str); continue; case 8: - model.setSex(str.equals("男") ? 1 : 0); + model.setSex(str == null ? null : str.equals("男") ? 1 : 0); continue; case 9: model.setBnationId(CommonsHelper.getIdByName(str,basicConfigService,SystemConfig.NATION_TYPE_ID)); continue; case 11: - if ("A型".equals(str)) + if (str != null) { - model.setBloodType("1"); - } else if ("B型".equals(str)) - { - model.setBloodType("2"); - } else if ("O型".equals(str)) - { - model.setBloodType("3"); - } else if ("AB型".equals(str)) - { - model.setBloodType("4"); - } else if ("不详".equals(str)) - { - model.setBloodType("5"); + if ("A型".equals(str)) + { + model.setBloodType("1"); + } + else if ("B型".equals(str)) + { + model.setBloodType("2"); + } else if ("O型".equals(str)) + { + model.setBloodType("3"); + } else if ("AB型".equals(str)) + { + model.setBloodType("4"); + } else if ("不详".equals(str)) + { + model.setBloodType("5"); + } } continue; case 12: @@ -8106,17 +8131,20 @@ public class ViewFacade { model.setMommyName(str); continue; case 23: - model.setMommyCertificateNum(str); + model.setMommyCertificateNum(str == null ? "无" : str); model.setMommyPhone(str); model.setMommyCertificateTypeId("57e1dcd3f0f02e7ca519d6c6"); continue; case 26: - str = str.replace("丰宁满族自治县",""); - str = str.replace("河北省承德市",""); - model.setHomeProvinceId("1"); - model.setHomeCityId("9"); - model.setHomeAreaId("131"); - model.setHomeAddress(str); + if (str != null) + { + str = str.replace("丰宁满族自治县",""); + str = str.replace("河北省承德市",""); + model.setHomeProvinceId("1"); + model.setHomeCityId("9"); + model.setHomeAreaId("131"); + model.setHomeAddress(str); + } continue; case 29: String hospitalId = CommonsHelper.getHospitalIdByName(str,organizationService); diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/BookbuildingQueryRequest.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/BookbuildingQueryRequest.java index 9a75083..2e9e287 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/BookbuildingQueryRequest.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/BookbuildingQueryRequest.java @@ -1,6 +1,7 @@ package com.lyms.platform.operate.web.request; import com.lyms.platform.common.core.annotation.form.Form; +import org.springframework.web.bind.annotation.RequestParam; /** * Created by lqy on 2016/6/15. @@ -21,6 +22,24 @@ public class BookbuildingQueryRequest { private String sINCard; private String pid; + private String name; + private String babyCardNo; + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + + public String getBabyCardNo() { + return babyCardNo; + } + + public void setBabyCardNo(String babyCardNo) { + this.babyCardNo = babyCardNo; + } public String getsINCard() { return sINCard; diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/SmnQueryRequest.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/SmnQueryRequest.java index 39cca95..c6368c9 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/SmnQueryRequest.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/SmnQueryRequest.java @@ -20,7 +20,7 @@ public class SmnQueryRequest extends BaseQuery { private String orgProvinceId; private String orgCityId; private String orgAreaId; - + private String sendDoctor;//送检医生 private Integer startWeek; private Integer endWeek; @@ -36,6 +36,15 @@ public class SmnQueryRequest extends BaseQuery { private String ysfDate;//应随访日期 private Integer sfStatus;//随访状态 0 正常状态 1 产前诊断 2 继续妊娠 3 失联 4终止妊娠 5 分娩 6随访完成 + + public String getSendDoctor() { + return sendDoctor; + } + + public void setSendDoctor(String sendDoctor) { + this.sendDoctor = sendDoctor; + } + public String getSfDate() { return sfDate; } diff --git a/platform-operate-api/src/main/resources/mybatis.xml b/platform-operate-api/src/main/resources/mybatis.xml index 7ac7cf4..5f7fb9b 100644 --- a/platform-operate-api/src/main/resources/mybatis.xml +++ b/platform-operate-api/src/main/resources/mybatis.xml @@ -21,10 +21,10 @@ - - - - - + + + + + \ No newline at end of file -- 1.8.3.1