采集bug修改

Hos-resource/src/main/java/com/yihu/ehr/datacollect/service/DatacollectService.java

@@ -354,20 +354,18 @@ public class DatacollectService implements IDatacollectService {
                }
                //增量采集
                String maxKey = "0";
                String keyValue = ds.getJobDatasetKeyvalue();
                if(key!=null && key.length()>0)
                {
                    maxKey = key;
                    if(keytype.toUpperCase().equals("DATE")) //时间类型
                    {
                        Date keyDate = new Date();
                        if(keyvalue!=null && keyvalue.length()>0) {
                            Date keyDate = new Date();
                            //字符串转时间
                            keyDate = DateConvert.toDate(keyvalue);
                            //根据数据库类型获取时间sql
                            strWhere += " and "+ key + ">'"+getDateSqlByDBType(dbType,keyDate)+"'";
                            strWhere += " order by "+ key;
                            strWhere += " and "+ maxKey + ">'"+getDateSqlByDBType(dbType,keyDate)+"'";
                        }
                    }
@@ -376,17 +374,16 @@ public class DatacollectService implements IDatacollectService {
                        maxKey = getToNumberSqlByDBType(dbType,key);
                        if(keyvalue!=null && keyvalue.length()>0) {
                            strWhere += " and "+ maxKey + ">'" + keyvalue + "'";
                            strWhere += " order by "+ maxKey;
                        }
                    }
                    else{
                        if(keyvalue!=null && keyvalue.length()>0) {
                            strWhere += " and "+ key + ">'" + keyvalue + "'";
                            strWhere += " order by "+ key;
                            strWhere += " and "+ maxKey + ">'" + keyvalue + "'";
                        }
                    }
                    strWhere += " order by " + maxKey;
                }
                strSql += strWhere;
                //总条数和最大值查询
                String sqlCount = "select count(1) as COUNT,max(" + maxKey + ") as MAX_KEYVALUE from " + adapterTableName + strWhere;