diff --git a/platform-biz-service/src/main/java/com/lyms/platform/permission/model/BabyPatientExtendEar.java b/platform-biz-service/src/main/java/com/lyms/platform/permission/model/BabyPatientExtendEar.java index 2dfbb28..84ca00e 100644 --- a/platform-biz-service/src/main/java/com/lyms/platform/permission/model/BabyPatientExtendEar.java +++ b/platform-biz-service/src/main/java/com/lyms/platform/permission/model/BabyPatientExtendEar.java @@ -24,7 +24,7 @@ public class BabyPatientExtendEar extends AbstracUuidEntity { private String lastUpdateHospitalId; /** - * 状态 1=正常 -1=禁用 + * 状态 1, "有效" 0, "无效" */ private Integer status; diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/HearingDiagnoseController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/HearingDiagnoseController.java index 3554f82..87d9593 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/HearingDiagnoseController.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/HearingDiagnoseController.java @@ -13,6 +13,7 @@ import com.lyms.platform.common.result.BaseListResponse; import com.lyms.platform.common.result.BaseResponse; import com.lyms.platform.common.utils.DateUtil; import com.lyms.platform.operate.web.facade.AutoMatchFacade; +import com.lyms.platform.operate.web.facade.BabyEarFacade; import com.lyms.platform.operate.web.request.HearingDiagnoseRequest; import com.lyms.platform.operate.web.result.HearingDiagnoseListResult; import com.lyms.platform.operate.web.utils.MyComparator; @@ -59,6 +60,8 @@ public class HearingDiagnoseController extends BaseController { private UsersService usersService; @Autowired private BabyBookbuildingService babyBookbuildingService; + @Autowired + private BabyEarFacade babyEarFacade; /** * 根据儿童id获取最后一次确诊结果 @@ -721,6 +724,7 @@ public class HearingDiagnoseController extends BaseController { hch.setReceiveDoctorid(String.valueOf(loginState.getId())); highchangeService.updateHighriskChangeHospital(hch); //调用儿童档案接口，将隐藏档案设置为显示 + babyEarFacade.showBabyEar(obj.getBabyId()); } } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/HighriskChangeHospitalController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/HighriskChangeHospitalController.java index 0e65697..939408d 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/HighriskChangeHospitalController.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/HighriskChangeHospitalController.java @@ -10,6 +10,7 @@ import com.lyms.platform.common.enums.SexEnum; import com.lyms.platform.common.result.BaseResponse; import com.lyms.platform.common.utils.DateUtil; import com.lyms.platform.operate.web.facade.AutoMatchFacade; +import com.lyms.platform.operate.web.facade.BabyEarFacade; import com.lyms.platform.operate.web.result.FrontEndResult; import com.lyms.platform.operate.web.result.HighriskChangeHospitalListResult; import com.lyms.platform.operate.web.result.HighriskChangeHospitalOneResult; @@ -60,6 +61,8 @@ public class HighriskChangeHospitalController extends BaseController { private OrganizationService organizationService; @Autowired private BabyBookbuildingService babyBookbuildingService; + @Autowired + private BabyEarFacade babyEarFacade; /** @@ -401,9 +404,6 @@ public class HighriskChangeHospitalController extends BaseController { if (StringUtils.isEmpty(obj.getId())) { return new BaseResponse().setErrorcode(ErrorCodeConstants.PARAMETER_ERROR).setErrormsg("请传入要修改的听力转诊记录id"); } - // BaseResponse basResp = validata(obj); - // if (validata(obj).getErrorcode() != 0) return basResp; - //获取当前登录用户ID LoginContext loginState = (LoginContext) request.getAttribute("loginContext"); if (loginState == null) { @@ -515,12 +515,14 @@ public class HighriskChangeHospitalController extends BaseController { } //当前登录人医院Id String hospitalId = autoMatchFacade.getHospitalId(loginState.getId()); - //调用儿童档案接口建立隐藏档案 + + //建立隐藏档案 + babyEarFacade.addhideBabyEar(obj.getTargetId(),obj.getIntoOrgid()); if (StringUtil.isBlank(obj.getTargetId())) { return new BaseResponse().setErrorcode(ErrorCodeConstants.PARAMETER_ERROR).setErrormsg("请传入儿童档案id"); } - // obj.setApplyDoctorid(String.valueOf(loginState.getId())); + obj.setApplyDoctorid(String.valueOf(loginState.getId())); obj.setId(UUID.randomUUID().toString().replace("-", "")); obj.setTargetType(2);//儿童 obj.setCreateTime(new Date()); 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 e8a7024..2cba3a6 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 @@ -173,6 +173,123 @@ public class BabyEarFacade { // childrenRecordService.addChildrenRecord(childrenRecord); }*/ + /** + * 显示儿童隐藏建档 + * + * @param babyId 儿童档案Id + * @return 操作是否成功 + */ + public boolean showBabyEar(String babyId) { + if (StringUtils.isEmpty(babyId)) { + return false; + } + BabyModel babyModel = babyService.getOneBabyById(babyId); + + //建立儿童隐藏档案 + if (babyModel != null) { + if(babyModel.getYn()!=YnEnums.YES.getId()){ + babyModel.setYn(YnEnums.YES.getId()); + babyModel.setModified(new Date()); + babyService.updateOneBaby(babyModel, babyId); + } + } + + BabyPatientExtendEarQuery earQuery = new BabyPatientExtendEarQuery(); + earQuery.setBabyPatientId(babyId); + + List ears = babyPatientExtendEarService.queryBabyPatientExtendEar(earQuery); + if (CollectionUtils.isNotEmpty(ears)) { + BabyPatientExtendEar ear = ears.get(0); + if(ear.getStatus()!=YnEnums.YES.getId()){ + ear.setStatus(YnEnums.YES.getId()); + babyPatientExtendEarService.updateBabyPatientExtendEar(ear); + } + } + return true; + } + + /** + * 增加儿童隐藏建档 + * + * @param babyId 儿童档案Id + * @param hospitalId 医院Id + * @return 操作是否成功 + */ + public boolean addhideBabyEar(String babyId, String hospitalId) { + + BabyModel babyModel = babyService.getOneBabyById(babyId); + + //隐藏档案儿童Id + String newBabyId = ""; + //建立儿童隐藏档案 + if (babyModel != null) { + //如果相同，不建立 + if (!babyModel.getHospitalId().equals(hospitalId)) { + babyModel.setHospitalId(hospitalId); + babyModel.setYn(YnEnums.NO.getId()); + babyModel.setCreated(new Date()); + newBabyId = babyService.addOneBaby(babyModel).getId(); + } else { + newBabyId = babyModel.getId(); + } + } + + BabyPatientExtendEarQuery earQuery = new BabyPatientExtendEarQuery(); + earQuery.setBabyPatientId(babyId); + + List ears = babyPatientExtendEarService.queryBabyPatientExtendEar(earQuery); + if (CollectionUtils.isNotEmpty(ears)) { + BabyPatientExtendEar ear = ears.get(0); + //如果相同，则已经存在，不处理 + if (!newBabyId.equals(babyId)) { + ear.setId(UUID.randomUUID().toString().replace("-", "")); + ear.setBabyPatientId(newBabyId); + ear.setStatus(YnEnums.NO.getId()); + babyPatientExtendEarService.addBabyPatientExtendEar(ear); + + //儿童基本信息 + BabyPatientExtendEarBirthQuery earBirthQuery = new BabyPatientExtendEarBirthQuery(); + earBirthQuery.setBabyPatientId(babyId); + + List earBirths = babyPatientExtendEarBirthService.queryBabyPatientExtendEarBirth(earBirthQuery); + if (CollectionUtils.isNotEmpty(earBirths)) { + BabyPatientExtendEarBirth earBirth = earBirths.get(0); + earBirth.setId(UUID.randomUUID().toString().replace("-", "")); + earBirth.setBabyPatientId(newBabyId); + earBirth.setBabyEarId(ear.getId()); + babyPatientExtendEarBirthService.addBabyPatientExtendEarBirth(earBirth); + } + + //儿童家庭信息 + BabyPatientExtendEarFamilyQuery familyQuery = new BabyPatientExtendEarFamilyQuery(); + familyQuery.setBabyPatientId(babyId); + + List families = babyPatientExtendEarFamilyService.queryBabyPatientExtendEarFamily(familyQuery); + if (CollectionUtils.isNotEmpty(families)) { + BabyPatientExtendEarFamily family = families.get(0); + family.setId(UUID.randomUUID().toString().replace("-", "")); + family.setBabyPatientId(newBabyId); + family.setBabyEarId(ear.getId()); + babyPatientExtendEarFamilyService.addBabyPatientExtendEarFamily(family); + } + + //儿童家庭信息 + BabyPatientExtendEarMotherQuery motherQuery = new BabyPatientExtendEarMotherQuery(); + motherQuery.setBabyPatientId(babyId); + + List mothers = babyPatientExtendEarMotherService.queryBabyPatientExtendEarMother(motherQuery); + if (CollectionUtils.isNotEmpty(mothers)) { + BabyPatientExtendEarMother mother = mothers.get(0); + mother.setId(UUID.randomUUID().toString().replace("-", "")); + mother.setBabyPatientId(newBabyId); + mother.setBabyEarId(ear.getId()); + babyPatientExtendEarMotherService.addBabyPatientExtendEarMother(mother); + } + } + } + return true; + } + /** * 增加儿童建档 @@ -1079,26 +1196,26 @@ public class BabyEarFacade { * @return */ public BaseResponse deleteBabyEar(String babyEarId) { - if(StringUtils.isNotEmpty(babyEarId)){ + if (StringUtils.isEmpty(babyEarId)) { return new BaseResponse().setErrormsg("请传入请求参数").setErrorcode(ErrorCodeConstants.SUCCESS); } BabyPatientExtendEar babyPatientExtendEar = babyPatientExtendEarService.getBabyPatientExtendEar(babyEarId); - if(babyPatientExtendEar!=null){ + if (babyPatientExtendEar != null) { BabyModel babyModels = babyService.getOneBabyById(babyPatientExtendEar.getBabyPatientId()); - if(babyModels!=null){ + if (babyModels != null) { babyModels.setYn(YnEnums.NO.getId()); babyModels.setModified(new Date()); - babyService.updateOneBaby(babyModels,babyPatientExtendEar.getBabyPatientId()); + babyService.updateOneBaby(babyModels, babyPatientExtendEar.getBabyPatientId()); } PersonModelQuery personModelQuery = new PersonModelQuery(); personModelQuery.setId(babyPatientExtendEar.getPersonId()); List personModels = personService.queryPersons(personModelQuery); - if(CollectionUtils.isNotEmpty(personModels)){ + if (CollectionUtils.isNotEmpty(personModels)) { PersonModel personModel = personModels.get(0); personModel.setModified(new Date()); personModel.setYn(YnEnums.NO.getId()); - personService.updatePerson(personModel,babyPatientExtendEar.getPersonId()); + personService.updatePerson(personModel, babyPatientExtendEar.getPersonId()); } babyPatientExtendEar.setStatus(YnEnums.NO.getId());