Commit 3d1bc1bdb846fd50e776cd3ce1da17315b8ce910
1 parent
93cfd9e08c
Exists in
master
and in
6 other branches
update
Showing 1 changed file with 30 additions and 30 deletions
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BookbuildingFacade.java
View file @
3d1bc1b
| ... | ... | @@ -265,20 +265,20 @@ |
| 265 | 265 | } |
| 266 | 266 | |
| 267 | 267 | //就诊卡号判断 |
| 268 | - if (StringUtils.isNotEmpty(yunRequest.getVcCardNo())) { | |
| 269 | - patientsQuery.setCardNo(null); | |
| 270 | - patientsQuery.setPhone(null); | |
| 271 | - patientsQuery.setVcCardNo(yunRequest.getVcCardNo()); | |
| 272 | - patientsQuery.setHospitalId(yunRequest.getHospitalId()); | |
| 273 | - List<Patients> patients = yunBookbuildingService.queryPregnantWithQuery(patientsQuery); | |
| 274 | - if (yunRequest.getLastMenstrualPeriod() != null && !yunRequest.getLastMenstrualPeriod().equals("")) {//todowtt | |
| 275 | - if (CollectionUtils.isNotEmpty(patients) && patients.get(0).getLastMenses().getTime() < DateUtil.parseYMD(yunRequest.getLastMenstrualPeriod()).getTime()) { | |
| 276 | - br.setErrorcode(ErrorCodeConstants.DATA_EXIST); | |
| 277 | - br.setErrormsg("该就诊卡号在该医院已经建档"); | |
| 278 | - return br; | |
| 279 | - } | |
| 280 | - } | |
| 281 | - } | |
| 268 | +// if (StringUtils.isNotEmpty(yunRequest.getVcCardNo())) { | |
| 269 | +// patientsQuery.setCardNo(null); | |
| 270 | +// patientsQuery.setPhone(null); | |
| 271 | +// patientsQuery.setVcCardNo(yunRequest.getVcCardNo()); | |
| 272 | +// patientsQuery.setHospitalId(yunRequest.getHospitalId()); | |
| 273 | +// List<Patients> patients = yunBookbuildingService.queryPregnantWithQuery(patientsQuery); | |
| 274 | +// if (yunRequest.getLastMenstrualPeriod() != null && !yunRequest.getLastMenstrualPeriod().equals("")) {//todowtt | |
| 275 | +// if (CollectionUtils.isNotEmpty(patients) && patients.get(0).getLastMenses().getTime() < DateUtil.parseYMD(yunRequest.getLastMenstrualPeriod()).getTime()) { | |
| 276 | +// br.setErrorcode(ErrorCodeConstants.DATA_EXIST); | |
| 277 | +// br.setErrormsg("该就诊卡号在该医院已经建档"); | |
| 278 | +// return br; | |
| 279 | +// } | |
| 280 | +// } | |
| 281 | +// } | |
| 282 | 282 | |
| 283 | 283 | Integer type = 1; //1孕妇 2儿童 3产妇 |
| 284 | 284 | //建档类型 0 未分娩建档 1儿童建档时建档 2 自动分娩类型 3 转诊自动建档 |
| ... | ... | @@ -1154,22 +1154,22 @@ |
| 1154 | 1154 | } |
| 1155 | 1155 | } |
| 1156 | 1156 | |
| 1157 | - if (pat != null && StringUtils.isNotEmpty(pat.getVcCardNo()) && !pat.getVcCardNo().equals(yunRequest.getVcCardNo())) { | |
| 1158 | - | |
| 1159 | - //就诊卡号判断 | |
| 1160 | - if (StringUtils.isNotEmpty(yunRequest.getVcCardNo())) { | |
| 1161 | - patientsQuery.setCardNo(null); | |
| 1162 | - patientsQuery.setPhone(null); | |
| 1163 | - patientsQuery.setVcCardNo(yunRequest.getVcCardNo()); | |
| 1164 | - patientsQuery.setHospitalId(yunRequest.getHospitalId()); | |
| 1165 | - patients = yunBookbuildingService.queryPregnantWithQuery(patientsQuery); | |
| 1166 | - if (CollectionUtils.isNotEmpty(patients)) { | |
| 1167 | - br.setErrorcode(ErrorCodeConstants.DATA_EXIST); | |
| 1168 | - br.setErrormsg("该就诊卡号在该医院已经建档"); | |
| 1169 | - return br; | |
| 1170 | - } | |
| 1171 | - } | |
| 1172 | - } | |
| 1157 | +// if (pat != null && StringUtils.isNotEmpty(pat.getVcCardNo()) && !pat.getVcCardNo().equals(yunRequest.getVcCardNo())) { | |
| 1158 | +// | |
| 1159 | +// //就诊卡号判断 | |
| 1160 | +// if (StringUtils.isNotEmpty(yunRequest.getVcCardNo())) { | |
| 1161 | +// patientsQuery.setCardNo(null); | |
| 1162 | +// patientsQuery.setPhone(null); | |
| 1163 | +// patientsQuery.setVcCardNo(yunRequest.getVcCardNo()); | |
| 1164 | +// patientsQuery.setHospitalId(yunRequest.getHospitalId()); | |
| 1165 | +// patients = yunBookbuildingService.queryPregnantWithQuery(patientsQuery); | |
| 1166 | +// if (CollectionUtils.isNotEmpty(patients)) { | |
| 1167 | +// br.setErrorcode(ErrorCodeConstants.DATA_EXIST); | |
| 1168 | +// br.setErrormsg("该就诊卡号在该医院已经建档"); | |
| 1169 | +// return br; | |
| 1170 | +// } | |
| 1171 | +// } | |
| 1172 | +// } | |
| 1173 | 1173 | } |
| 1174 | 1174 | } |
| 1175 | 1175 |