Commit 620474c3c61db523d446340fb794372c0b0bc0c8
1 parent
bc2574921e
Exists in
dev
12:判断建当时，档案号是否重复
Showing 1 changed file with 5 additions and 6 deletions
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BookbuildingFacade.java
View file @
620474c
| ... | ... | @@ -298,14 +298,9 @@ |
| 298 | 298 | List<Patients> patients = yunBookbuildingService.queryPregnantWithQuery(patientsQuery); |
| 299 | 299 | if(CollectionUtils.isNotEmpty(patients) && patients.get(0).getHighRiskFileCode()!=null){ |
| 300 | 300 | br.setErrorcode(ErrorCodeConstants.DATA_EXIST); |
| 301 | - br.setErrormsg("该高危专案档案号已存在"); | |
| 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 | - }*/ | |
| 309 | 304 | if (yunRequest.getLastMenstrualPeriod() != null && !yunRequest.getLastMenstrualPeriod().equals("")) {//todowtt |
| 310 | 305 | if (CollectionUtils.isNotEmpty(patients) && patients.get(0).getLastMenses().getTime() < DateUtil.parseYMD(yunRequest.getLastMenstrualPeriod()).getTime()) { |
| 311 | 306 | br.setErrorcode(ErrorCodeConstants.DATA_EXIST); |
| ... | ... | @@ -332,6 +327,10 @@ |
| 332 | 327 | return br; |
| 333 | 328 | } |
| 334 | 329 | |
| 330 | + }else{ | |
| 331 | + System.out.println("检查档案号完毕为空"); | |
| 332 | + System.out.println("检查档案号完毕为空"); | |
| 333 | + System.out.println("检查档案号完毕为空"); | |
| 335 | 334 | } |
| 336 | 335 | //就诊卡号判断 |
| 337 | 336 | // if (StringUtils.isNotEmpty(yunRequest.getVcCardNo())) { |