diff --git a/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/dal/IReferralApplyOrderDao.java b/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/dal/IReferralApplyOrderDao.java index 8b0e7b6..c524c52 100644 --- a/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/dal/IReferralApplyOrderDao.java +++ b/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/dal/IReferralApplyOrderDao.java @@ -31,7 +31,7 @@ public interface IReferralApplyOrderDao { * * @return */ - ReferralApplyOrderModel findById(String id); + ReferralApplyOrderModel findOneReferral(String id); Integer count(MongoQuery mongoQuery); diff --git a/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/dal/impl/ReferralApplyOrderDaoImpl.java b/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/dal/impl/ReferralApplyOrderDaoImpl.java index e18b364..8e8a130 100644 --- a/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/dal/impl/ReferralApplyOrderDaoImpl.java +++ b/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/dal/impl/ReferralApplyOrderDaoImpl.java @@ -30,7 +30,7 @@ public class ReferralApplyOrderDaoImpl extends BaseMongoDAOImpl rlevel=Collections.emptyList(); - if(StringUtils.isNotEmpty(patients.getRiskLevelId())&&!"[]".equals(patients.getRiskLevelId())){ - rlevel= JsonUtil.jkstr2Obj(patients.getRiskLevelId(), List.class); - com.lyms.platform.operate.web.utils.CollectionUtils.removeDuplicate(rlevel,true); + List rlevel = Collections.emptyList(); + if (StringUtils.isNotEmpty(patients.getRiskLevelId()) && !"[]".equals(patients.getRiskLevelId())) { + rlevel = JsonUtil.jkstr2Obj(patients.getRiskLevelId(), List.class); + com.lyms.platform.operate.web.utils.CollectionUtils.removeDuplicate(rlevel, true); } referralApplyOrderModel.setrLevel(rlevel); - referralApplyOrderModel.setScore(patients.getRiskScore()); + referralApplyOrderModel.setScore(patients.getRiskScore()); /* List lsit = new ArrayList(); List list = highScoreResult.filter(highScoreResult.getLevel()); for (Map map : list) { @@ -318,7 +333,7 @@ public class ApplyOrderFacade { */ public BaseResponse addOneSieveApplyOrder(SieveApplyOrderAddRequest sieveApplyOrderAddRequest, Integer userId) { SieveApplyOrderModel sieveApplyOrderModel = sieveApplyOrderAddRequest.convertToDataModel(); - String hospitalId = autoMatchFacade.getHospitalId(userId); + String hospitalId = autoMatchFacade.getHospitalId(userId); //表示区域的 if (StringUtils.isNotEmpty(groupsFacade.findByCurrentUserId(hospitalId))) { @@ -411,7 +426,7 @@ public class ApplyOrderFacade { sieveService.updateOneChanQianDiaSieve(sieveModel); operateLogFacade.addModifyOptLog(userId, Integer.parseInt(hospitalId), sieveModels.get(0), sieveModel, OptActionEnums.UPDATE.getId(), "增加产前筛查"); } - }else{ + } else { System.out.println("已经有产筛申请单了"); } return new BaseResponse().setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("成功");