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