Commit b6eef20877b8aebe5fa2fc5ca51bd8fd95926fbd
1 parent
8697717e83
Exists in
master
and in
8 other branches
add import test
Showing 2 changed files with 2 additions and 5 deletions
platform-dal/src/main/java/com/lyms/platform/query/LisReportQuery.java
View file @
b6eef20
... | ... | @@ -73,9 +73,6 @@ |
73 | 73 | if(null!=vcCardNo){ |
74 | 74 | condition=condition.and("vcCardNo",vcCardNo,MongoOper.IS); |
75 | 75 | } |
76 | - if(null!=hospitalId){ | |
77 | - condition=condition.and("hospitalId",hospitalId,MongoOper.IS); | |
78 | - } | |
79 | 76 | if(null!=name){ |
80 | 77 | condition=condition.and("name",name,MongoOper.IS); |
81 | 78 | } |
platform-operate-api/src/main/java/com/lyms/hospitalapi/qhdfy/QhdfyHisService.java
View file @
b6eef20
... | ... | @@ -51,10 +51,10 @@ |
51 | 51 | QueryRunner queryRunner = new QueryRunner(true); |
52 | 52 | try { |
53 | 53 | PatientsQuery patientsQuery = new PatientsQuery(); |
54 | - 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"; | |
54 | + 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"; | |
55 | 55 | 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='"; |
56 | 56 | Object[] params = {startDate}; |
57 | - List<LisReport> list = queryRunner.query(conn, sql, new BeanListHandler<LisReport>(LisReport.class), params); | |
57 | + List<LisReport> list = queryRunner.query(conn, sql, new BeanListHandler<LisReport>(LisReport.class)); | |
58 | 58 | if (list.size() > 0) { |
59 | 59 | for (LisReport report:list) { |
60 | 60 | patientsQuery.setVcCardNo(report.getVcCardNo()); |