jiangjiazhi / regional-platform

Download as
Browse Code »

Commit d06bb674133b09fe39e2fe55e63f5fb91031ef94

Authored by liquanyu
1 parent d89e7d442c
Exists in master and in 6 other branches autism, dev, fengning, fengning2023-06-06, longhua, luanping

体重

Showing 10 changed files with 297 additions and 55 deletions

platform-biz-patient-service/src/main/java/com/lyms/platform/biz/dal/impl/BabyCheckDaoImpl.java View file @ d06bb67
... ... @@ -101,7 +101,7 @@
101 101 @Override
102 102 public List<HashMap> babyCheckBuildIdGroup(MongoQuery mongoQuery) {
103 103 AggregationOperation match = Aggregation.match(mongoQuery.getCriteria());
104   - AggregationOperation group = Aggregation.group("buildId").max("created").as("created");;
  104 + AggregationOperation group = Aggregation.group("_id").max("created").as("created");
105 105 Aggregation aggregation = Aggregation.newAggregation(match, group);
106 106 AggregationResults<HashMap> result = mongoTemplate.aggregate(aggregation, "lyms_babycheck", HashMap.class);
107 107 return result.getMappedResults();
platform-dal/src/main/java/com/lyms/platform/pojo/BabyModel.java View file @ d06bb67
... ... @@ -1444,6 +1444,18 @@
1444 1444 */
1445 1445 private String vcCardNoArticle;
1446 1446  
  1447 +
  1448 + //隆化儿童顺序编号
  1449 + private String seqNum;
  1450 +
  1451 + public String getSeqNum() {
  1452 + return seqNum;
  1453 + }
  1454 +
  1455 + public void setSeqNum(String seqNum) {
  1456 + this.seqNum = seqNum;
  1457 + }
  1458 +
1447 1459 public String getVcCardNoArticle() {
1448 1460 return vcCardNoArticle;
1449 1461 }
platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/BabyBuildController.java View file @ d06bb67
... ... @@ -178,6 +178,8 @@
178 178 @RequestParam(required = false) String encoded,
179 179 @RequestParam(required = false) String sINCard,
180 180 @RequestParam(required = false) String vcCardNo,
  181 + @RequestParam(required = false) String name,
  182 + @RequestParam(required = false) String babyCardNo,
181 183 @RequestParam(required = false) String hospitalId) {
182 184 BookbuildingQueryRequest param = new BookbuildingQueryRequest();
183 185 param.setEncoded(encoded);
... ... @@ -185,6 +187,8 @@
185 187 param.setVcCardNo(vcCardNo);
186 188 param.setHospitalId(hospitalId);
187 189 param.setsINCard(sINCard);
  190 + param.setName(name);
  191 + param.setBabyCardNo(babyCardNo);
188 192 LoginContext loginState = (LoginContext) request.getAttribute("loginContext");
189 193 return babyBookbuildingFacade.queryBabyBuildRecord(param, loginState.getId());
190 194 }
... ... @@ -1092,6 +1096,36 @@
1092 1096 LoginContext loginState = (LoginContext) httpServletRequest.getAttribute("loginContext");
1093 1097 return babyBookbuildingFacade.queryBabyCheck0_6Toll(checkDateStart,checkDateEnd,babyProvinceId,babyCityId,babyAreaId,babyStreetId ,loginState.getId());
1094 1098 }
  1099 +
  1100 +
  1101 + /**
  1102 + * 河北省 0-6岁儿童保健系统管理登记表
  1103 + * @param httpServletRequest
  1104 + * @param birthStart
  1105 + * @param birthEnd
  1106 + * @param babyProvinceId
  1107 + * @param babyCityId
  1108 + * @param babyAreaId
  1109 + * @param babyStreetId
  1110 + * @return
  1111 + */
  1112 + @RequestMapping(method = RequestMethod.GET, value = "/queryBabyAllRecord")
  1113 + @ResponseBody
  1114 + @TokenRequired
  1115 + public BaseResponse queryBabyAllRecord(HttpServletRequest httpServletRequest,
  1116 + @RequestParam(value = "page") Integer page,
  1117 + @RequestParam(value = "limit") Integer limit,
  1118 + @RequestParam(value = "birthStart", required = false) Date birthStart,
  1119 + @RequestParam(value = "birthEnd", required = false) Date birthEnd,
  1120 + @RequestParam(value = "babyProvinceId", required = false) String babyProvinceId,
  1121 + @RequestParam(value = "babyCityId", required = false) String babyCityId,
  1122 + @RequestParam(value = "babyAreaId", required = false) String babyAreaId,
  1123 + @RequestParam(value = "babyStreetId", required = false) String babyStreetId) {
  1124 + LoginContext loginState = (LoginContext) httpServletRequest.getAttribute("loginContext");
  1125 + return babyBookbuildingFacade.queryBabyAllRecord(page,limit,birthStart,birthEnd,babyProvinceId,
  1126 + babyCityId,babyAreaId,babyStreetId ,loginState.getId());
  1127 + }
  1128 +
