Commit 510d966454e94a17b207797eddecc36aea6f8948
1 parent
15e11b732c
Exists in
master
and in
6 other branches
听力诊断模块
Showing 4 changed files with 135 additions and 12 deletions
- platform-biz-service/src/main/java/com/lyms/platform/permission/model/BabyPatientExtendEar.java
- platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/HearingDiagnoseController.java
- platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/HighriskChangeHospitalController.java
- platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyEarFacade.java
platform-biz-service/src/main/java/com/lyms/platform/permission/model/BabyPatientExtendEar.java
View file @
510d966
platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/HearingDiagnoseController.java
View file @
510d966
| ... | ... | @@ -13,6 +13,7 @@ |
| 13 | 13 | import com.lyms.platform.common.result.BaseResponse; |
| 14 | 14 | import com.lyms.platform.common.utils.DateUtil; |
| 15 | 15 | import com.lyms.platform.operate.web.facade.AutoMatchFacade; |
| 16 | +import com.lyms.platform.operate.web.facade.BabyEarFacade; | |
| 16 | 17 | import com.lyms.platform.operate.web.request.HearingDiagnoseRequest; |
| 17 | 18 | import com.lyms.platform.operate.web.result.HearingDiagnoseListResult; |
| 18 | 19 | import com.lyms.platform.operate.web.utils.MyComparator; |
| ... | ... | @@ -59,6 +60,8 @@ |
| 59 | 60 | private UsersService usersService; |
| 60 | 61 | @Autowired |
| 61 | 62 | private BabyBookbuildingService babyBookbuildingService; |
| 63 | + @Autowired | |
| 64 | + private BabyEarFacade babyEarFacade; | |
| 62 | 65 | |
| 63 | 66 | /** |
| 64 | 67 | * 根据儿童id获取最后一次确诊结果 |
| ... | ... | @@ -721,6 +724,7 @@ |
| 721 | 724 | hch.setReceiveDoctorid(String.valueOf(loginState.getId())); |
| 722 | 725 | highchangeService.updateHighriskChangeHospital(hch); |
| 723 | 726 | //调用儿童档案接口,将隐藏档案设置为显示 |
| 727 | + babyEarFacade.showBabyEar(obj.getBabyId()); | |
| 724 | 728 | } |
| 725 | 729 | } |
| 726 | 730 |
platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/HighriskChangeHospitalController.java
View file @
510d966
| ... | ... | @@ -10,6 +10,7 @@ |
| 10 | 10 | import com.lyms.platform.common.result.BaseResponse; |
| 11 | 11 | import com.lyms.platform.common.utils.DateUtil; |
| 12 | 12 | import com.lyms.platform.operate.web.facade.AutoMatchFacade; |
| 13 | +import com.lyms.platform.operate.web.facade.BabyEarFacade; | |
| 13 | 14 | import com.lyms.platform.operate.web.result.FrontEndResult; |
| 14 | 15 | import com.lyms.platform.operate.web.result.HighriskChangeHospitalListResult; |
| 15 | 16 | import com.lyms.platform.operate.web.result.HighriskChangeHospitalOneResult; |
| ... | ... | @@ -60,6 +61,8 @@ |
| 60 | 61 | private OrganizationService organizationService; |
| 61 | 62 | @Autowired |
| 62 | 63 | private BabyBookbuildingService babyBookbuildingService; |
| 64 | + @Autowired | |
| 65 | + private BabyEarFacade babyEarFacade; | |
| 63 | 66 | |
| 64 | 67 | |
| 65 | 68 | /** |
| ... | ... | @@ -401,9 +404,6 @@ |
| 401 | 404 | if (StringUtils.isEmpty(obj.getId())) { |
| 402 | 405 | return new BaseResponse().setErrorcode(ErrorCodeConstants.PARAMETER_ERROR).setErrormsg("请传入要修改的听力转诊记录id"); |
| 403 | 406 | } |
| 404 | - // BaseResponse basResp = validata(obj); | |
| 405 | - // if (validata(obj).getErrorcode() != 0) return basResp; | |
| 406 | - | |
| 407 | 407 | //获取当前登录用户ID |
| 408 | 408 | LoginContext loginState = (LoginContext) request.getAttribute("loginContext"); |
| 409 | 409 | if (loginState == null) { |
| 410 | 410 | |
| 411 | 411 | |
| ... | ... | @@ -515,12 +515,14 @@ |
| 515 | 515 | } |
| 516 | 516 | //当前登录人医院Id |
| 517 | 517 | String hospitalId = autoMatchFacade.getHospitalId(loginState.getId()); |
| 518 | - //调用儿童档案接口建立隐藏档案 | |
| 519 | 518 | |
| 519 | + //建立隐藏档案 | |
| 520 | + babyEarFacade.addhideBabyEar(obj.getTargetId(),obj.getIntoOrgid()); | |
| 521 | + | |
| 520 | 522 | if (StringUtil.isBlank(obj.getTargetId())) { |
| 521 | 523 | return new BaseResponse().setErrorcode(ErrorCodeConstants.PARAMETER_ERROR).setErrormsg("请传入儿童档案id"); |
| 522 | 524 | } |
| 523 | - // obj.setApplyDoctorid(String.valueOf(loginState.getId())); | |
| 525 | + obj.setApplyDoctorid(String.valueOf(loginState.getId())); | |
| 524 | 526 | obj.setId(UUID.randomUUID().toString().replace("-", "")); |
| 525 | 527 | obj.setTargetType(2);//儿童 |
| 526 | 528 | obj.setCreateTime(new Date()); |
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyEarFacade.java
View file @
510d966
| ... | ... | @@ -173,8 +173,125 @@ |
| 173 | 173 | // childrenRecordService.addChildrenRecord(childrenRecord); |
| 174 | 174 | }*/ |
| 175 | 175 | |
| 176 | + /** | |
| 177 | + * 显示儿童隐藏建档 | |
| 178 | + * | |
| 179 | + * @param babyId 儿童档案Id | |
| 180 | + * @return 操作是否成功 | |
| 181 | + */ | |
| 182 | + public boolean showBabyEar(String babyId) { | |
| 183 | + if (StringUtils.isEmpty(babyId)) { | |
| 184 | + return false; | |
| 185 | + } | |
| 186 | + BabyModel babyModel = babyService.getOneBabyById(babyId); | |
| 176 | 187 | |
| 188 | + //建立儿童隐藏档案 | |
| 189 | + if (babyModel != null) { | |
| 190 | + if(babyModel.getYn()!=YnEnums.YES.getId()){ | |
| 191 | + babyModel.setYn(YnEnums.YES.getId()); | |
| 192 | + babyModel.setModified(new Date()); | |
| 193 | + babyService.updateOneBaby(babyModel, babyId); | |
| 194 | + } | |
| 195 | + } | |
| 196 | + | |
| 197 | + BabyPatientExtendEarQuery earQuery = new BabyPatientExtendEarQuery(); | |
| 198 | + earQuery.setBabyPatientId(babyId); | |
| 199 | + | |
| 200 | + List<BabyPatientExtendEar> ears = babyPatientExtendEarService.queryBabyPatientExtendEar(earQuery); | |
| 201 | + if (CollectionUtils.isNotEmpty(ears)) { | |
| 202 | + BabyPatientExtendEar ear = ears.get(0); | |
| 203 | + if(ear.getStatus()!=YnEnums.YES.getId()){ | |
| 204 | + ear.setStatus(YnEnums.YES.getId()); | |
| 205 | + babyPatientExtendEarService.updateBabyPatientExtendEar(ear); | |
| 206 | + } | |
| 207 | + } | |
| 208 | + return true; | |
| 209 | + } | |
| 210 | + | |
| 177 | 211 | /** |
| 212 | + * 增加儿童隐藏建档 | |
| 213 | + * | |
| 214 | + * @param babyId 儿童档案Id | |
| 215 | + * @param hospitalId 医院Id | |
| 216 | + * @return 操作是否成功 | |
| 217 | + */ | |
| 218 | + public boolean addhideBabyEar(String babyId, String hospitalId) { | |
| 219 | + | |
| 220 | + BabyModel babyModel = babyService.getOneBabyById(babyId); | |
| 221 | + | |
| 222 | + //隐藏档案儿童Id | |
| 223 | + String newBabyId = ""; | |
| 224 | + //建立儿童隐藏档案 | |
| 225 | + if (babyModel != null) { | |
| 226 | + //如果相同,不建立 | |
| 227 | + if (!babyModel.getHospitalId().equals(hospitalId)) { | |
| 228 | + babyModel.setHospitalId(hospitalId); | |
| 229 | + babyModel.setYn(YnEnums.NO.getId()); | |
| 230 | + babyModel.setCreated(new Date()); | |
| 231 | + newBabyId = babyService.addOneBaby(babyModel).getId(); | |
| 232 | + } else { | |
| 233 | + newBabyId = babyModel.getId(); | |
| 234 | + } | |
| 235 | + } | |
| 236 | + | |
| 237 | + BabyPatientExtendEarQuery earQuery = new BabyPatientExtendEarQuery(); | |
| 238 | + earQuery.setBabyPatientId(babyId); | |
| 239 | + | |
| 240 | + List<BabyPatientExtendEar> ears = babyPatientExtendEarService.queryBabyPatientExtendEar(earQuery); | |
| 241 | + if (CollectionUtils.isNotEmpty(ears)) { | |
| 242 | + BabyPatientExtendEar ear = ears.get(0); | |
| 243 | + //如果相同,则已经存在,不处理 | |
| 244 | + if (!newBabyId.equals(babyId)) { | |
| 245 | + ear.setId(UUID.randomUUID().toString().replace("-", "")); | |
| 246 | + ear.setBabyPatientId(newBabyId); | |
| 247 | + ear.setStatus(YnEnums.NO.getId()); | |
| 248 | + babyPatientExtendEarService.addBabyPatientExtendEar(ear); | |
| 249 | + | |
| 250 | + //儿童基本信息 | |
| 251 | + BabyPatientExtendEarBirthQuery earBirthQuery = new BabyPatientExtendEarBirthQuery(); | |
| 252 | + earBirthQuery.setBabyPatientId(babyId); | |
| 253 | + | |
| 254 | + List<BabyPatientExtendEarBirth> earBirths = babyPatientExtendEarBirthService.queryBabyPatientExtendEarBirth(earBirthQuery); | |
| 255 | + if (CollectionUtils.isNotEmpty(earBirths)) { | |
| 256 | + BabyPatientExtendEarBirth earBirth = earBirths.get(0); | |
| 257 | + earBirth.setId(UUID.randomUUID().toString().replace("-", "")); | |
| 258 | + earBirth.setBabyPatientId(newBabyId); | |
| 259 | + earBirth.setBabyEarId(ear.getId()); | |
| 260 | + babyPatientExtendEarBirthService.addBabyPatientExtendEarBirth(earBirth); | |
| 261 | + } | |
| 262 | + | |
| 263 | + //儿童家庭信息 | |
| 264 | + BabyPatientExtendEarFamilyQuery familyQuery = new BabyPatientExtendEarFamilyQuery(); | |
| 265 | + familyQuery.setBabyPatientId(babyId); | |
| 266 | + | |
| 267 | + List<BabyPatientExtendEarFamily> families = babyPatientExtendEarFamilyService.queryBabyPatientExtendEarFamily(familyQuery); | |
| 268 | + if (CollectionUtils.isNotEmpty(families)) { | |
| 269 | + BabyPatientExtendEarFamily family = families.get(0); | |
| 270 | + family.setId(UUID.randomUUID().toString().replace("-", "")); | |
| 271 | + family.setBabyPatientId(newBabyId); | |
| 272 | + family.setBabyEarId(ear.getId()); | |
| 273 | + babyPatientExtendEarFamilyService.addBabyPatientExtendEarFamily(family); | |
| 274 | + } | |
| 275 | + | |
| 276 | + //儿童家庭信息 | |
| 277 | + BabyPatientExtendEarMotherQuery motherQuery = new BabyPatientExtendEarMotherQuery(); | |
| 278 | + motherQuery.setBabyPatientId(babyId); | |
| 279 | + | |
| 280 | + List<BabyPatientExtendEarMother> mothers = babyPatientExtendEarMotherService.queryBabyPatientExtendEarMother(motherQuery); | |
| 281 | + if (CollectionUtils.isNotEmpty(mothers)) { | |
| 282 | + BabyPatientExtendEarMother mother = mothers.get(0); | |
| 283 | + mother.setId(UUID.randomUUID().toString().replace("-", "")); | |
| 284 | + mother.setBabyPatientId(newBabyId); | |
| 285 | + mother.setBabyEarId(ear.getId()); | |
| 286 | + babyPatientExtendEarMotherService.addBabyPatientExtendEarMother(mother); | |
| 287 | + } | |
| 288 | + } | |
| 289 | + } | |
| 290 | + return true; | |
| 291 | + } | |
| 292 | + | |
| 293 | + | |
| 294 | + /** | |
| 178 | 295 | * 增加儿童建档 |
| 179 | 296 | * |
| 180 | 297 | * @param babyEarAddRequest 增加听筛请求 |
| 181 | 298 | |
| 182 | 299 | |
| 183 | 300 | |
| 184 | 301 | |
| 185 | 302 | |
| ... | ... | @@ -1079,26 +1196,26 @@ |
| 1079 | 1196 | * @return |
| 1080 | 1197 | */ |
| 1081 | 1198 | public BaseResponse deleteBabyEar(String babyEarId) { |
| 1082 | - if(StringUtils.isNotEmpty(babyEarId)){ | |
| 1199 | + if (StringUtils.isEmpty(babyEarId)) { | |
| 1083 | 1200 | return new BaseResponse().setErrormsg("请传入请求参数").setErrorcode(ErrorCodeConstants.SUCCESS); |
| 1084 | 1201 | } |
| 1085 | 1202 | |
| 1086 | 1203 | BabyPatientExtendEar babyPatientExtendEar = babyPatientExtendEarService.getBabyPatientExtendEar(babyEarId); |
| 1087 | - if(babyPatientExtendEar!=null){ | |
| 1204 | + if (babyPatientExtendEar != null) { | |
| 1088 | 1205 | BabyModel babyModels = babyService.getOneBabyById(babyPatientExtendEar.getBabyPatientId()); |
| 1089 | - if(babyModels!=null){ | |
| 1206 | + if (babyModels != null) { | |
| 1090 | 1207 | babyModels.setYn(YnEnums.NO.getId()); |
| 1091 | 1208 | babyModels.setModified(new Date()); |
| 1092 | - babyService.updateOneBaby(babyModels,babyPatientExtendEar.getBabyPatientId()); | |
| 1209 | + babyService.updateOneBaby(babyModels, babyPatientExtendEar.getBabyPatientId()); | |
| 1093 | 1210 | } |
| 1094 | 1211 | PersonModelQuery personModelQuery = new PersonModelQuery(); |
| 1095 | 1212 | personModelQuery.setId(babyPatientExtendEar.getPersonId()); |
| 1096 | 1213 | List<PersonModel> personModels = personService.queryPersons(personModelQuery); |
| 1097 | - if(CollectionUtils.isNotEmpty(personModels)){ | |
| 1214 | + if (CollectionUtils.isNotEmpty(personModels)) { | |
| 1098 | 1215 | PersonModel personModel = personModels.get(0); |
| 1099 | 1216 | personModel.setModified(new Date()); |
| 1100 | 1217 | personModel.setYn(YnEnums.NO.getId()); |
| 1101 | - personService.updatePerson(personModel,babyPatientExtendEar.getPersonId()); | |
| 1218 | + personService.updatePerson(personModel, babyPatientExtendEar.getPersonId()); | |
| 1102 | 1219 | } |
| 1103 | 1220 | |
| 1104 | 1221 | babyPatientExtendEar.setStatus(YnEnums.NO.getId()); |