diff --git a/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/dal/IPatientDao.java b/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/dal/IPatientDao.java index 2b0cebe..79210c8 100644 --- a/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/dal/IPatientDao.java +++ b/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/dal/IPatientDao.java @@ -46,4 +46,8 @@ public interface IPatientDao { public void updatePatientHusbandBirth(String id, Object colValue); List queryPatientAnxtchuCount(MongoQuery query); + + Patients findOnePatientByFileDoc(String fileCode); + + Patients findOnePatientByHighRiskDocNo(String id); } diff --git a/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/dal/impl/PatientDaoImpl.java b/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/dal/impl/PatientDaoImpl.java index ea018f6..227f2b9 100644 --- a/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/dal/impl/PatientDaoImpl.java +++ b/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/dal/impl/PatientDaoImpl.java @@ -62,6 +62,24 @@ public class PatientDaoImpl extends BaseMongoDAOImpl implements IPatie } @Override + public Patients findOnePatientByFileDoc(String fileCode) { + //根据档案号查询患者 + Query query = new Query(); + query.addCriteria(Criteria.where("fileCode").is(fileCode)); + Patients patients = findOne(query); + return patients; + } + + @Override + public Patients findOnePatientByHighRiskDocNo(String highRiskDocNo) { + //根据档高危案号查询患者 + Query query = new Query(); + query.addCriteria(Criteria.where("highRiskDocNo").is(highRiskDocNo)); + Patients patients = findOne(query); + return patients; + } + + @Override public void updatePatientLastCheckEmployeeIdOne(String id, String lastCheckEmployeeId){ this.mongoTemplate.updateFirst(new Query(Criteria.where("id").is(id)), Update.update("lastCheckEmployeeId", lastCheckEmployeeId), Patients.class); } diff --git a/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/PatientsService.java b/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/PatientsService.java index df03a95..892c900 100644 --- a/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/PatientsService.java +++ b/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/PatientsService.java @@ -1076,6 +1076,24 @@ public class PatientsService { return iPatientDao.predictedStatistics(); } + /** + * 根据档案号进行查询patients信息 + * @param fileCode + * @return + */ + public Patients findOnePatientByFileDoc(String fileCode) { + return iPatientDao.findOnePatientByFileDoc(fileCode); + } + + /** + * 根据高危档案号进行查询patients信息 + * @param highRiskFileCode + * @return + */ + public Patients findOnePatientByHighRiskDocNo(String highRiskFileCode) { + return iPatientDao.findOnePatientByHighRiskDocNo(highRiskFileCode); + } + private class PatientWorker extends Thread { private List patientses; diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/ViewController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/ViewController.java index f232805..e887760 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/ViewController.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/ViewController.java @@ -87,17 +87,17 @@ public class ViewController extends BaseController { @ResponseBody - @RequestMapping(value = "checkHighRiskDocNo", method = RequestMethod.GET) - public BaseObjectResponse checkHighRiskDocNo(@RequestParam("id") String id) { - BaseObjectResponse br = viewFacade.findHighRiskDocNoIsDuplicate(id); + @RequestMapping(value = "checkDocNoIsReuse", method = RequestMethod.GET) + public BaseObjectResponse checkDocNoIsReuse(@RequestParam("id") String id) { + BaseObjectResponse br = viewFacade.findFileDocIsDuplicate(id); return br; } @ResponseBody - @RequestMapping(value = "checkDocNoIsReuse", method = RequestMethod.GET) - public BaseObjectResponse checkDocNoIsReuse(@RequestParam("id") String id) { - BaseObjectResponse br = viewFacade.findFileDocIsDuplicate(id); + @RequestMapping(value = "checkHighRiskDocNo", method = RequestMethod.GET) + public BaseObjectResponse checkHighRiskDocNo(@RequestParam("id") String id) { + BaseObjectResponse br = viewFacade.findHighRiskDocNoIsDuplicate(id); return br; } 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 d1e7c03..c3de4dc 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 @@ -1784,7 +1784,7 @@ public class ViewFacade { */ public BaseObjectResponse findFileDocIsDuplicate(String id) { BaseObjectResponse br = new BaseObjectResponse(); - Patients data = patientsService.findOnePatientById(id); + Patients data = patientsService.findOnePatientByFileDoc(id); if (data == null || data.getYn() == YnEnums.NO.getId()) { br.setErrorcode(201); br.setErrormsg("该档案号可以使用"); @@ -1804,7 +1804,7 @@ public class ViewFacade { */ public BaseObjectResponse findHighRiskDocNoIsDuplicate(String id) { BaseObjectResponse br = new BaseObjectResponse(); - Patients data = patientsService.findOnePatientById(id); + Patients data = patientsService.findOnePatientByHighRiskDocNo(id); if (data == null || data.getYn() == YnEnums.NO.getId()) { br.setErrorcode(201); br.setErrormsg("该高危档案号可以使用");