From b6eef20877b8aebe5fa2fc5ca51bd8fd95926fbd Mon Sep 17 00:00:00 2001 From: hanshaofeng Date: Wed, 19 Oct 2016 19:37:50 +0800 Subject: [PATCH] add import test --- .../src/main/java/com/lyms/platform/query/LisReportQuery.java | 3 --- .../src/main/java/com/lyms/hospitalapi/qhdfy/QhdfyHisService.java | 4 ++-- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/platform-dal/src/main/java/com/lyms/platform/query/LisReportQuery.java b/platform-dal/src/main/java/com/lyms/platform/query/LisReportQuery.java index a0f698d..39ddae3 100644 --- a/platform-dal/src/main/java/com/lyms/platform/query/LisReportQuery.java +++ b/platform-dal/src/main/java/com/lyms/platform/query/LisReportQuery.java @@ -73,9 +73,6 @@ public class LisReportQuery extends BaseQuery implements IConvertToNativeQuery { if(null!=vcCardNo){ condition=condition.and("vcCardNo",vcCardNo,MongoOper.IS); } - if(null!=hospitalId){ - condition=condition.and("hospitalId",hospitalId,MongoOper.IS); - } if(null!=name){ condition=condition.and("name",name,MongoOper.IS); } diff --git a/platform-operate-api/src/main/java/com/lyms/hospitalapi/qhdfy/QhdfyHisService.java b/platform-operate-api/src/main/java/com/lyms/hospitalapi/qhdfy/QhdfyHisService.java index 1da1317..595d714 100644 --- a/platform-operate-api/src/main/java/com/lyms/hospitalapi/qhdfy/QhdfyHisService.java +++ b/platform-operate-api/src/main/java/com/lyms/hospitalapi/qhdfy/QhdfyHisService.java @@ -51,10 +51,10 @@ public class QhdfyHisService { QueryRunner queryRunner = new QueryRunner(true); try { PatientsQuery patientsQuery = new PatientsQuery(); - String sql = "select top 10000 shenqinghao as hospitalId,bingrenid as patientFid,zhuyuanhao as patientHid,kahao as vcCardNo,huanzhexingming as name,xingbie as sex,nianling as age,shenqingkeshidaima as deptCode,shenqingkeshimingcheng as deptName,shenqingyishengdaima as applyDoctorCode,shenqingyishengmingcheng as applyDoctorName,jianchayishengdaima as checkDoctorCode,jianchayishengxingming as checkDoctorName,baogaofabushijian as publishTime from valllist_ex_en where kahao is not null and baogaofabushijian>=? order by shenqinghao desc"; + String sql = "select top 10000 shenqinghao as hospitalId,bingrenid as patientFid,zhuyuanhao as patientHid,kahao as vcCardNo,huanzhexingming as name,xingbie as sex,nianling as age,shenqingkeshidaima as deptCode,shenqingkeshimingcheng as deptName,shenqingyishengdaima as applyDoctorCode,shenqingyishengmingcheng as applyDoctorName,jianchayishengdaima as checkDoctorCode,jianchayishengxingming as checkDoctorName,baogaofabushijian as publishTime from valllist_ex_en where kahao is not null order by shenqinghao desc"; String subSql = "select top 1000 sheqingdanhao as id,xiangmudaima as code,xiangmumingcheng as name,xiangmujieguo as result,zifujieguo as charResult,shuzijieguo as numberResult,gaodibiaozhi as flag,cankaozhi as ref,danwei as unit,jieguoleixing as result from valresult_ex_en where sheqingdanhao='"; Object[] params = {startDate}; - List list = queryRunner.query(conn, sql, new BeanListHandler(LisReport.class), params); + List list = queryRunner.query(conn, sql, new BeanListHandler(LisReport.class)); if (list.size() > 0) { for (LisReport report:list) { patientsQuery.setVcCardNo(report.getVcCardNo()); -- 1.8.3.1