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 cfa0f3c..5bff9f9 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 @@ -479,6 +479,10 @@ public class BabyBookbuildingFacade { model.setEndCase(0);//秦皇岛，默认未结案 babyBookbuildingService.updateBabyBuild(model, request.getId()); + //眼保健保存建档时候，更新听力产筛档案mysql表 + addMysqlOrUpdateBabyEar(userId, model); + + // 更新追访概况，作废档案转正 babyAfterVisitService.addOrUpdateAfterVisitData(model, TYPE_STATISTICS, STATUS_TYPE_BUILD); babyAfterVisitService.addOrUpdateAfterVisitData(model, TYPE_BUILD, STATUS_TYPE_NO); @@ -577,7 +581,7 @@ public class BabyBookbuildingFacade { return br; } } - + String encodedUtil = getEncodedUtil(); Patients patients = null; PersonModel resperson = null; String babyPersonId = ""; @@ -723,7 +727,6 @@ public class BabyBookbuildingFacade { pmodel.setYn(YnEnums.YES.getId()); pmodel.setModified(new Date()); pmodel.setCreated(new Date()); - operateLogFacade.addAddOptLog(userId, Integer.valueOf(hid), pmodel, OptActionEnums.ADD.getId(), "儿童建档时候添加孕妇建档的person建档"); PersonModel yunModel = personService.addPerson(pmodel); @@ -745,6 +748,7 @@ public class BabyBookbuildingFacade { return br; } + request.setEncoded(encodedUtil); BabyModel model = getBabyModel(request, true, userId); model.setmHighRiskReason(request.getmHighRiskReason()); model.setPid(babyPersonId); @@ -776,30 +780,8 @@ public class BabyBookbuildingFacade { model.setEndCase(0);//秦皇岛，默认未结案 model = babyBookbuildingService.addBabyBookbuilding(model); - /** - * start - * 眼保健保存建档时候，保存听力产筛档案 - * @Author: 武涛涛 - * @Date: 2020/7/22 15:42 - */ - BaseObjectResponse babyEarById = (BaseObjectResponse) babyEarFacade.findBabyEarById(model.getId()); - BabyEarResult babyEarResult = (BabyEarResult) babyEarById.getData();//获取要保存的眼保健档案 /babyear - - BabyEarAddRequest babyEarAddRequest = new BabyEarAddRequest(); - babyEarAddRequest.setBase(babyEarResult.getBase()); - babyEarAddRequest.setBabyBirth(babyEarResult.getBabyBirth()); - BabyPatientExtendEarMotherRequest patientExtendEarMother = new BabyPatientExtendEarMotherRequest(); - Map hSTMap = new HashMap(); - List jcsjUnitList = new ArrayList(); - Map map1 = new HashMap(); - map1.put("jcsjUnit", "1"); - jcsjUnitList.add(map1); - hSTMap.put("lists", jcsjUnitList); - patientExtendEarMother.setHarmfulSubstanceType(hSTMap); - babyEarAddRequest.setPatientExtendEarMother(patientExtendEarMother);//数据模仿前端默认数据参数 - babyEarAddRequest.setPatientExtendEarFamily(babyEarResult.getPatientExtendEarFamily()); - babyEarFacade.addOrUpdateBabyEar(babyEarAddRequest, userId);//听力筛查建档/babyear - /*end */ + //眼保健保存建档时候，保存听力产筛档案mysql表 + addMysqlOrUpdateBabyEar(userId, model); // 更新追访概况，作废档案转正 babyAfterVisitService.addOrUpdateAfterVisitData(model, TYPE_STATISTICS, STATUS_TYPE_BUILD); @@ -844,6 +826,38 @@ public class BabyBookbuildingFacade { } return br; } + /** + * + * 眼保健保存建档时候，保存听力产筛档案 + * @Author: 武涛涛 + * @Date: 2020/7/22 15:42 + */ + private void addMysqlOrUpdateBabyEar(Integer userId, BabyModel model) { + try { + BaseObjectResponse babyEarById = (BaseObjectResponse) babyEarFacade.findBabyEarById(model.getId()); + BabyEarResult babyEarResult = (BabyEarResult) babyEarById.getData();//获取要保存的眼保健档案 /babyear + + BabyEarAddRequest babyEarAddRequest = new BabyEarAddRequest(); + babyEarAddRequest.setBase(babyEarResult.getBase()); + babyEarAddRequest.setBabyBirth(babyEarResult.getBabyBirth()); + + BabyPatientExtendEarMotherRequest patientExtendEarMother = new BabyPatientExtendEarMotherRequest(); + Map hSTMap = new HashMap(); + List jcsjUnitList = new ArrayList(); + Map map1 = new HashMap(); + map1.put("jcsjUnit", "1"); + jcsjUnitList.add(map1); + hSTMap.put("lists", jcsjUnitList); + patientExtendEarMother.setHarmfulSubstanceType(hSTMap); + babyEarAddRequest.setPatientExtendEarMother(patientExtendEarMother);//数据模仿前端默认数据参数 + + babyEarAddRequest.setPatientExtendEarFamily(babyEarResult.getPatientExtendEarFamily()); + babyEarFacade.addOrUpdateBabyEar(babyEarAddRequest, userId);//听力筛查建档/babyear + } catch (Exception e) { + e.printStackTrace(); + } + + } private void getNumberCode(BabyModel model) { if (model.getMcertNo().length() > 8) { @@ -1119,14 +1133,12 @@ public class BabyBookbuildingFacade { bm.setDataStatus(0); bm.setCreated(new Date()); } - + //新生儿民族Id + bm.setBnationId(b.getBnationId());//新生儿民族Id // 编码,新增时候增加修改不做处理 if (StringUtils.isEmpty(b.getId())) { - bm.setEncoded(getEncodedUtil()); + bm.setEncoded(b.getEncoded()); } - //新生儿民族Id - bm.setBnationId(b.getBnationId());//新生儿民族Id - bm.setLiveType(b.getLiveType()); bm.setFileCode(b.getFileCode()); bm.setBabyHighRiskReason(b.getBabyHighRiskReason()); @@ -1342,7 +1354,10 @@ public class BabyBookbuildingFacade { * @Date: 2020/7/21 16:07 */ public String getEncodedUtil() { - try { + + String encodedBaby = null; + BabyModel babyModel = null; + try { BabyModelQuery babyQuery = new BabyModelQuery(); babyQuery.setYn(YnEnums.YES.getId()); babyQuery.setCreatedTimeStart(DateUtil.getDayFirstSecond(new Date())); @@ -1351,17 +1366,24 @@ public class BabyBookbuildingFacade { MongoQuery query = babyQuery.convertToQuery(); List list = babyBookBuildingDao.queryBabyWithQuery(query.addOrder(Sort.Direction.DESC, "created")); if (CollectionUtils.isNotEmpty(list)) { - BabyModel babyModel = list.get(0); + babyModel = list.get(0); if (StringUtils.isNotEmpty(babyModel.getEncoded()) && babyModel.getEncoded().length() > 8) { String encoded = babyModel.getEncoded().substring(8, babyModel.getEncoded().length());//20200721003 - return DateUtil.getDateNumber(encoded); + encodedBaby= DateUtil.getDateNumber(encoded); } } - return DateUtil.getDateNumber("0"); } catch (Exception e) { e.printStackTrace(); } + + if(StringUtils.isNotEmpty(encodedBaby)){ + return encodedBaby; + } + if(babyModel==null) { + return DateUtil.getDateNumber("0"); + } return null; + } /** @@ -1757,9 +1779,6 @@ public class BabyBookbuildingFacade { */ public BaseObjectResponse queryBabyBuildRecord(BookbuildingQueryRequest param, Integer userId) { - //编码获取手机号获取档案信息 - setEncodedCardNo(param, userId); - Map map = new HashMap<>(); List results = new ArrayList<>(); @@ -1864,11 +1883,12 @@ public class BabyBookbuildingFacade { } puerperaQuery.setPhoneOrCert(param.getCardNo()); - } else if (param.getHospitalId() != null & !StringUtils.isEmpty(param.getVcCardNo())) { + } else if ((param.getHospitalId() != null & !StringUtils.isEmpty(param.getVcCardNo())) || StringUtils.isNotEmpty(param.getEncoded())) { BabyModelQuery babyQuery = new BabyModelQuery(); babyQuery.setYn(YnEnums.YES.getId()); babyQuery.setVcCardNo(param.getVcCardNo()); + babyQuery.setEncoded(param.getEncoded()); if (org.apache.commons.lang.StringUtils.isNotEmpty(groupsFacade.findByCurrentUserId(autoMatchFacade.getHospitalId(userId)))) { List list = new ArrayList(); list.add("1"); diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyEarFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyEarFacade.java index 25630d4..e34a65d 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyEarFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyEarFacade.java @@ -110,9 +110,11 @@ public class BabyEarFacade { babyPerson.setName(baby.getName()); babyPerson.setBirth(baby.getBirth()); babyPerson.setCardNo(baby.getMcertNo()); + babyPerson.setPhone(baby.getMphone()); babyPerson.setType(2); babyPerson.setYn(YnEnums.YES.getId()); babyPerson.setModified(new Date()); + babyPerson.setCreated(new Date()); return personService.addPerson(babyPerson); } @@ -465,7 +467,7 @@ public class BabyEarFacade { babyPatientExtendEarMother = babyPatientExtendEarMotherRequest.convertToDataModel(); } String hId = autoMatchFacade.getHospitalId(userId); - + String encodedUtil = babyBookbuildingFacade.getEncodedUtil(); if (null != baby) { String pid = null; if (StringUtils.isNotEmpty(baby.getPid())) {//更新本院儿童信息 @@ -483,6 +485,8 @@ public class BabyEarFacade { personService.updatePerson(personModel, personModel.getId()); } } else {//新增儿童信息 + //处理儿童person信息 + //baby.setEncoded(encodedUtil); pid = handBabyPerson(baby).getId(); } //babyId @@ -519,9 +523,8 @@ public class BabyEarFacade { baby.setYn(1); baby.setBuildType(1); baby.setCreated(new Date()); - // 编码,新增时候增加修改不做处理 if (StringUtils.isEmpty(baby.getId())) { - baby.setEncoded(babyBookbuildingFacade.getEncodedUtil()); + baby.setEncoded(encodedUtil); } babyPatientId = babyService.addOneBaby(baby).getId(); babyBookbuildingFacade.createBuildMsg(baby);