Commit 21f2c7cb0f2d4213651cda00612c26ca99dcfb63
1 parent
a1e040fe41
Exists in
master
and in
6 other branches
update
Showing 2 changed files with 65 additions and 42 deletions
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyBookbuildingFacade.java
View file @
21f2c7c
... | ... | @@ -479,6 +479,10 @@ |
479 | 479 | model.setEndCase(0);//秦皇岛,默认未结案 |
480 | 480 | babyBookbuildingService.updateBabyBuild(model, request.getId()); |
481 | 481 | |
482 | + //眼保健保存建档时候,更新听力产筛档案mysql表 | |
483 | + addMysqlOrUpdateBabyEar(userId, model); | |
484 | + | |
485 | + | |
482 | 486 | // 更新追访概况,作废档案转正 |
483 | 487 | babyAfterVisitService.addOrUpdateAfterVisitData(model, TYPE_STATISTICS, STATUS_TYPE_BUILD); |
484 | 488 | babyAfterVisitService.addOrUpdateAfterVisitData(model, TYPE_BUILD, STATUS_TYPE_NO); |
... | ... | @@ -577,7 +581,7 @@ |
577 | 581 | return br; |
578 | 582 | } |
579 | 583 | } |
580 | - | |
584 | + String encodedUtil = getEncodedUtil(); | |
581 | 585 | Patients patients = null; |
582 | 586 | PersonModel resperson = null; |
583 | 587 | String babyPersonId = ""; |
... | ... | @@ -723,7 +727,6 @@ |
723 | 727 | pmodel.setYn(YnEnums.YES.getId()); |
724 | 728 | pmodel.setModified(new Date()); |
725 | 729 | pmodel.setCreated(new Date()); |
726 | - | |
727 | 730 | operateLogFacade.addAddOptLog(userId, Integer.valueOf(hid), pmodel, OptActionEnums.ADD.getId(), "儿童建档时候添加孕妇建档的person建档"); |
728 | 731 | |
729 | 732 | PersonModel yunModel = personService.addPerson(pmodel); |
... | ... | @@ -745,6 +748,7 @@ |
745 | 748 | return br; |
746 | 749 | } |
747 | 750 | |
751 | + request.setEncoded(encodedUtil); | |
748 | 752 | BabyModel model = getBabyModel(request, true, userId); |
749 | 753 | model.setmHighRiskReason(request.getmHighRiskReason()); |
750 | 754 | model.setPid(babyPersonId); |
751 | 755 | |
... | ... | @@ -776,31 +780,9 @@ |
776 | 780 | model.setEndCase(0);//秦皇岛,默认未结案 |
777 | 781 | model = babyBookbuildingService.addBabyBookbuilding(model); |
778 | 782 | |
779 | - /** | |
780 | - * start | |
781 | - * 眼保健保存建档时候,保存听力产筛档案 | |
782 | - * @Author: 武涛涛 | |
783 | - * @Date: 2020/7/22 15:42 | |
784 | - */ | |
785 | - BaseObjectResponse babyEarById = (BaseObjectResponse) babyEarFacade.findBabyEarById(model.getId()); | |
786 | - BabyEarResult babyEarResult = (BabyEarResult) babyEarById.getData();//获取要保存的眼保健档案 /babyear | |
783 | + //眼保健保存建档时候,保存听力产筛档案mysql表 | |
784 | + addMysqlOrUpdateBabyEar(userId, model); | |
787 | 785 | |
788 | - BabyEarAddRequest babyEarAddRequest = new BabyEarAddRequest(); | |
789 | - babyEarAddRequest.setBase(babyEarResult.getBase()); | |
790 | - babyEarAddRequest.setBabyBirth(babyEarResult.getBabyBirth()); | |
791 | - BabyPatientExtendEarMotherRequest patientExtendEarMother = new BabyPatientExtendEarMotherRequest(); | |
792 | - Map hSTMap = new HashMap(); | |
793 | - List jcsjUnitList = new ArrayList(); | |
794 | - Map map1 = new HashMap(); | |
795 | - map1.put("jcsjUnit", "1"); | |
796 | - jcsjUnitList.add(map1); | |
797 | - hSTMap.put("lists", jcsjUnitList); | |
798 | - patientExtendEarMother.setHarmfulSubstanceType(hSTMap); | |
799 | - babyEarAddRequest.setPatientExtendEarMother(patientExtendEarMother);//数据模仿前端默认数据参数 | |
800 | - babyEarAddRequest.setPatientExtendEarFamily(babyEarResult.getPatientExtendEarFamily()); | |
801 | - babyEarFacade.addOrUpdateBabyEar(babyEarAddRequest, userId);//听力筛查建档/babyear | |
802 | - /*end */ | |
803 | - | |
804 | 786 | // 更新追访概况,作废档案转正 |
805 | 787 | babyAfterVisitService.addOrUpdateAfterVisitData(model, TYPE_STATISTICS, STATUS_TYPE_BUILD); |
806 | 788 | //babyAfterVisitService.addOrUpdateAfterVisitData(model, TYPE_BUILD, STATUS_TYPE_NO); |
807 | 789 | |
... | ... | @@ -844,7 +826,39 @@ |
844 | 826 | } |
845 | 827 | return br; |
846 | 828 | } |
829 | + /** | |
830 | + * | |
831 | + * 眼保健保存建档时候,保存听力产筛档案 | |
832 | + * @Author: 武涛涛 | |
833 | + * @Date: 2020/7/22 15:42 | |
834 | + */ | |
835 | + private void addMysqlOrUpdateBabyEar(Integer userId, BabyModel model) { | |
836 | + try { | |
837 | + BaseObjectResponse babyEarById = (BaseObjectResponse) babyEarFacade.findBabyEarById(model.getId()); | |
838 | + BabyEarResult babyEarResult = (BabyEarResult) babyEarById.getData();//获取要保存的眼保健档案 /babyear | |
847 | 839 | |
840 | + BabyEarAddRequest babyEarAddRequest = new BabyEarAddRequest(); | |
841 | + babyEarAddRequest.setBase(babyEarResult.getBase()); | |
842 | + babyEarAddRequest.setBabyBirth(babyEarResult.getBabyBirth()); | |
843 | + | |
844 | + BabyPatientExtendEarMotherRequest patientExtendEarMother = new BabyPatientExtendEarMotherRequest(); | |
845 | + Map hSTMap = new HashMap(); | |
846 | + List jcsjUnitList = new ArrayList(); | |
847 | + Map map1 = new HashMap(); | |
848 | + map1.put("jcsjUnit", "1"); | |
849 | + jcsjUnitList.add(map1); | |
850 | + hSTMap.put("lists", jcsjUnitList); | |
851 | + patientExtendEarMother.setHarmfulSubstanceType(hSTMap); | |
852 | + babyEarAddRequest.setPatientExtendEarMother(patientExtendEarMother);//数据模仿前端默认数据参数 | |
853 | + | |
854 | + babyEarAddRequest.setPatientExtendEarFamily(babyEarResult.getPatientExtendEarFamily()); | |
855 | + babyEarFacade.addOrUpdateBabyEar(babyEarAddRequest, userId);//听力筛查建档/babyear | |
856 | + } catch (Exception e) { | |
857 | + e.printStackTrace(); | |
858 | + } | |
859 | + | |
860 | + } | |
861 | + | |
848 | 862 | private void getNumberCode(BabyModel model) { |
849 | 863 | if (model.getMcertNo().length() > 8) { |
850 | 864 | model.setNumberCode(model.getMcertNo().substring(model.getMcertNo().length() - 8)); |
851 | 865 | |
852 | 866 | |
... | ... | @@ -1119,14 +1133,12 @@ |
1119 | 1133 | bm.setDataStatus(0); |
1120 | 1134 | bm.setCreated(new Date()); |
1121 | 1135 | } |
1122 | - | |
1136 | + //新生儿民族Id | |
1137 | + bm.setBnationId(b.getBnationId());//新生儿民族Id | |
1123 | 1138 | // 编码,新增时候增加修改不做处理 |
1124 | 1139 | if (StringUtils.isEmpty(b.getId())) { |
1125 | - bm.setEncoded(getEncodedUtil()); | |
1140 | + bm.setEncoded(b.getEncoded()); | |
1126 | 1141 | } |
1127 | - //新生儿民族Id | |
1128 | - bm.setBnationId(b.getBnationId());//新生儿民族Id | |
1129 | - | |
1130 | 1142 | bm.setLiveType(b.getLiveType()); |
1131 | 1143 | bm.setFileCode(b.getFileCode()); |
1132 | 1144 | bm.setBabyHighRiskReason(b.getBabyHighRiskReason()); |
... | ... | @@ -1342,7 +1354,10 @@ |
1342 | 1354 | * @Date: 2020/7/21 16:07 |
1343 | 1355 | */ |
1344 | 1356 | public String getEncodedUtil() { |
1345 | - try { | |
1357 | + | |
1358 | + String encodedBaby = null; | |
1359 | + BabyModel babyModel = null; | |
1360 | + try { | |
1346 | 1361 | BabyModelQuery babyQuery = new BabyModelQuery(); |
1347 | 1362 | babyQuery.setYn(YnEnums.YES.getId()); |
1348 | 1363 | babyQuery.setCreatedTimeStart(DateUtil.getDayFirstSecond(new Date())); |
1349 | 1364 | |
1350 | 1365 | |
1351 | 1366 | |
1352 | 1367 | |
... | ... | @@ -1351,17 +1366,24 @@ |
1351 | 1366 | MongoQuery query = babyQuery.convertToQuery(); |
1352 | 1367 | List<BabyModel> list = babyBookBuildingDao.queryBabyWithQuery(query.addOrder(Sort.Direction.DESC, "created")); |
1353 | 1368 | if (CollectionUtils.isNotEmpty(list)) { |
1354 | - BabyModel babyModel = list.get(0); | |
1369 | + babyModel = list.get(0); | |
1355 | 1370 | if (StringUtils.isNotEmpty(babyModel.getEncoded()) && babyModel.getEncoded().length() > 8) { |
1356 | 1371 | String encoded = babyModel.getEncoded().substring(8, babyModel.getEncoded().length());//20200721003 |
1357 | - return DateUtil.getDateNumber(encoded); | |
1372 | + encodedBaby= DateUtil.getDateNumber(encoded); | |
1358 | 1373 | } |
1359 | 1374 | } |
1360 | - return DateUtil.getDateNumber("0"); | |
1361 | 1375 | } catch (Exception e) { |
1362 | 1376 | e.printStackTrace(); |
1363 | 1377 | } |
1378 | + | |
1379 | + if(StringUtils.isNotEmpty(encodedBaby)){ | |
1380 | + return encodedBaby; | |
1381 | + } | |
1382 | + if(babyModel==null) { | |
1383 | + return DateUtil.getDateNumber("0"); | |
1384 | + } | |
1364 | 1385 | return null; |
1386 | + | |
1365 | 1387 | } |
1366 | 1388 | |
1367 | 1389 | /** |
... | ... | @@ -1757,9 +1779,6 @@ |
1757 | 1779 | */ |
1758 | 1780 | public BaseObjectResponse queryBabyBuildRecord(BookbuildingQueryRequest param, Integer userId) { |
1759 | 1781 | |
1760 | - //编码获取手机号获取档案信息 | |
1761 | - setEncodedCardNo(param, userId); | |
1762 | - | |
1763 | 1782 | Map<String, Object> map = new HashMap<>(); |
1764 | 1783 | |
1765 | 1784 | List<BabyInfoResult> results = new ArrayList<>(); |
1766 | 1785 | |
... | ... | @@ -1864,11 +1883,12 @@ |
1864 | 1883 | } |
1865 | 1884 | |
1866 | 1885 | puerperaQuery.setPhoneOrCert(param.getCardNo()); |
1867 | - } else if (param.getHospitalId() != null & !StringUtils.isEmpty(param.getVcCardNo())) { | |
1886 | + } else if ((param.getHospitalId() != null & !StringUtils.isEmpty(param.getVcCardNo())) || StringUtils.isNotEmpty(param.getEncoded())) { | |
1868 | 1887 | |
1869 | 1888 | BabyModelQuery babyQuery = new BabyModelQuery(); |
1870 | 1889 | babyQuery.setYn(YnEnums.YES.getId()); |
1871 | 1890 | babyQuery.setVcCardNo(param.getVcCardNo()); |
1891 | + babyQuery.setEncoded(param.getEncoded()); | |
1872 | 1892 | if (org.apache.commons.lang.StringUtils.isNotEmpty(groupsFacade.findByCurrentUserId(autoMatchFacade.getHospitalId(userId)))) { |
1873 | 1893 | List list = new ArrayList(); |
1874 | 1894 | list.add("1"); |
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyEarFacade.java
View file @
21f2c7c
... | ... | @@ -110,9 +110,11 @@ |
110 | 110 | babyPerson.setName(baby.getName()); |
111 | 111 | babyPerson.setBirth(baby.getBirth()); |
112 | 112 | babyPerson.setCardNo(baby.getMcertNo()); |
113 | + babyPerson.setPhone(baby.getMphone()); | |
113 | 114 | babyPerson.setType(2); |
114 | 115 | babyPerson.setYn(YnEnums.YES.getId()); |
115 | 116 | babyPerson.setModified(new Date()); |
117 | + babyPerson.setCreated(new Date()); | |
116 | 118 | return personService.addPerson(babyPerson); |
117 | 119 | } |
118 | 120 | |
... | ... | @@ -465,7 +467,7 @@ |
465 | 467 | babyPatientExtendEarMother = babyPatientExtendEarMotherRequest.convertToDataModel(); |
466 | 468 | } |
467 | 469 | String hId = autoMatchFacade.getHospitalId(userId); |
468 | - | |
470 | + String encodedUtil = babyBookbuildingFacade.getEncodedUtil(); | |
469 | 471 | if (null != baby) { |
470 | 472 | String pid = null; |
471 | 473 | if (StringUtils.isNotEmpty(baby.getPid())) {//更新本院儿童信息 |
... | ... | @@ -483,6 +485,8 @@ |
483 | 485 | personService.updatePerson(personModel, personModel.getId()); |
484 | 486 | } |
485 | 487 | } else {//新增儿童信息 |
488 | + //处理儿童person信息 | |
489 | + //baby.setEncoded(encodedUtil); | |
486 | 490 | pid = handBabyPerson(baby).getId(); |
487 | 491 | } |
488 | 492 | //babyId |
489 | 493 | |
... | ... | @@ -519,9 +523,8 @@ |
519 | 523 | baby.setYn(1); |
520 | 524 | baby.setBuildType(1); |
521 | 525 | baby.setCreated(new Date()); |
522 | - // 编码,新增时候增加修改不做处理 | |
523 | 526 | if (StringUtils.isEmpty(baby.getId())) { |
524 | - baby.setEncoded(babyBookbuildingFacade.getEncodedUtil()); | |
527 | + baby.setEncoded(encodedUtil); | |
525 | 528 | } |
526 | 529 | babyPatientId = babyService.addOneBaby(baby).getId(); |
527 | 530 | babyBookbuildingFacade.createBuildMsg(baby); |