diff --git a/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/FeedbackService.java b/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/FeedbackService.java index 7279d7e..f941ef5 100644 --- a/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/FeedbackService.java +++ b/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/FeedbackService.java @@ -29,6 +29,7 @@ public class FeedbackService { msgQuery.mysqlBuild(feedbackDao.queryListCount(msgQuery.convertToQuery())); query.start(msgQuery.getOffset()).end(msgQuery.getLimit()); } + //System.out.println(query.convertToMongoQuery().toString()); return feedbackDao.queryList(query.addOrder(Sort.Direction.DESC, "id")); } diff --git a/platform-biz-service/src/main/java/com/lyms/platform/permission/service/impl/LisServiceImpl.java b/platform-biz-service/src/main/java/com/lyms/platform/permission/service/impl/LisServiceImpl.java index 55111b4..3940ef7 100644 --- a/platform-biz-service/src/main/java/com/lyms/platform/permission/service/impl/LisServiceImpl.java +++ b/platform-biz-service/src/main/java/com/lyms/platform/permission/service/impl/LisServiceImpl.java @@ -427,6 +427,9 @@ public class LisServiceImpl implements LisService { patients.setTp(params.get("TP-抗体")); } if (p){ + /* if (StringUtils.isNotEmpty(applyDoctor)&&canConvertToInt(applyDoctor)){ + patients.setLastCheckEmployeeId(applyDoctor); + }*/ patientsService.updatePatientOne(patients,patients.getId()); } } else { @@ -556,6 +559,9 @@ public class LisServiceImpl implements LisService { patients.setTp(params.get("TP-抗体")); } if (p){ + /* if (StringUtils.isNotEmpty(applyDoctor)&&canConvertToInt(applyDoctor)){ + patients.setLastCheckEmployeeId(applyDoctor); + }*/ patientsService.updatePatientOne(patients,patients.getId()); } @@ -565,7 +571,17 @@ public class LisServiceImpl implements LisService { } } - + public static boolean canConvertToInt(String str) { + if (str == null || str.isEmpty()) { + return false; // 空字符串或null不能转换 + } + try { + Integer.parseInt(str); + return true; // 转换成功 + } catch (NumberFormatException e) { + return false; // 转换失败，抛出异常 + } + } @Autowired private AntenatalExaminationService antenatalExaminationService; @@ -576,6 +592,19 @@ public class LisServiceImpl implements LisService { public void addAntenatalExamination(AntenatalExaminationModel antenatalExaminationModel, AntExChuModel antExChuModel, Patients patients,String applyDoctor) { if (antenatalExaminationModel.getId() != null) { + if (StringUtils.isEmpty(applyDoctor)){ + UsersQuery usersQuery=new UsersQuery(); + usersQuery.setYn(1); + usersQuery.setName(applyDoctor); + List usersList= usersService.queryUsers(usersQuery); + if (CollectionUtils.isNotEmpty(usersList)){ + applyDoctor=String.valueOf(usersList.get(0).getId()); + antenatalExaminationModel.setCheckDoctor(applyDoctor); + }else { + applyDoctor=String.valueOf(antExChuModel.getProdDoctor()); + antenatalExaminationModel.setCheckDoctor(applyDoctor); + } + } antenatalExaminationModel.setCheckDate(new Date()); antenatalExaminationService.updateOneAnt(antenatalExaminationModel, antenatalExaminationModel.getId()); } else { diff --git a/platform-dal/src/main/java/com/lyms/platform/query/FeedbackQuery.java b/platform-dal/src/main/java/com/lyms/platform/query/FeedbackQuery.java index beee319..e7e0256 100644 --- a/platform-dal/src/main/java/com/lyms/platform/query/FeedbackQuery.java +++ b/platform-dal/src/main/java/com/lyms/platform/query/FeedbackQuery.java @@ -121,10 +121,10 @@ public class FeedbackQuery extends BaseQuery implements IConvertToNativeQuery { if (type!=null){ condition = condition.and("type", type, MongoOper.IS); } - if (publishId!=null){ + if (StringUtils.isNotEmpty(publishId)){ condition = condition.and("publishId", publishId, MongoOper.IS); } - if (publishName!=null){ + if (StringUtils.isNotEmpty(publishName)){ condition = condition.and("publishName", publishName, MongoOper.IS); } Criteria c1 = null; diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/FeedbackFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/FeedbackFacade.java index 17bb8bf..595949d 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/FeedbackFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/FeedbackFacade.java @@ -57,6 +57,7 @@ public class FeedbackFacade { feedbackQuery.setPage(page); feedbackQuery.setLimit(limit); feedbackQuery.setPublishId(babyId); + feedbackQuery.setYn(1); List list= feedbackService.queryList(feedbackQuery); BaseListResponse objectResponse = new BaseListResponse(); objectResponse.setData(list); diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ViewFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ViewFacade.java index 387ece0..7e815a5 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ViewFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ViewFacade.java @@ -3133,7 +3133,17 @@ public class ViewFacade { } return ""; } - + public static boolean canConvertToInt(String str) { + if (str == null || str.isEmpty()) { + return false; // 空字符串或null不能转换 + } + try { + Integer.parseInt(str); + return true; // 转换成功 + } catch (NumberFormatException e) { + return false; // 转换失败，抛出异常 + } + } /** * 复诊查询 * @@ -3293,18 +3303,22 @@ public class ViewFacade { String teamName=""; if (org.apache.commons.lang.StringUtils.isNotEmpty(data.getCheckDoctor())) { - Users users = usersService.getUsers(Integer.parseInt(data.getCheckDoctor())); - if (users != null && users.getYn() == YnEnums.YES.getId()) { - checkDoctor = users.getName(); - } - //医生所在团队 - if(StringUtils.isNotEmpty(data.getTeamId())){ - DoctorTeam doctorTeam=new DoctorTeam(); - doctorTeam.setId(Integer.parseInt(data.getTeamId())); - FrontEndResult frontEndResult=teamService.queryListDoctorTeam(doctorTeam); - if(null!=frontEndResult.getData()){ - teamName=((DoctorTeam)(frontEndResult.getData().get(0))).getTeamName(); + boolean b=canConvertToInt(data.getCheckDoctor()); + if (b){ + Users users = usersService.getUsers(Integer.parseInt(data.getCheckDoctor())); + if (users != null && users.getYn() == YnEnums.YES.getId()) { + checkDoctor = users.getName(); + } + + //医生所在团队 + if(StringUtils.isNotEmpty(data.getTeamId())){ + DoctorTeam doctorTeam=new DoctorTeam(); + doctorTeam.setId(Integer.parseInt(data.getTeamId())); + FrontEndResult frontEndResult=teamService.queryListDoctorTeam(doctorTeam); + if(null!=frontEndResult.getData()){ + teamName=((DoctorTeam)(frontEndResult.getData().get(0))).getTeamName(); + } } } }