Index: ssts-web/src/main/webapp/disinfectsystem/config/ljsrmyy/config.js =================================================================== diff -u -r17362 -r18188 --- ssts-web/src/main/webapp/disinfectsystem/config/ljsrmyy/config.js (.../config.js) (revision 17362) +++ ssts-web/src/main/webapp/disinfectsystem/config/ljsrmyy/config.js (.../config.js) (revision 18188) @@ -53,5 +53,7 @@ //自定义装配界面,装配数量的处理方式,0或者未定义:清空,1:表示保留当前值,2表示设置回默认值。其他值跟1一样,保留当前值 packAmountProcessTypeInDirectPackingView:1, // 自定义装配界面,灭菌日期的处理方式,,0或者未定义:清空,1:表示保留当前值,2表示设置回默认值。其他值跟1一样,保留当前值 - disinfectionDateProcessTypeInDirectPackingView:1 + disinfectionDateProcessTypeInDirectPackingView:1, + // 定时器每次读取手麻接口的最近多少天内的数据 + timerReadHerpPathDataOfLastDays : 5 } \ No newline at end of file Index: ssts-userecord/src/main/java/com/forgon/disinfectsystem/useRecord/hrepPath/ljsrmyy/HerpPathManagerImpl.java =================================================================== diff -u -r17729 -r18188 --- ssts-userecord/src/main/java/com/forgon/disinfectsystem/useRecord/hrepPath/ljsrmyy/HerpPathManagerImpl.java (.../HerpPathManagerImpl.java) (revision 17729) +++ ssts-userecord/src/main/java/com/forgon/disinfectsystem/useRecord/hrepPath/ljsrmyy/HerpPathManagerImpl.java (.../HerpPathManagerImpl.java) (revision 18188) @@ -104,14 +104,30 @@ + " doctorName,operation,operationRoom,patientArea,roomNumber,bedNumber,depart,washHandNurse," + " circuitNurse,specialInfection,NOW_STATE,QXName,BarCode,DepartCoding " + " from LYUserecordMain um where 1=1 "; + //如果病历号不为空时,则按病历号进行过滤 if(StringUtils.isNotBlank(patientNumber)){ sql += " and (hospitalNum = '"+patientNumber+"' or treatmentNum = '"+patientNumber+"') "; }else{ - //否则查询出不在回写成功范围内的数据(数量加以限制,否则处理时间会比较长),为为常量的子查询条件oracle只支持1000个,所以超过1000时需要转换成select的union查询 - String processedSql = getProcessedQueryIdUnionSql(); - if(StringUtils.isNotBlank(processedSql)){ - sql += " and id not in ("+ processedSql +")"; + //定时器每次读取手麻接口的最近多少天内的数据 + String timerReadHerpPathDataOfLastDays = CssdUtils.getSystemSetConfigByName("timerReadHerpPathDataOfLastDays"); + if(StringUtils.isNotBlank(timerReadHerpPathDataOfLastDays)){ + try{ + sql += " and useDate is not null and useDate > (sysdate - "+ Integer.parseInt(timerReadHerpPathDataOfLastDays) +") "; + }catch(Exception e){ + e.printStackTrace(); + //否则查询出不在回写成功范围内的数据(数量加以限制,否则处理时间会比较长),为为常量的子查询条件oracle只支持1000个,所以超过1000时需要转换成select的union查询 + String processedSql = getProcessedQueryIdUnionSql(); + if(StringUtils.isNotBlank(processedSql)){ + sql += " and id not in ("+ processedSql +")"; + } + } + }else{ + //否则查询出不在回写成功范围内的数据(数量加以限制,否则处理时间会比较长),为为常量的子查询条件oracle只支持1000个,所以超过1000时需要转换成select的union查询 + String processedSql = getProcessedQueryIdUnionSql(); + if(StringUtils.isNotBlank(processedSql)){ + sql += " and id not in ("+ processedSql +")"; + } } } sql += " and rownum < " + processUseRecordAmountPerTime + " order by id";