jiangjiazhi / regional-platform

Download as
Browse Code »

Commit b1d49d50125f3c4b809bb0d87a5776da38a0dd4d

Authored by liquanyu
1 parent 864b6d34a1
Exists in master and in 6 other branches autism, dev, fengning, fengning2023-06-06, longhua, luanping

update

Showing 2 changed files with 7 additions and 5 deletions

platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/CommonService.java View file @ b1d49d5
... ... @@ -159,7 +159,7 @@
159 159 if (null != obj) {
160 160 BasicConfig basicConfig = basicConfigService.getOneBasicConfigById(obj.toString());
161 161 if (null != basicConfig) {
162   - if (null != basicConfig.getCode()) {
  162 + if (StringUtils.isNotEmpty(basicConfig.getCode()) && StringUtils.isNumeric(basicConfig.getCode())) {
163 163 score += Integer.valueOf(basicConfig.getCode());
164 164 }
165 165 basicConfig = basicConfigService.getOneBasicConfigById(basicConfig.getParentId());
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ApplyOrderFacade.java View file @ b1d49d5
... ... @@ -389,11 +389,8 @@
389 389 public BaseResponse addOneSieveApplyOrder(SieveApplyOrderAddRequest sieveApplyOrderAddRequest, Integer userId) {
390 390 SieveApplyOrderModel sieveApplyOrderModel = sieveApplyOrderAddRequest.convertToDataModel();
391 391  
392   - boolean existTwo = exists(sieveApplyOrderModel);
393   - if (existTwo) {
394   - return new BaseResponse().setErrorcode(ErrorCodeConstants.PARAMETER_ERROR).setErrormsg("标本号重复");
395   - }
396 392  
  393 +
397 394 //修改
398 395 if (StringUtils.isNotEmpty(sieveApplyOrderAddRequest.getId())) {
399 396 sieveApplyOrderModel.setId(sieveApplyOrderAddRequest.getId());
... ... @@ -414,6 +411,11 @@
414 411 }
415 412  
416 413 return new BaseResponse().setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("修改成功");
  414 + }
  415 +
  416 + boolean existTwo = exists(sieveApplyOrderModel);
  417 + if (existTwo) {
  418 + return new BaseResponse().setErrorcode(ErrorCodeConstants.PARAMETER_ERROR).setErrormsg("标本号重复");
417 419 }
418 420  
419 421 String hospitalId = autoMatchFacade.getHospitalId(userId);