From 58b888fc036a23a55b63946ad8b3febab246318a Mon Sep 17 00:00:00 2001 From: liquanyu Date: Thu, 3 Jan 2019 09:54:20 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9C=8D=E5=8A=A1=E7=BB=88=E6=AD=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/lyms/platform/common/utils/DateUtil.java | 4 +-- .../com/lyms/platform/query/MatDeliverQuery.java | 2 ++ .../operate/web/controller/SyncDataController.java | 19 ++++++++++ .../platform/operate/web/facade/LisFacade.java | 11 +++++- .../web/facade/PatientServiceSysFacade.java | 42 ++++++++++++++++++++++ .../strategy/LocalCacheSessionStrategy.java | 2 +- 6 files changed, 76 insertions(+), 4 deletions(-) diff --git a/platform-common/src/main/java/com/lyms/platform/common/utils/DateUtil.java b/platform-common/src/main/java/com/lyms/platform/common/utils/DateUtil.java index e58fbfbfa..08fc7c5 100644 --- a/platform-common/src/main/java/com/lyms/platform/common/utils/DateUtil.java +++ b/platform-common/src/main/java/com/lyms/platform/common/utils/DateUtil.java @@ -1564,8 +1564,8 @@ public class DateUtil { System.out.println(start+"=="+end); -// Date baby = parseDate("2018-07-15"); -// System.out.println(baby.getTime()); + Date baby = parseDate("2018-12-28"); + System.out.println(baby.getTime()); } } diff --git a/platform-dal/src/main/java/com/lyms/platform/query/MatDeliverQuery.java b/platform-dal/src/main/java/com/lyms/platform/query/MatDeliverQuery.java index b106deb..6fe5f9c 100644 --- a/platform-dal/src/main/java/com/lyms/platform/query/MatDeliverQuery.java +++ b/platform-dal/src/main/java/com/lyms/platform/query/MatDeliverQuery.java @@ -230,6 +230,8 @@ public class MatDeliverQuery extends BaseQuery implements IConvertToNativeQuery if (CollectionUtils.isNotEmpty(fmHospitalList)) { if(fsHospital!=null){ condition.orCondition(MongoCondition.newInstance("fmHospital", fmHospitalList, MongoOper.IN),MongoCondition.newInstance("fsHospital", fsHospital, MongoOper.IS)); +// condition = condition.and("fmHospital", fmHospitalList, MongoOper.IN); +// condition = condition.and("fsHospital", fsHospital, MongoOper.IN); }else { condition = condition.and("fmHospital", fmHospitalList, MongoOper.IN); } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/SyncDataController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/SyncDataController.java index b150e6b..1d52313 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/SyncDataController.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/SyncDataController.java @@ -273,4 +273,23 @@ public class SyncDataController extends BaseController { return "handleSieveStatus ....."; } + + /** + * 终止服务 + * @return + */ + @ResponseBody + @RequestMapping(value = "/setStopService", method = RequestMethod.POST) + public BaseResponse setStopService(@RequestParam(required = false) String hospitalId, + @RequestParam(required = false) String patientId) { + try { + return patientServiceSysFacade.setStopService(patientId); + } catch (Exception e) { + BaseResponse baseResponse = new BaseResponse(); + baseResponse.setObject(e.getMessage()); + baseResponse.setErrorcode(ErrorCodeConstants.SYSTEM_ERROR); + baseResponse.setErrormsg(ErrorCodeConstants.SYSTEM_ERROR_DESCRIPTION); + return baseResponse; + } + } } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/LisFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/LisFacade.java index be4a335..7fb4507 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/LisFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/LisFacade.java @@ -263,6 +263,7 @@ public class LisFacade { if ("2100001580".equals(hospitalId)) { //通过就诊卡号和医院id查询到医院下面的lis记录 + model.setHospitalId("2100001580"); lises = queryLisData(vcCardNo, phone, cardNo,perType, model); } else @@ -430,9 +431,17 @@ public class LisFacade { // else if("2100001605".equals(model.getHospitalId())){ // model.setVcCardNo(cardNo); //TODO // } - else { + else if (StringUtils.isNotEmpty(vcCardNo)) { model.setVcCardNo(vcCardNo); } + else if (StringUtils.isNotEmpty(cardNo)) + { + model.setVcCardNo(cardNo); + } + else + { + return reportModelList; + } List lises = lisService.queryLisDataByModel(model); if (CollectionUtils.isNotEmpty(lises)) { diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientServiceSysFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientServiceSysFacade.java index 6238fda..975347b 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientServiceSysFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientServiceSysFacade.java @@ -237,4 +237,46 @@ public class PatientServiceSysFacade implements SysBaseFacade { return baseResponse; } + public BaseResponse setStopService(String patientId) { + + Patients patients = patientsService.findOnePatientById(patientId); + if (patients.getServiceType() != null && patients.getServiceType() == ServiceTypeEnums.STANDARD_SERVICE.getId()) + { + patients.setServiceStatus( ServiceStatusEnums.NO_OPEN.getId()); + + //先根据孕妇id和开通服务类型、开通医生进行查询，如果已经开通过则开通失败 + PatientServiceQuery patientQuery = new PatientServiceQuery(); + //根据孕妇主档案Id进行查询 + patientQuery.setParentid(patientId); + patientQuery.setSerType(PatientSerEnums.SerTypeEnums.bzfw.getId()); + List patientServices = patientServiceService.queryPatientService(patientQuery); + if (CollectionUtils.isNotEmpty(patientServices)) {//修改 + PatientService patientService = patientServices.get(0); + patientService.setSerStatus(PatientSerEnums.SerStatusEnums.zt.getId()); + patientServiceService.updatePatientService(patientService); + } + + } + else if (patients.getServiceType() != null && patients.getServiceType() == ServiceTypeEnums.ADD_SERVICE.getId()) + { + patients.setServiceStatus(ServiceStatusEnums.SUSPEND.getId()); + + //先根据孕妇id和开通服务类型、开通医生进行查询，如果已经开通过则开通失败 + PatientServiceQuery patientQuery = new PatientServiceQuery(); + //根据孕妇主档案Id进行查询 + patientQuery.setParentid(patientId); + patientQuery.setSerType(PatientSerEnums.SerTypeEnums.yqjzzd.getId()); + List patientServices = patientServiceService.queryPatientService(patientQuery); + if (CollectionUtils.isNotEmpty(patientServices)) {//修改 + PatientService patientService = patientServices.get(0); + patientService.setSerStatus(PatientSerEnums.SerStatusEnums.zt.getId()); + patientServiceService.updatePatientService(patientService); + } + } + patientsService.updatePatient(patients); + BaseResponse baseResponse = new BaseResponse(); + baseResponse.setErrormsg(ErrorCodeConstants.SUCCESS_DESCRIPTION); + baseResponse.setErrorcode(ErrorCodeConstants.SUCCESS); + return baseResponse; + } } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/session/strategy/LocalCacheSessionStrategy.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/session/strategy/LocalCacheSessionStrategy.java index f3475a1..341b7ef 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/session/strategy/LocalCacheSessionStrategy.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/session/strategy/LocalCacheSessionStrategy.java @@ -97,7 +97,7 @@ public class LocalCacheSessionStrategy implements ISessionProvider { } public static void main(String[] args) { - System.out.print(MD5Utils.md5("789654").toUpperCase()); + System.out.print(MD5Utils.md5("181818").toUpperCase()); } @Override -- 1.8.3.1