Commit 6c268049940050196833e38399935add1d28ab29
1 parent
d5abb60a8c
Exists in
dev
10:判断建当时,档案号是否重复
Showing 1 changed file with 7 additions and 2 deletions
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BookbuildingFacade.java
View file @
6c26804
... | ... | @@ -301,6 +301,11 @@ |
301 | 301 | br.setErrormsg("该高危专案档案号已存在"); |
302 | 302 | return br; |
303 | 303 | } |
304 | + if(CollectionUtils.isNotEmpty(patients) && patients.get(0).getFileCode()!=null){ | |
305 | + br.setErrorcode(ErrorCodeConstants.DATA_EXIST); | |
306 | + br.setErrormsg("该档案号已存在"); | |
307 | + return br; | |
308 | + } | |
304 | 309 | if (yunRequest.getLastMenstrualPeriod() != null && !yunRequest.getLastMenstrualPeriod().equals("")) {//todowtt |
305 | 310 | if (CollectionUtils.isNotEmpty(patients) && patients.get(0).getLastMenses().getTime() < DateUtil.parseYMD(yunRequest.getLastMenstrualPeriod()).getTime()) { |
306 | 311 | br.setErrorcode(ErrorCodeConstants.DATA_EXIST); |
... | ... | @@ -309,7 +314,7 @@ |
309 | 314 | } |
310 | 315 | } |
311 | 316 | } |
312 | - if (StringUtils.isNotEmpty(yunRequest.getFileCode())) { | |
317 | + /*if (StringUtils.isNotEmpty(yunRequest.getFileCode())) { | |
313 | 318 | patientsQuery.setCardNo(null); |
314 | 319 | patientsQuery.setPhone(null); |
315 | 320 | patientsQuery.setFileCode(yunRequest.getFileCode()); |
... | ... | @@ -321,7 +326,7 @@ |
321 | 326 | return br; |
322 | 327 | } |
323 | 328 | |
324 | - } | |
329 | + }*/ | |
325 | 330 | //就诊卡号判断 |
326 | 331 | // if (StringUtils.isNotEmpty(yunRequest.getVcCardNo())) { |
327 | 332 | // patientsQuery.setCardNo(null); |