Commit 1774e42a495f8538b0489c7830f15d910416fa81
1 parent
fef9548d98
Exists in
master
and in
7 other branches
修改产检删除
Showing 1 changed file with 50 additions and 56 deletions
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/StopPregnancyFacade.java
View file @
1774e42
| ... | ... | @@ -53,9 +53,12 @@ |
| 53 | 53 | private AutoMatchFacade autoMatchFacade; |
| 54 | 54 | @Autowired |
| 55 | 55 | private MatDeliverService matDeliverService; |
| 56 | + @Autowired | |
| 57 | + private OrganizationGroupsFacade groupsFacade; | |
| 56 | 58 | |
| 57 | 59 | /** |
| 58 | 60 | * 更新终止妊娠 |
| 61 | + * | |
| 59 | 62 | * @param request |
| 60 | 63 | * @return |
| 61 | 64 | */ |
| ... | ... | @@ -76,7 +79,7 @@ |
| 76 | 79 | matDeliverQuery.setPid(request.getPid()); |
| 77 | 80 | matDeliverQuery.setYn(YnEnums.YES.getId()); |
| 78 | 81 | matDeliverQuery.setDueDate(request.getStopDate()); |
| 79 | - List<MaternalDeliverModel> list2 = matDeliverService.query(matDeliverQuery); | |
| 82 | + List<MaternalDeliverModel> list2 = matDeliverService.query(matDeliverQuery); | |
| 80 | 83 | |
| 81 | 84 | StopPregQuery stopPregQuery = new StopPregQuery(); |
| 82 | 85 | stopPregQuery.setYn(YnEnums.YES.getId()); |
| ... | ... | @@ -88,7 +91,7 @@ |
| 88 | 91 | return new BaseResponse().setErrorcode(ErrorCodeConstants.DATA_EXIST).setErrormsg("同一天只能建一次分娩/终止妊娠"); |
| 89 | 92 | } |
| 90 | 93 | |
| 91 | - List<Patients> patients = yunBookbuildingService.queryPregnantWithQuery(patientsQuery); | |
| 94 | + List<Patients> patients = yunBookbuildingService.queryPregnantWithQuery(patientsQuery); | |
| 92 | 95 | if (CollectionUtils.isNotEmpty(patients)) { |
| 93 | 96 | |
| 94 | 97 | for (Patients patient : patients) { |
| 95 | 98 | |
| ... | ... | @@ -108,10 +111,11 @@ |
| 108 | 111 | |
| 109 | 112 | /** |
| 110 | 113 | * 添加终止妊娠 |
| 114 | + * | |
| 111 | 115 | * @param request |
| 112 | 116 | * @return |
| 113 | 117 | */ |
| 114 | - public BaseResponse addStopPreg(StopPregRequest request,Integer userId) { | |
| 118 | + public BaseResponse addStopPreg(StopPregRequest request, Integer userId) { | |
| 115 | 119 | |
| 116 | 120 | // String hospitalId = ""; |
| 117 | 121 | // //得到当前登录的医院id |
| 118 | 122 | |
| ... | ... | @@ -130,16 +134,15 @@ |
| 130 | 134 | patientsQuery.setPid(request.getPid()); |
| 131 | 135 | |
| 132 | 136 | Patients pat = null; |
| 133 | - List<Patients> patients = yunBookbuildingService.queryPregnantWithQuery(patientsQuery); | |
| 134 | - if (CollectionUtils.isNotEmpty(patients)) | |
| 135 | - { | |
| 137 | + List<Patients> patients = yunBookbuildingService.queryPregnantWithQuery(patientsQuery); | |
| 138 | + if (CollectionUtils.isNotEmpty(patients)) { | |
| 136 | 139 | |
| 137 | 140 | MatDeliverQuery matDeliverQuery = new MatDeliverQuery(); |
| 138 | 141 | |
| 139 | 142 | matDeliverQuery.setPid(request.getPid()); |
| 140 | 143 | matDeliverQuery.setYn(YnEnums.YES.getId()); |
| 141 | 144 | matDeliverQuery.setDueDate(request.getStopDate()); |
| 142 | - List<MaternalDeliverModel> list2 = matDeliverService.query(matDeliverQuery); | |
| 145 | + List<MaternalDeliverModel> list2 = matDeliverService.query(matDeliverQuery); | |
| 143 | 146 | |
| 144 | 147 | StopPregQuery stopPregQuery = new StopPregQuery(); |
| 145 | 148 | stopPregQuery.setYn(YnEnums.YES.getId()); |
| 146 | 149 | |
| 147 | 150 | |
| 148 | 151 | |
| ... | ... | @@ -151,15 +154,17 @@ |
| 151 | 154 | return new BaseResponse().setErrorcode(ErrorCodeConstants.DATA_EXIST).setErrormsg("同一天只能建一次分娩/终止妊娠"); |
| 152 | 155 | } |
| 153 | 156 | |
| 154 | - for (Patients patient : patients) | |
| 155 | - { | |
| 156 | - if (patient != null) | |
| 157 | - { | |
| 158 | 157 | |
| 158 | + String groupId = groupsFacade.findByCurrentUserId(request.getHospitalId()); | |
| 159 | + List<String> hos = groupsFacade.findGroupHospital(userId); | |
| 160 | + String hospital = autoMatchFacade.getHospitalId(userId); | |
| 161 | + for (Patients patient : patients) { | |
| 162 | + if (patient != null) { | |
| 159 | 163 | String hid = patient.getHospitalId(); |
| 160 | - if (StringUtils.isNotEmpty(hid) && hid.equals(request.getHospitalId())) | |
| 161 | - { | |
| 164 | + if (StringUtils.isNotEmpty(groupId) && hos.contains(hospital)) { | |
| 162 | 165 | pat = patient; |
| 166 | + } else if (StringUtils.isNotEmpty(hid) && hid.equals(request.getHospitalId())) { | |
| 167 | + pat = patient; | |
| 163 | 168 | } |
| 164 | 169 | |
| 165 | 170 | patient.setModified(new Date()); |
| 166 | 171 | |
| 167 | 172 | |
| 168 | 173 | |
| ... | ... | @@ -168,19 +173,16 @@ |
| 168 | 173 | |
| 169 | 174 | //更新状态为过期 |
| 170 | 175 | //判断其为增值服务还是 标准服务 |
| 171 | - if (patient.getServiceType() == ServiceTypeEnums.STANDARD_SERVICE.getId()) | |
| 172 | - { | |
| 176 | + if (patient.getServiceType() == ServiceTypeEnums.STANDARD_SERVICE.getId()) { | |
| 173 | 177 | patient.setServiceStatus(ServiceStatusEnums.STANDARD_OVERDUE.getId()); |
| 174 | - } | |
| 175 | - else if (patient.getServiceType() == ServiceTypeEnums.ADD_SERVICE.getId()) | |
| 176 | - { | |
| 178 | + } else if (patient.getServiceType() == ServiceTypeEnums.ADD_SERVICE.getId()) { | |
| 177 | 179 | patient.setServiceStatus(ServiceStatusEnums.ADD_OVERDUE.getId()); |
| 178 | 180 | } |
| 179 | 181 | patient.setFmDate(DateUtil.parseYMD(request.getStopDate())); |
| 180 | 182 | patient.setType(3); |
| 181 | - | |
| 183 | + sieveService.deleteSieve(pat.getId(), hospital, pat.getLastMenses()); | |
| 182 | 184 | //分娩状态 0未终止妊娠 1终止妊娠 |
| 183 | - yunBookbuildingService.updatePregnant(patient,patient.getId()); | |
| 185 | + yunBookbuildingService.updatePregnant(patient, patient.getId()); | |
| 184 | 186 | } |
| 185 | 187 | } |
| 186 | 188 | |
| ... | ... | @@ -192,8 +194,7 @@ |
| 192 | 194 | personService.updatePerson(pmodel, request.getPid()); |
| 193 | 195 | } |
| 194 | 196 | |
| 195 | - if (pat == null) | |
| 196 | - { | |
| 197 | + if (pat == null) { | |
| 197 | 198 | BaseResponse objectResponse = new BaseResponse(); |
| 198 | 199 | objectResponse.setErrorcode(ErrorCodeConstants.PARAMETER_ERROR); |
| 199 | 200 | objectResponse.setErrormsg("数据异常"); |
| ... | ... | @@ -204,8 +205,7 @@ |
| 204 | 205 | model.setPatientId(pat.getId()); |
| 205 | 206 | model.setCreated(new Date()); |
| 206 | 207 | model.setModified(new Date()); |
| 207 | - String hospital=autoMatchFacade.getHospitalId(userId); | |
| 208 | - sieveService.deleteSieve(pat.getId(),hospital,pat.getLastMenses()); | |
| 208 | + | |
| 209 | 209 | stopPregnancyService.addStopPreg(model); |
| 210 | 210 | BaseResponse objectResponse = new BaseResponse(); |
| 211 | 211 | objectResponse.setErrorcode(ErrorCodeConstants.SUCCESS); |
| 212 | 212 | |
| 213 | 213 | |
| ... | ... | @@ -229,19 +229,19 @@ |
| 229 | 229 | |
| 230 | 230 | /** |
| 231 | 231 | * 查询终止妊娠 |
| 232 | + * | |
| 232 | 233 | * @param id |
| 233 | 234 | * @return |
| 234 | 235 | */ |
| 235 | 236 | public BaseResponse queryStopPreg(String id) { |
| 236 | 237 | |
| 237 | 238 | Map map = new HashMap(); |
| 238 | - StopPregQuery query = new StopPregQuery(); | |
| 239 | + StopPregQuery query = new StopPregQuery(); | |
| 239 | 240 | query.setYn(YnEnums.YES.getId()); |
| 240 | 241 | query.setId(id); |
| 241 | 242 | StopPregResult result = null; |
| 242 | - List<StopPregModel> stopPregs = stopPregnancyService.queryStopPreg(query); | |
| 243 | - if (CollectionUtils.isNotEmpty(stopPregs)) | |
| 244 | - { | |
| 243 | + List<StopPregModel> stopPregs = stopPregnancyService.queryStopPreg(query); | |
| 244 | + if (CollectionUtils.isNotEmpty(stopPregs)) { | |
| 245 | 245 | StopPregModel model = stopPregs.get(0); |
| 246 | 246 | result = new StopPregResult(); |
| 247 | 247 | result.setPatientId(model.getPatientId()); |
| 248 | 248 | |
| ... | ... | @@ -252,13 +252,11 @@ |
| 252 | 252 | |
| 253 | 253 | String inperson = model.getInPerson(); |
| 254 | 254 | Map pmap = new HashMap(); |
| 255 | - if (!StringUtils.isEmpty(inperson)) | |
| 256 | - { | |
| 255 | + if (!StringUtils.isEmpty(inperson)) { | |
| 257 | 256 | |
| 258 | 257 | Users users = usersService.getUsers(Integer.parseInt(inperson)); |
| 259 | - if (users != null) | |
| 260 | - { | |
| 261 | - pmap.put("id",inperson); | |
| 258 | + if (users != null) { | |
| 259 | + pmap.put("id", inperson); | |
| 262 | 260 | pmap.put("name", users.getName()); |
| 263 | 261 | } |
| 264 | 262 | result.setInPerson(pmap); |
| 265 | 263 | |
| 266 | 264 | |
| ... | ... | @@ -268,18 +266,17 @@ |
| 268 | 266 | |
| 269 | 267 | //查询孕妇的基本信息 |
| 270 | 268 | AntexListResult antexListResult = null; |
| 271 | - if(!StringUtils.isEmpty(result.getPatientId())) | |
| 272 | - { | |
| 269 | + if (!StringUtils.isEmpty(result.getPatientId())) { | |
| 273 | 270 | Patients patients = null; |
| 274 | 271 | |
| 275 | - PatientsQuery patientsQuery = new PatientsQuery(); | |
| 276 | - patientsQuery.setId(result.getPatientId()); | |
| 277 | - patientsQuery.setYn(YnEnums.YES.getId()); | |
| 272 | + PatientsQuery patientsQuery = new PatientsQuery(); | |
| 273 | + patientsQuery.setId(result.getPatientId()); | |
| 274 | + patientsQuery.setYn(YnEnums.YES.getId()); | |
| 278 | 275 | |
| 279 | - List<Patients> listPatiens = patientsService.queryPatient(patientsQuery); | |
| 280 | - if (CollectionUtils.isNotEmpty(listPatiens)) { | |
| 281 | - patients = listPatiens.get(0); | |
| 282 | - } | |
| 276 | + List<Patients> listPatiens = patientsService.queryPatient(patientsQuery); | |
| 277 | + if (CollectionUtils.isNotEmpty(listPatiens)) { | |
| 278 | + patients = listPatiens.get(0); | |
| 279 | + } | |
| 283 | 280 | |
| 284 | 281 | if (null != patients) { |
| 285 | 282 | antexListResult = new AntexListResult(); |
| ... | ... | @@ -318,7 +315,7 @@ |
| 318 | 315 | map.put("stopPregDate", DateUtil.getyyyy_MM_dd(new Date())); |
| 319 | 316 | |
| 320 | 317 | //孕妇基本信息 |
| 321 | - map.put("patientInfo",antexListResult); | |
| 318 | + map.put("patientInfo", antexListResult); | |
| 322 | 319 | BaseObjectResponse objectResponse = new BaseObjectResponse(); |
| 323 | 320 | objectResponse.setData(map); |
| 324 | 321 | objectResponse.setErrorcode(ErrorCodeConstants.SUCCESS); |
| 325 | 322 | |
| 326 | 323 | |
| ... | ... | @@ -340,20 +337,19 @@ |
| 340 | 337 | |
| 341 | 338 | /** |
| 342 | 339 | * 返回该医院可选择的录入人 |
| 340 | + * | |
| 343 | 341 | * @return |
| 344 | 342 | */ |
| 345 | 343 | public BaseResponse queryInPerson(Integer id) { |
| 346 | 344 | List<Map> list = new ArrayList<>(); |
| 347 | - if (id != null) | |
| 348 | - { | |
| 349 | - UsersQuery query = new UsersQuery(); | |
| 345 | + if (id != null) { | |
| 346 | + UsersQuery query = new UsersQuery(); | |
| 350 | 347 | query.setYn(YnEnums.YES.getId()); |
| 351 | 348 | query.setEnable(1); |
| 352 | 349 | query.setId(id); |
| 353 | 350 | List<Users> dbusers = usersService.queryUsers(query); |
| 354 | 351 | |
| 355 | - if (CollectionUtils.isNotEmpty(dbusers)) | |
| 356 | - { | |
| 352 | + if (CollectionUtils.isNotEmpty(dbusers)) { | |
| 357 | 353 | Users dbuser = dbusers.get(0); |
| 358 | 354 | UsersQuery usersQuery = new UsersQuery(); |
| 359 | 355 | usersQuery.setYn(YnEnums.YES.getId()); |
| 360 | 356 | |
| ... | ... | @@ -365,13 +361,11 @@ |
| 365 | 361 | // } |
| 366 | 362 | List<Users> users = usersService.queryUsers(usersQuery); |
| 367 | 363 | |
| 368 | - if (CollectionUtils.isNotEmpty(users)) | |
| 369 | - { | |
| 370 | - for(Users user : users) | |
| 371 | - { | |
| 364 | + if (CollectionUtils.isNotEmpty(users)) { | |
| 365 | + for (Users user : users) { | |
| 372 | 366 | Map pmap = new HashMap(); |
| 373 | - pmap.put("id",user.getId()); | |
| 374 | - pmap.put("name",user.getName()); | |
| 367 | + pmap.put("id", user.getId()); | |
| 368 | + pmap.put("name", user.getName()); | |
| 375 | 369 | list.add(pmap); |
| 376 | 370 | } |
| 377 | 371 | } |
| ... | ... | @@ -379,8 +373,8 @@ |
| 379 | 373 | |
| 380 | 374 | } |
| 381 | 375 | Map map = new HashMap(); |
| 382 | - map.put("id","a9e5507f-e7da-4ec6-b8db-9a1e4d1b7c29"); | |
| 383 | - map.put("name","产科病房"); | |
| 376 | + map.put("id", "a9e5507f-e7da-4ec6-b8db-9a1e4d1b7c29"); | |
| 377 | + map.put("name", "产科病房"); | |
| 384 | 378 | list.add(map); |
| 385 | 379 | BaseObjectResponse objectResponse = new BaseObjectResponse(); |
| 386 | 380 | objectResponse.setData(list); |