From e78151ff6b9b87af9a9c94240d52370e46b7ce35 Mon Sep 17 00:00:00 2001 From: liquanyu Date: Thu, 4 May 2017 15:52:04 +0800 Subject: [PATCH] update --- .../platform/permission/model/LisReportQuery.java | 35 ++++++++++++++++++++ .../main/resources/mainOrm/master/MasterLis.xml | 29 +++++++++++++++-- .../com/lyms/platform/query/PatientsQuery.java | 14 ++++++++ .../operate/web/controller/LisController.java | 10 +++--- .../platform/operate/web/facade/LisFacade.java | 38 +++++++++++++++++----- .../src/main/resources/config.properties | 2 +- regional-etl/pom.xml | 2 +- 7 files changed, 112 insertions(+), 18 deletions(-) diff --git a/platform-biz-service/src/main/java/com/lyms/platform/permission/model/LisReportQuery.java b/platform-biz-service/src/main/java/com/lyms/platform/permission/model/LisReportQuery.java index 2c91ce7..b8a3327 100644 --- a/platform-biz-service/src/main/java/com/lyms/platform/permission/model/LisReportQuery.java +++ b/platform-biz-service/src/main/java/com/lyms/platform/permission/model/LisReportQuery.java @@ -20,6 +20,10 @@ public class LisReportQuery extends BaseQuery { private String type; // 就诊卡号 private String vcCardNo; + + // 就诊卡号 + private List vcCardNos; + // 患者姓名 private String name; // 住院号 @@ -47,9 +51,15 @@ public class LisReportQuery extends BaseQuery { // 医院id private String hospitalId; + // 医院id + private List hospitalIds; + //联系方式 private String phone; + //联系方式 + private List phones; + //检验项集合 private List items; @@ -59,6 +69,31 @@ public class LisReportQuery extends BaseQuery { //检验明细json private String itemJson; + + public List getPhones() { + return phones; + } + + public void setPhones(List phones) { + this.phones = phones; + } + + public List getHospitalIds() { + return hospitalIds; + } + + public void setHospitalIds(List hospitalIds) { + this.hospitalIds = hospitalIds; + } + + public List getVcCardNos() { + return vcCardNos; + } + + public void setVcCardNos(List vcCardNos) { + this.vcCardNos = vcCardNos; + } + public Integer getStatus() { return status; } diff --git a/platform-biz-service/src/main/resources/mainOrm/master/MasterLis.xml b/platform-biz-service/src/main/resources/mainOrm/master/MasterLis.xml index 01e0aad..b251c28 100644 --- a/platform-biz-service/src/main/resources/mainOrm/master/MasterLis.xml +++ b/platform-biz-service/src/main/resources/mainOrm/master/MasterLis.xml @@ -225,14 +225,39 @@ AND ID = #{id} - - AND (VCCARDNO=#{vcCardNo} OR PHONE = #{phone}) + + AND ( + + VCCARDNO IN + + #{vcCardNo} + + OR + + + + PHONE IN + + #{phone} + + + ) AND HOSPITAL_ID=#{hospitalId} + + AND HOSPITAL_ID IN + + #{hospitalId} + + + AND STATUS=#{status} diff --git a/platform-dal/src/main/java/com/lyms/platform/query/PatientsQuery.java b/platform-dal/src/main/java/com/lyms/platform/query/PatientsQuery.java index c4d870e..78a610f 100644 --- a/platform-dal/src/main/java/com/lyms/platform/query/PatientsQuery.java +++ b/platform-dal/src/main/java/com/lyms/platform/query/PatientsQuery.java @@ -22,6 +22,7 @@ import java.util.List; public class PatientsQuery extends BaseQuery implements IConvertToNativeQuery { private String id; + private List ids; private String husbandPhone; @@ -119,6 +120,14 @@ public class PatientsQuery extends BaseQuery implements IConvertToNativeQuery { private String desc; + public List getIds() { + return ids; + } + + public void setIds(List ids) { + this.ids = ids; + } + public String getDesc() { return desc; } @@ -987,6 +996,11 @@ public class PatientsQuery extends BaseQuery implements IConvertToNativeQuery { if (StringUtils.isNotEmpty(id)) { condition = condition.and("id", id, MongoOper.IS); } + + if (CollectionUtils.isNotEmpty(ids)) { + condition = condition.and("id", ids, MongoOper.IN); + } + if (null != vcCardNo) { condition = condition.and("vcCardNo", vcCardNo, MongoOper.IS); } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/LisController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/LisController.java index 3d1f813..e1f015e 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/LisController.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/LisController.java @@ -120,15 +120,15 @@ public class LisController extends BaseController { /** * 返回小程序查询个人的lis报告 返回的是列表 * 该接口由app服务器端调用 - * @param patientId 院内系统的孕妇的建档id + * @param patientIds 院内系统的孕妇的建档id * @param status 0 未推送 1已推送 不传就查询所有 * @return */ @RequestMapping(method = RequestMethod.GET, value = "/getAppLis") @ResponseBody - public BaseResponse getLisAndRisData(@RequestParam("patientId") String patientId, - @RequestParam(required = false) Integer page, - @RequestParam(required = false) Integer limit, + public BaseResponse getLisAndRisData(@RequestParam("patientIds") String patientIds, + @RequestParam("page") Integer page, + @RequestParam("limit") Integer limit, @RequestParam(required = false) Integer status, @RequestHeader("Authorization") String token) { @@ -138,7 +138,7 @@ public class LisController extends BaseController { return new BaseResponse().setErrorcode(ErrorCodeConstants.TOKEN_EXPIRE).setErrormsg("Token is error"); } - return lisFacade.getAppLisList(patientId, status, page, limit); + return lisFacade.getAppLisList(patientIds, status, page, limit); } 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 7912593..a3ab882 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 @@ -400,31 +400,53 @@ public class LisFacade { /** * 返回小程序查询个人的lis报告 * 该接口由app服务器端调用 - * @param patientId 院内系统孕妇建档id + * @param patientIds 院内系统孕妇建档id * @return */ - public BaseResponse getAppLisList(String patientId,Integer status,Integer page,Integer limit) { + public BaseResponse getAppLisList(String patientIds,Integer status,Integer page,Integer limit) { + List ids = new ArrayList<>(); + if (StringUtils.isNotEmpty(patientIds)) + { + CollectionUtils.addAll(ids,patientIds.split(",")); + } PatientsQuery patientsQuery=new PatientsQuery(); - patientsQuery.setId(patientId); + patientsQuery.setIds(ids); patientsQuery.setYn(YnEnums.YES.getId()); List list= patientsService.queryPatient(patientsQuery); List lises = null; if (CollectionUtils.isNotEmpty(list)) { - Patients patients = list.get(0); + List vcCardNos = new ArrayList<>(); + List hosptalIds = new ArrayList<>(); + List phones = new ArrayList<>(); + for(Patients pat : list) + { + if (pat != null && StringUtils.isNotEmpty(pat.getHospitalId())) + { + if (StringUtils.isNotEmpty(pat.getVcCardNo())) + { + vcCardNos.add(pat.getVcCardNo()); + } + if (StringUtils.isNotEmpty(pat.getPhone())) + { + phones.add(pat.getPhone()); + } + hosptalIds.add(pat.getHospitalId()); + } + } LisReportQuery query = new LisReportQuery(); query.setPage(page); query.setLimit(limit); query.setNeed("true"); query.setSort(" PUBLISH_TIME DESC "); - query.setPhone(patients.getPhone()); - query.setVcCardNo(patients.getVcCardNo()); + query.setPhones(phones); + query.setVcCardNos(vcCardNos); query.setStatus(status); - query.setHospitalId(patients.getHospitalId()); + query.setHospitalIds(hosptalIds); lises = lisService.queryLisDataByQuery(query); if (CollectionUtils.isNotEmpty(lises)) @@ -440,8 +462,6 @@ public class LisFacade { } } } - - } BaseObjectResponse objectResponse = new BaseObjectResponse(); objectResponse.setErrorcode(ErrorCodeConstants.SUCCESS); diff --git a/platform-operate-api/src/main/resources/config.properties b/platform-operate-api/src/main/resources/config.properties index 86eaa5f..e10e970 100644 --- a/platform-operate-api/src/main/resources/config.properties +++ b/platform-operate-api/src/main/resources/config.properties @@ -28,7 +28,7 @@ postser_url=http://devmmsapi.qinhuangdao.healthbaby.com.cn:18019/initdata/reser area_count_url=119.90.57.26:1522 #同步mysql数据到各个区域的地址,多个用逗号隔开 如：https://area-qhd-api.healthbaby.com.cn:18019/syncMysqlData,https://area-dz-api.healthbaby.com.cn:12356/syncMysqlData -sync_mysql_data_url=https://stage-rp-api.healthbaby.com.cn/syncMysqlData +sync_mysql_data_url= #数据源相关配置 jdbc.0.driver=oracle.jdbc.driver.OracleDriver diff --git a/regional-etl/pom.xml b/regional-etl/pom.xml index b879b86..e0849bc 100644 --- a/regional-etl/pom.xml +++ b/regional-etl/pom.xml @@ -12,7 +12,7 @@ UTF-8 UTF-8 - 1.8 + 1.7 -- 1.8.3.1