Commit ded21988b267dc9dfc647f30d9ccf49e7d1c1eed
1 parent
c16b18e250
Exists in
master
and in
6 other branches
update
Showing 3 changed files with 65 additions and 1 deletions
platform-dal/src/main/java/com/lyms/platform/pojo/BabyModel.java
View file @
ded2198
... | ... | @@ -2,6 +2,7 @@ |
2 | 2 | |
3 | 3 | import com.lyms.platform.beans.SerialIdEnum; |
4 | 4 | import com.lyms.platform.common.result.BaseModel; |
5 | +import com.lyms.platform.common.utils.PingYinUtil; | |
5 | 6 | import org.springframework.data.mongodb.core.mapping.Document; |
6 | 7 | import org.springframework.data.mongodb.core.mapping.Field; |
7 | 8 | |
... | ... | @@ -249,6 +250,10 @@ |
249 | 250 | * 小孩名称 |
250 | 251 | */ |
251 | 252 | private String name; |
253 | + | |
254 | + //儿童姓名首字母拼音 | |
255 | + private String firstPyName; | |
256 | + | |
252 | 257 | //儿童社保卡 |
253 | 258 | private String sINCard; |
254 | 259 | /** |
... | ... | @@ -593,6 +598,14 @@ |
593 | 598 | //最后儿保检查医生 |
594 | 599 | private String lastCheckDoctor; |
595 | 600 | |
601 | + public String getFirstPyName() { | |
602 | + return firstPyName; | |
603 | + } | |
604 | + | |
605 | + public void setFirstPyName(String firstPyName) { | |
606 | + this.firstPyName = firstPyName; | |
607 | + } | |
608 | + | |
596 | 609 | public String getLastCheckDoctor() { |
597 | 610 | return lastCheckDoctor; |
598 | 611 | } |
... | ... | @@ -1556,6 +1569,8 @@ |
1556 | 1569 | } |
1557 | 1570 | |
1558 | 1571 | public void setName(String name) { |
1572 | + | |
1573 | + this.firstPyName = PingYinUtil.getFirstSpell(name); | |
1559 | 1574 | this.name = name; |
1560 | 1575 | } |
1561 | 1576 |
platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/TestController.java
View file @
ded2198
... | ... | @@ -4367,5 +4367,53 @@ |
4367 | 4367 | } |
4368 | 4368 | return "updateAntExRecordModelDueStatus finish"; |
4369 | 4369 | } |
4370 | + | |
4371 | + | |
4372 | + | |
4373 | + @RequestMapping(value = "/updateBabyFirstPyName", method = RequestMethod.GET) | |
4374 | + @ResponseBody | |
4375 | + public String updateBabyFirstPyName(@RequestParam(required = false) String hospitalId) { | |
4376 | + | |
4377 | + OrganizationQuery organizationQuery = new OrganizationQuery(); | |
4378 | + organizationQuery.setYn(YnEnums.YES.getId()); | |
4379 | + if (StringUtils.isNotEmpty(hospitalId)) { | |
4380 | + organizationQuery.setId(Integer.parseInt(hospitalId)); | |
4381 | + } | |
4382 | + List<Organization> organizationList = organizationService.queryOrganization(organizationQuery); | |
4383 | + | |
4384 | + for (Organization org : organizationList) | |
4385 | + { | |
4386 | + System.out.println(org.getId()+org.getName()); | |
4387 | + int page = 1; | |
4388 | + int limit = 500; | |
4389 | + while (true) | |
4390 | + { | |
4391 | + BabyModelQuery babyModelQuery = new BabyModelQuery(); | |
4392 | + babyModelQuery.setHospitalId(org.getId()+""); | |
4393 | + babyModelQuery.setPage(page); | |
4394 | + babyModelQuery.setLimit(limit); | |
4395 | + babyModelQuery.setNeed("true"); | |
4396 | + List<BabyModel> antExRecordModelList = babyBookbuildingService.queryBabyBuildByCond(babyModelQuery); | |
4397 | + page++; | |
4398 | + if (CollectionUtils.isNotEmpty(antExRecordModelList)) { | |
4399 | + for (BabyModel babyModel : antExRecordModelList) { | |
4400 | + if (StringUtils.isNotEmpty(babyModel.getName())) { | |
4401 | + BabyModel babyModeldb = new BabyModel(); | |
4402 | + babyModeldb.setId(babyModel.getId()); | |
4403 | + babyModeldb.setFirstPyName(PingYinUtil.getFirstSpell(babyModel.getName())); | |
4404 | + System.out.println(babyModel.getId()); | |
4405 | + babyBookbuildingService.updateBabyBuild(babyModel,babyModel.getId()); | |
4406 | + } | |
4407 | + } | |
4408 | + | |
4409 | + } | |
4410 | + else | |
4411 | + { | |
4412 | + break; | |
4413 | + } | |
4414 | + } | |
4415 | + } | |
4416 | + return "updateBabyFirstPyName finish"; | |
4417 | + } | |
4370 | 4418 | } |
platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/BabyEyeCheckServiceImpl.java
View file @
ded2198
... | ... | @@ -976,7 +976,8 @@ |
976 | 976 | if (org.apache.commons.lang.StringUtils.isNotBlank(key) || org.apache.commons.lang.StringUtils.isNotBlank(yeymcId)) { |
977 | 977 | Criteria c = new Criteria(); |
978 | 978 | if (org.apache.commons.lang.StringUtils.isNotBlank(key)) { |
979 | - c.orOperator(Criteria.where("mphone").is(key), Criteria.where("name").regex(key), Criteria.where("mcertNo").is(key)).and("yn").ne(0); | |
979 | + c.orOperator(Criteria.where("mphone").is(key), Criteria.where("name").regex(key), Criteria.where("mcertNo").is(key), | |
980 | + Criteria.where("firstPyName").is(key)).and("yn").ne(0); | |
980 | 981 | } |
981 | 982 | if (org.apache.commons.lang.StringUtils.isNotBlank(yeymcId)) { |
982 | 983 | c.and("yeymcId").is(yeymcId); |