1095 1129  
1096 1130 /**
1097 1131 * 小程序app 儿童预建档(2022.9.6改为直接建档)
platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/RemoteController.java View file @ d06bb67
1 1 package com.lyms.platform.operate.web.controller;
2 2  
  3 +import com.fasterxml.jackson.annotation.JsonAlias;
3 4 import com.lyms.platform.biz.service.ArchiveDataServicer;
4 5 import com.lyms.platform.biz.service.PatientsService;
5 6 import com.lyms.platform.common.annotation.TokenRequired;
6 7  
... ... @@ -14,11 +15,9 @@
14 15 import com.lyms.platform.common.utils.*;
15 16 import com.lyms.platform.operate.web.facade.AutoMatchFacade;
16 17 import com.lyms.platform.operate.web.facade.RemoteFacade;
  18 +import com.lyms.platform.operate.web.request.PreEugenicsBaseListRequest;
17 19 import com.lyms.platform.permission.service.AssistBuildService;
18   -import com.lyms.platform.pojo.ArchiveData;
19   -import com.lyms.platform.pojo.AssistBuildUserModel;
20   -import com.lyms.platform.pojo.Patients;
21   -import com.lyms.platform.pojo.WomanArchive;
  20 +import com.lyms.platform.pojo.*;
22 21 import com.lyms.platform.query.ArchiveDataQuery;
23 22 import com.lyms.platform.query.PatientsQuery;
24 23 import net.sf.json.JSONObject;
... ... @@ -288,6 +287,31 @@
288 287 }
289 288 writeString(response,"success");
290 289 }
  290 +
  291 + @ResponseBody
  292 + @RequestMapping(value = "/queryWomanBookArchiveList",method = RequestMethod.GET)
  293 + public BaseResponse getWomanBookArchiveList(HttpServletResponse response,
  294 + @JsonAlias PreEugenicsBaseListRequest param) {
  295 + Query query = new Query();
  296 +
  297 + String createTime = param.getCreateTime();
  298 + if (StringUtils.isNotEmpty(createTime)) {
  299 + String[] arrs = createTime.split(" - ");
  300 +
  301 + Date start = DateUtil.parseYMD(arrs[0]);
  302 + Date end = DateUtil.parseYMD(arrs[1]);
  303 + end = DateUtil.getDayLastSecond(end);
  304 + query.addCriteria(Criteria.where("created").gte(start).lte(end));
  305 + }
  306 +
  307 + query.with(new Sort(Sort.Direction.DESC, "created"));
  308 + long count = mongoTemplate.count(query, WomanArchive.class);
  309 + param.mysqlBuild((int) count);
  310 + query.skip(param.getOffset()).limit(param.getLimit());
  311 + List<WomanArchive> list = mongoTemplate.find(query,WomanArchive.class);
  312 + return new BaseListResponse().setData(list).setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("成功").setPageInfo(param.getPageInfo());
  313 + }
  314 +
291 315  
292 316 @ResponseBody
293 317 @RequestMapping(value = "/getWomanBookArchive",method = RequestMethod.GET)
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyBookbuildingFacade.java View file @ d06bb67
... ... @@ -2501,6 +2501,15 @@
2501 2501 if (StringUtils.isNotEmpty(param.getsINCard())) {
2502 2502 babyQuery.setsINCard(param.getsINCard());
2503 2503 }
  2504 + if (StringUtils.isNotEmpty(param.getName()))
  2505 + {
  2506 + babyQuery.setName(param.getName());
  2507 + }
  2508 + if (StringUtils.isNotEmpty(param.getBabyCardNo()))
  2509 + {
  2510 + babyQuery.setCardNo(param.getBabyCardNo());
  2511 + }
  2512 +
2504 2513 if (org.apache.commons.lang.StringUtils.isNotEmpty(groupsFacade.findByCurrentUserId(autoMatchFacade.getHospitalId(userId)))) {
2505 2514 List list = new ArrayList();
2506 2515 list.add("1");
2507 2516  
2508 2517  
2509 2518  
... ... @@ -6363,18 +6372,20 @@
6363 6372 BabyCheckModelQuery babyCheckModelQuery=new BabyCheckModelQuery();
6364 6373 babyCheckModelQuery.setHospitalId(hospitalId);
6365 6374 babyCheckModelQuery.setYn(YnEnums.YES.getId());
6366   - Date currentDate = DateUtil.formatDate(new Date());
6367   - Date end_6 = DateUtil.addDay(DateUtil.addMonth(currentDate, -72 - 1), 1);
6368   - babyCheckModelQuery.setBirthStart(end_6);
6369   - babyCheckModelQuery.setBirthEnd(currentDate);
  6375 +// Date currentDate = DateUtil.formatDate(new Date());
  6376 +// Date end_6 = DateUtil.addDay(DateUtil.addMonth(currentDate, -72 - 1), 1);
  6377 +// babyCheckModelQuery.setBirthStart(end_6);
  6378 +// babyCheckModelQuery.setBirthEnd(currentDate);
6370 6379 babyCheckModelQuery.setCheckDateStart(checkDateStart);
6371 6380 babyCheckModelQuery.setCheckDateEnd(DateUtil.getDayLastSecond(checkDateEnd));
6372   - List<HashMap> hashMaps = babyCheckService.babyCheckBuildIdGroup(babyCheckModelQuery);
  6381 + System.out.println(babyCheckModelQuery.convertToQuery().convertToMongoQuery().toString());
  6382 + //List<HashMap> hashMaps = babyCheckService.babyCheckBuildIdGroup(babyCheckModelQuery);
  6383 + List<BabyCheckModel> checkModels = babyCheckService.queryBabyCheckRecord(babyCheckModelQuery);
6373 6384 List<Map> result=new ArrayList<>();
6374   - for (Map map : hashMaps) {
  6385 + for (BabyCheckModel checkModel : checkModels) {
6375 6386 //儿童档案
6376 6387 BabyModelQuery babyModelQuery=new BabyModelQuery();
6377   - babyModelQuery.setId(map.get("_id").toString());
  6388 + babyModelQuery.setId(checkModel.getBuildId());
6378 6389 if(StringUtils.isNotEmpty(babyProvinceId) && StringUtils.isNotEmpty(babyCityId) &&
6379 6390 StringUtils.isNotEmpty(babyAreaId) && StringUtils.isNotEmpty(babyStreetId)){
6380 6391 babyModelQuery.setBabyProvinceId(babyProvinceId);
... ... @@ -6418,10 +6429,10 @@
6418 6429 BabyCheckModelQuery babyCheckModelQuery=new BabyCheckModelQuery();
6419 6430 babyCheckModelQuery.setHospitalId(hospitalId);
6420 6431 babyCheckModelQuery.setYn(YnEnums.YES.getId());
6421   - Date currentDate = DateUtil.formatDate(new Date());
6422   - Date end_6 = DateUtil.addDay(DateUtil.addMonth(currentDate, -72 - 1), 1);
6423   - babyCheckModelQuery.setBirthStart(end_6);
6424   - babyCheckModelQuery.setBirthEnd(currentDate);
  6432 +// Date currentDate = DateUtil.formatDate(new Date());
  6433 +// Date end_6 = DateUtil.addDay(DateUtil.addMonth(currentDate, -72 - 1), 1);
  6434 +// babyCheckModelQuery.setBirthStart(end_6);
  6435 +// babyCheckModelQuery.setBirthEnd(currentDate);
6425 6436 babyCheckModelQuery.setCheckDateStart(checkDateStart);
6426 6437 babyCheckModelQuery.setCheckDateEnd(DateUtil.getDayLastSecond(checkDateEnd));
6427 6438 List<BabyCheckModel> babyCheckModels = babyCheckService.queryBabyCheckRecord(babyCheckModelQuery);
... ... @@ -6608,6 +6619,108 @@
6608 6619 public BaseResponse getBabyBuildArticle(String id) {
6609 6620 BabyModel model = babyBookbuildingService.queryBabyById(id);
6610 6621 return new BaseObjectResponse().setData(model);
  6622 + }
  6623 +
  6624 + public BaseResponse queryBabyAllRecord(Integer page , Integer limit,
  6625 + Date birthStart, Date birthEnd,
  6626 + String babyProvinceId, String babyCityId,
  6627 + String babyAreaId, String babyStreetId,
  6628 + Integer userId) {
  6629 + String hospitalId = autoMatchFacade.getHospitalId(userId);
  6630 +
  6631 + //儿童档案
  6632 + BabyModelQuery babyModelQuery=new BabyModelQuery();
  6633 + babyModelQuery.setHospitalId(hospitalId);
  6634 + babyModelQuery.setYn(YnEnums.YES.getId());
  6635 + if(StringUtils.isNotEmpty(babyProvinceId)){
  6636 + babyModelQuery.setBabyProvinceId(babyProvinceId);
  6637 + }
  6638 + if(StringUtils.isNotEmpty(babyCityId)){
  6639 + babyModelQuery.setBabyCityId(babyCityId);
  6640 + }
  6641 + if(StringUtils.isNotEmpty(babyAreaId)){
  6642 + babyModelQuery.setBabyAreaId(babyAreaId);
  6643 + }
  6644 + if(StringUtils.isNotEmpty(babyStreetId)){
  6645 + babyModelQuery.setBabyStreetId(babyStreetId);
  6646 + }
  6647 + if(birthStart != null)
  6648 + {
  6649 + babyModelQuery.setBirthStart(birthStart);
  6650 + }
  6651 + if(birthEnd != null)
  6652 + {
  6653 + babyModelQuery.setBirthEnd(birthEnd);
  6654 + }
  6655 + babyModelQuery.setNeed("true");
  6656 + babyModelQuery.setPage(page);
  6657 + babyModelQuery.setLimit(limit);
  6658 + List<BabyModel> babyModels = babyBookbuildingService.queryBabyBuildByCond(babyModelQuery);
  6659 + List<Map<String,String>> list = new ArrayList<>();
  6660 + if (CollectionUtils.isNotEmpty(babyModels))
  6661 + {
  6662 + for (BabyModel babyModel : babyModels)
  6663 + {
  6664 + Map<String,String> data = new HashMap<>();
  6665 + data.put("seqNum",babyModel.getSeqNum());
  6666 + data.put("babyName",babyModel.getName());
  6667 + data.put("babySex",SexEnum.getTextById(babyModel.getSex()));
  6668 + data.put("babyBirth",DateUtil.getyyyy_MM_dd(babyModel.getBirth()));
  6669 + data.put("mommyName",babyModel.getMname());
  6670 + data.put("address",CommonsHelper.getResidence(babyModel.getBabyProvinceId(),babyModel.getBabyCityId(),
  6671 + babyModel.getBabyAreaId(),babyModel.getBabyStreetId(),babyModel.getBabyAddress(),basicConfigService));
  6672 +
  6673 + List<NewbornVisit> newbornVisits = mongoTemplate.find(Query.query(Criteria.where("babyId").is(babyModel.getId())
  6674 + .and("yn").ne("0")), NewbornVisit.class);
  6675 + String zz = "";
  6676 + String feedType = "";
  6677 + if (CollectionUtils.isNotEmpty(newbornVisits))
  6678 + {
  6679 + NewbornVisit newbornVisit = newbornVisits.get(0);
  6680 + if (StringUtils.isNotEmpty(newbornVisit.getWeight()) && StringUtils.isNotEmpty(newbornVisit.getWeightNow()))
  6681 + {
  6682 + feedType = FeedTypeEnums.getName(newbornVisit.getFeedType());
  6683 + Double zzd = Double.valueOf(newbornVisit.getWeightNow()) - Double.valueOf(newbornVisit.getWeight());
  6684 + zz = String.format("%.1f",zzd);
  6685 + }
  6686 + }
  6687 + data.put("fszz",zz);
  6688 + data.put("fscs",newbornVisits.size()+"");
  6689 + data.put("feedType",feedType);
  6690 +
  6691 + BabyCheckModelQuery babyCheckModelQuery=new BabyCheckModelQuery();
  6692 + babyCheckModelQuery.setYn(YnEnums.YES.getId());
  6693 + babyCheckModelQuery.setBuildId(babyModel.getId());
  6694 + List<BabyCheckModel> babyCheckModels = babyCheckService.queryBabyCheckRecord(babyCheckModelQuery);
  6695 + String high = "0";
  6696 + if (babyModel.getHighRisk() != null && babyModel.getHighRisk() == 1)
  6697 + {
  6698 + high = "1";
  6699 + }
  6700 + if (CollectionUtils.isNotEmpty(babyCheckModels))
  6701 + {
  6702 + for (BabyCheckModel checkModel : babyCheckModels)
  6703 + {
  6704 + data.put("weight"+checkModel.getTcType(),checkModel.getWeight());
  6705 + data.put("height"+checkModel.getTcType(),checkModel.getHeight());
  6706 + data.put("weightEvaluate"+checkModel.getTcType(),checkModel.getWeightEvaluate());
  6707 + data.put("heightEvaluate"+checkModel.getTcType(),checkModel.getHeightEvaluate());
  6708 +
  6709 + if (!"1".equals(high))
  6710 + {
  6711 + if (checkModel.getHighRisk() != null && checkModel.getHighRisk() == 1)
  6712 + {
  6713 + high = "1";
  6714 + }
  6715 + }
  6716 + }
  6717 + }
  6718 + data.put("high",high); //是否高危管理过 0 未管理 1 已管理
  6719 + data.put("phone",babyModel.getMphone()); //联系电话
  6720 + list.add(data);
  6721 + }
  6722 + }
  6723 + return new BaseListResponse().setData(list).setPageInfo(babyModelQuery.getPageInfo()).setErrormsg("成功").setErrorcode(0);
6611 6724 }
6612 6725 }
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyCheckFacade.java View file @ d06bb67
... ... @@ -1511,7 +1511,9 @@
1511 1511 if (null != checkMonthAge && null != endCheckMonthAge) {
1512 1512 criteria.and("checkMonth").gte(checkMonthAge).lte(endCheckMonthAge);
1513 1513 }
1514   - PageResult pageResult = findMongoPage(BabyCheckModel.class, new Query(criteria).with(new Sort(Sort.Direction.DESC, "created")), page, limit);
  1514 + Query query = new Query(criteria);
  1515 + System.out.println(query.toString());
  1516 + PageResult pageResult = findMongoPage(BabyCheckModel.class, query.with(new Sort(Sort.Direction.DESC, "created")), page, limit);
1515 1517 List <BabyCheckModel> babyCheckModelList = (List <BabyCheckModel>) pageResult.getGrid();
1516 1518 List <Map <String, Object>> list = new ArrayList();
1517 1519 for (BabyCheckModel babyCheckModel : babyCheckModelList) {
... ... @@ -1519,6 +1521,7 @@
1519 1521 if (StringUtils.isNotEmpty(babyCheckModel.getBuildId())) {
1520 1522 BabyModel babyModel = mongoTemplate.findOne(Query.query(Criteria.where("_id").is(babyCheckModel.getBuildId())), BabyModel.class);
1521 1523 if (babyModel == null) {
  1524 + System.out.println("no baby "+ babyCheckModel.getBuildId());
1522 1525 continue;
1523 1526 }
1524 1527  
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ViewFacade.java View file @ d06bb67
... ... @@ -7934,6 +7934,7 @@
7934 7934 }
7935 7935 }
7936 7936  
  7937 + private static List<String> FILE_NAME = new ArrayList<>();
7937 7938 public BaseResponse uploadUpgradePackage(MultipartFile file) {
7938 7939  
7939 7940 //如果文件不为空，写入上传路径
... ... @@ -7953,6 +7954,18 @@
7953 7954  
7954 7955 File filepath = new File(path + File.separator, fileName);
7955 7956  
  7957 + if (!FILE_NAME.contains(fileName))
  7958 + {
  7959 + FILE_NAME.add(fileName);
  7960 + }
  7961 + else
  7962 + {
  7963 + objectResponse.setErrorcode(ErrorCodeConstants.NO_DATA);
  7964 + objectResponse.setErrormsg("不要重复上传"+fileName);
  7965 + return objectResponse;
  7966 + }
  7967 +
  7968 +
7956 7969 //删除当天上传的文件
7957 7970 if (filepath.exists()) {
7958 7971 filepath.delete();
... ... @@ -7967,6 +7980,7 @@
7967 7980 List<BabyBookbuildingAddRequest> list = pareExclBaby(filepath);
7968 7981 if (CollectionUtils.isNotEmpty(list))
7969 7982 {
  7983 + System.out.println("list siz " + list.size());
7970 7984 for (BabyBookbuildingAddRequest request : list)
7971 7985 {
7972 7986 if (StringUtils.isEmpty(request.getHospitalId()) || StringUtils.isEmpty(request.getBuildDoctor()))
7973 7987  
... ... @@ -7974,13 +7988,10 @@
7974 7988 System.out.println("baby name "+request.getBabyName());
7975 7989 continue;
7976 7990 }
7977   - List<BabyModel> babyModels = mongoTemplate.find(Query.query(Criteria.where("mcertNo").
7978   - is(request.getMommyCertificateNum()).and("yn").is(1).and("name").is(request.getBabyName())), BabyModel.class);
7979   - if (CollectionUtils.isEmpty(babyModels))
7980   - {
7981   - babyBookbuildingFacade.addBabyBookbuilding(request, Integer.parseInt(request.getBuildDoctor()));
7982   - }
  7991 + sync(request);
7983 7992 }
  7993 + FILE_NAME.remove(fileName);
  7994 + System.out.println("finshed fileName " + fileName);
7984 7995 }
7985 7996 objectResponse.setErrorcode(ErrorCodeConstants.SUCCESS);
7986 7997 objectResponse.setErrormsg("成功");
... ... @@ -7992,6 +8003,16 @@
7992 8003 return objectResponse;
7993 8004 }
7994 8005 }
  8006 + private synchronized void sync(BabyBookbuildingAddRequest request)
  8007 + {
  8008 + List<BabyModel> babyModels = mongoTemplate.find(Query.query(Criteria.where("mcertNo").
  8009 + is(request.getMommyCertificateNum()).and("yn").is(1).and("name").is(request.getBabyName())), BabyModel.class);
  8010 + if (CollectionUtils.isEmpty(babyModels))
  8011 + {
  8012 + System.out.println(request.getMommyPhone());
  8013 + babyBookbuildingFacade.addBabyBookbuilding(request, Integer.parseInt(request.getBuildDoctor()));
  8014 + }
  8015 + }
7995 8016  
7996 8017 private List<BabyBookbuildingAddRequest> pareExclBaby(File file)
7997 8018 {
7998 8019  
7999 8020  
8000 8021  
8001 8022  
8002 8023  
8003 8024  
... ... @@ -8009,37 +8030,41 @@
8009 8030 Cell[] cells = s.getRow(i);
8010 8031 if (cells.length > 0) {
8011 8032 for (int j = 0; j < cells.length; j++) {
8012   - if (StringUtils.isEmpty(cells[j].getContents()))
  8033 + String str = "";
  8034 + if (StringUtils.isNotEmpty(cells[j].getContents()))
8013 8035 {
8014   - continue;
  8036 + str = cells[j].getContents().trim();
8015 8037 }
8016   - String str = cells[j].getContents().trim();
8017 8038 switch (j) {
8018 8039 case 7:
8019   - model.setBabyName(str);
  8040 + model.setBabyName(str == null ? "无" : str);
8020 8041 continue;
8021 8042 case 8:
8022   - model.setSex(str.equals("男") ? 1 : 0);
  8043 + model.setSex(str == null ? null : str.equals("男") ? 1 : 0);
8023 8044 continue;
8024 8045 case 9:
8025 8046 model.setBnationId(CommonsHelper.getIdByName(str,basicConfigService,SystemConfig.NATION_TYPE_ID));
8026 8047 continue;
8027 8048 case 11:
8028   - if ("A型".equals(str))
  8049 + if (str != null)
8029 8050 {
8030   - model.setBloodType("1");
8031   - } else if ("B型".equals(str))
8032   - {
8033   - model.setBloodType("2");
8034   - } else if ("O型".equals(str))
8035   - {
8036   - model.setBloodType("3");
8037   - } else if ("AB型".equals(str))
8038   - {
8039   - model.setBloodType("4");
8040   - } else if ("不详".equals(str))
8041   - {
8042   - model.setBloodType("5");
  8051 + if ("A型".equals(str))
  8052 + {
  8053 + model.setBloodType("1");
  8054 + }
  8055 + else if ("B型".equals(str))
  8056 + {
  8057 + model.setBloodType("2");
  8058 + } else if ("O型".equals(str))
  8059 + {
  8060 + model.setBloodType("3");
  8061 + } else if ("AB型".equals(str))
  8062 + {
  8063 + model.setBloodType("4");
  8064 + } else if ("不详".equals(str))
  8065 + {
  8066 + model.setBloodType("5");
  8067 + }
8043 8068 }
8044 8069 continue;
8045 8070 case 12:
8046 8071  
... ... @@ -8106,17 +8131,20 @@
8106 8131 model.setMommyName(str);
8107 8132 continue;
8108 8133 case 23:
8109   - model.setMommyCertificateNum(str);
  8134 + model.setMommyCertificateNum(str == null ? "无" : str);
8110 8135 model.setMommyPhone(str);
8111 8136 model.setMommyCertificateTypeId("57e1dcd3f0f02e7ca519d6c6");
8112 8137 continue;
8113 8138 case 26:
8114   - str = str.replace("丰宁满族自治县","");
8115   - str = str.replace("河北省承德市","");
8116   - model.setHomeProvinceId("1");
8117   - model.setHomeCityId("9");
8118   - model.setHomeAreaId("131");
8119   - model.setHomeAddress(str);
  8139 + if (str != null)
  8140 + {
  8141 + str = str.replace("丰宁满族自治县","");
  8142 + str = str.replace("河北省承德市","");
  8143 + model.setHomeProvinceId("1");
  8144 + model.setHomeCityId("9");
  8145 + model.setHomeAreaId("131");
  8146 + model.setHomeAddress(str);
  8147 + }
8120 8148 continue;
8121 8149 case 29:
8122 8150 String hospitalId = CommonsHelper.getHospitalIdByName(str,organizationService);
platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/BookbuildingQueryRequest.java View file @ d06bb67
1 1 package com.lyms.platform.operate.web.request;
2 2  
3 3 import com.lyms.platform.common.core.annotation.form.Form;
  4 +import org.springframework.web.bind.annotation.RequestParam;
4 5  
5 6 /**
6 7 * Created by lqy on 2016/6/15.
... ... @@ -21,6 +22,24 @@
21 22 private String sINCard;
22 23  
23 24 private String pid;
  25 + private String name;
  26 + private String babyCardNo;
  27 +
  28 + public String getName() {
  29 + return name;
  30 + }
  31 +
  32 + public void setName(String name) {
  33 + this.name = name;
  34 + }
  35 +
  36 + public String getBabyCardNo() {
  37 + return babyCardNo;
  38 + }
  39 +
  40 + public void setBabyCardNo(String babyCardNo) {
  41 + this.babyCardNo = babyCardNo;
  42 + }
24 43  
25 44 public String getsINCard() {
26 45 return sINCard;
platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/SmnQueryRequest.java View file @ d06bb67
... ... @@ -20,7 +20,7 @@
20 20 private String orgProvinceId;
21 21 private String orgCityId;
22 22 private String orgAreaId;
23   -
  23 + private String sendDoctor;//送检医生
24 24 private Integer startWeek;
25 25 private Integer endWeek;
26 26  
... ... @@ -35,6 +35,15 @@
35 35 private String sfDate;//随访日期
36 36 private String ysfDate;//应随访日期
37 37 private Integer sfStatus;//随访状态 0 正常状态 1 产前诊断 2 继续妊娠 3 失联 4终止妊娠 5 分娩 6随访完成
  38 +
  39 +
  40 + public String getSendDoctor() {
  41 + return sendDoctor;
  42 + }
  43 +
  44 + public void setSendDoctor(String sendDoctor) {
  45 + this.sendDoctor = sendDoctor;
  46 + }
38 47  
39 48 public String getSfDate() {
40 49 return sfDate;
platform-operate-api/src/main/resources/mybatis.xml View file @ d06bb67
... ... @@ -21,11 +21,11 @@
21 21 <!--</plugin>-->
22 22 <!--</plugins>-->
23 23  
24   - <plugins>
25   - <plugin interceptor="com.lyms.platform.operate.web.inteceptor.MysqlDataInterceptor">
26   - <property name="dialect" value="mysql"/>
27   - </plugin>
28   - </plugins>
  24 +<!-- <plugins>-->
  25 +<!-- <plugin interceptor="com.lyms.platform.operate.web.inteceptor.MysqlDataInterceptor">-->
  26 +<!-- <property name="dialect" value="mysql"/>-->
  27 +<!-- </plugin>-->
  28 +<!-- </plugins>-->
29 29  
30 30 </configuration>