diff --git a/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/CommonService.java b/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/CommonService.java index d87ec2b..e29c132 100644 --- a/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/CommonService.java +++ b/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/CommonService.java @@ -159,7 +159,7 @@ public class CommonService { if (null != obj) { BasicConfig basicConfig = basicConfigService.getOneBasicConfigById(obj.toString()); if (null != basicConfig) { - if (null != basicConfig.getCode()) { + if (StringUtils.isNotEmpty(basicConfig.getCode()) && StringUtils.isNumeric(basicConfig.getCode())) { score += Integer.valueOf(basicConfig.getCode()); } basicConfig = basicConfigService.getOneBasicConfigById(basicConfig.getParentId()); diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ApplyOrderFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ApplyOrderFacade.java index 608e777..7ff02c0 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ApplyOrderFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ApplyOrderFacade.java @@ -389,10 +389,7 @@ public class ApplyOrderFacade { public BaseResponse addOneSieveApplyOrder(SieveApplyOrderAddRequest sieveApplyOrderAddRequest, Integer userId) { SieveApplyOrderModel sieveApplyOrderModel = sieveApplyOrderAddRequest.convertToDataModel(); - boolean existTwo = exists(sieveApplyOrderModel); - if (existTwo) { - return new BaseResponse().setErrorcode(ErrorCodeConstants.PARAMETER_ERROR).setErrormsg("标本号重复"); - } + //修改 if (StringUtils.isNotEmpty(sieveApplyOrderAddRequest.getId())) { @@ -416,6 +413,11 @@ public class ApplyOrderFacade { return new BaseResponse().setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("修改成功"); } + boolean existTwo = exists(sieveApplyOrderModel); + if (existTwo) { + return new BaseResponse().setErrorcode(ErrorCodeConstants.PARAMETER_ERROR).setErrormsg("标本号重复"); + } + String hospitalId = autoMatchFacade.getHospitalId(userId); //表示区域的