diff --git a/.idea/artifacts/platform_sync_data_war_exploded.xml b/.idea/artifacts/platform_sync_data_war_exploded.xml
index 54f20f2..cd8e1d1 100644
--- a/.idea/artifacts/platform_sync_data_war_exploded.xml
+++ b/.idea/artifacts/platform_sync_data_war_exploded.xml
@@ -112,7 +112,7 @@
-
+
diff --git a/platform-common/src/main/java/com/lyms/platform/common/utils/AddressUtil.java b/platform-common/src/main/java/com/lyms/platform/common/utils/AddressUtil.java
index 24c8239..e896457 100644
--- a/platform-common/src/main/java/com/lyms/platform/common/utils/AddressUtil.java
+++ b/platform-common/src/main/java/com/lyms/platform/common/utils/AddressUtil.java
@@ -21,35 +21,35 @@ public class AddressUtil {
List list = new ArrayList();
StringReader input = new StringReader(address.trim());
IKSegmenter ikSeg = new IKSegmenter(input, true); // true 用智能分词
- StringBuffer sb = new StringBuffer(); // ，false细粒度
+ StringBuffer sb = new StringBuffer(); // ，false细粒度
try {
int i = 0;
- for (Lexeme lexeme = ikSeg.next(); lexeme != null; lexeme = ikSeg
- .next()) {
+ for (Lexeme lexeme = ikSeg.next(); lexeme != null; lexeme = ikSeg.next()) {
i++;
String item = lexeme.getLexemeText();
- if (item != null && !isNumeric(item) && item.length() > 1)
- {
- if (i < 5)
- {
+ if (item != null && !isNumeric(item) && item.length() > 1) {
+ if (i < 5) {
list.add(item);
- }
- else
- {
+ } else {
sb.append(item);
}
- }
- else
- {
+ } else {
sb.append(item);
}
}
} catch (Exception e) {
- ExceptionUtils.catchException(e,"地址解析出错");
+ ExceptionUtils.catchException(e, "地址解析出错");
return null;
}
list.add(sb.toString());
return list;
}
+
+ public static void main(String[] ages) {
+ List addrs = AddressUtil.getAddress("四川省成都市武侯区双楠路23号");
+ for (String ad : addrs) {
+ System.out.println(ad);
+ }
+ }
}
diff --git a/platform-common/src/main/java/com/lyms/platform/common/utils/HttpRequest.java b/platform-common/src/main/java/com/lyms/platform/common/utils/HttpRequest.java
index bbff85e..61a3e09 100644
--- a/platform-common/src/main/java/com/lyms/platform/common/utils/HttpRequest.java
+++ b/platform-common/src/main/java/com/lyms/platform/common/utils/HttpRequest.java
@@ -5,7 +5,6 @@ import java.net.ConnectException;
import java.net.HttpURLConnection;
import java.net.URL;
import java.net.URLConnection;
-import java.util.HashMap;
import java.util.Iterator;
import java.util.List;
import java.util.Map;
@@ -401,6 +400,8 @@ public class HttpRequest {
}
public static void main(String[] args) {
+
+
// sendGet("http://localhost:8080/message_develop/sendMMS","id=222222");
// String str = sendGet("http://data.api.healthbaby.com.cn/v1/messages","hospitalId=1&tagName=,高血压,&page=1&limit=9999");
// Map headers = new HashMap();
@@ -415,6 +416,6 @@ public class HttpRequest {
// params,headers);
// System.out.println(str);
String json = "[{\"key\":\"6\",\"value\":\"true\"},{\"key\":\"7\",\"value\":\"true\"},{\"key\":\"2\",\"value\":\"false\"},{\"key\":\"3\",\"value\":\"false\"},{\"key\":\"8\",\"value\":\"false\"},{\"key\":\"9\",\"value\":\"false\"},{\"key\":\"10\",\"value\":\"false\"},{\"key\":\"12\",\"value\":\"false\"},{\"key\":\"13\",\"value\":\"false\"},{\"key\":\"15\",\"value\":\"false\"},{\"key\":\"16\",\"value\":\"false\"},{\"key\":\"17\",\"value\":\"false\"},{\"key\":\"19\",\"value\":\"false\"},{\"key\":\"20\",\"value\":\"false\"},{\"key\":\"22\",\"value\":\"false\"},{\"key\":\"23\",\"value\":\"false\"}]";
- String result = HttpRequest.sendPut("http://192.168.5.13:8080/v1/serviceConfig/196",json,"YMer2016");
+ // String result = HttpRequest.sendPut("http://192.168.5.13:8080/v1/serviceConfig/196",json,"YMer2016");
}
}
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 f333732..aa8325b 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
@@ -1053,7 +1053,7 @@ public class PatientsQuery extends BaseQuery implements IConvertToNativeQuery {
if (null != queryNo) {
MongoCondition c = MongoCondition.newInstance();
MongoCondition con1 = MongoCondition.newInstance("phone", queryNo, MongoOper.IS);
- MongoCondition con2 = MongoCondition.newInstance("username", queryNo, MongoOper.IS);
+ MongoCondition con2 = MongoCondition.newInstance("username", "^" + queryNo, MongoOper.LIKE);
MongoCondition con3 = MongoCondition.newInstance("cardNo", queryNo, MongoOper.IS);
MongoCondition con4 = MongoCondition.newInstance("fileCode", queryNo, MongoOper.IS);
if(c1!=null) {
diff --git a/platform-dal/src/main/java/com/lyms/platform/query/ResidentsArchiveQuery.java b/platform-dal/src/main/java/com/lyms/platform/query/ResidentsArchiveQuery.java
index 3135187..b143c2a 100644
--- a/platform-dal/src/main/java/com/lyms/platform/query/ResidentsArchiveQuery.java
+++ b/platform-dal/src/main/java/com/lyms/platform/query/ResidentsArchiveQuery.java
@@ -201,7 +201,7 @@ public class ResidentsArchiveQuery extends BaseQuery implements IConvertToNative
if (StringUtils.isNotBlank(queryNo)) {
MongoCondition c = MongoCondition.newInstance();
MongoCondition con1 = MongoCondition.newInstance("phone", queryNo, MongoOper.IS);
- MongoCondition con2 = MongoCondition.newInstance("username", queryNo, MongoOper.IS);
+ MongoCondition con2 = MongoCondition.newInstance("username", "^"+queryNo, MongoOper.LIKE);
MongoCondition con3 = MongoCondition.newInstance("vcCardNo", queryNo, MongoOper.IS);
if(c1!=null) {
c1 = c1.andOperator(c.orCondition(new MongoCondition[]{con1, con2, con3}).getCriteria());
diff --git a/platform-sync-data/platform-sync-data.iml b/platform-sync-data/platform-sync-data.iml
index cd8383f..6626dc6 100644
--- a/platform-sync-data/platform-sync-data.iml
+++ b/platform-sync-data/platform-sync-data.iml
@@ -9,11 +9,6 @@
-
-
-
-
-
@@ -25,29 +20,9 @@
-
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/regional-etl/regional-etl.iml b/regional-etl/regional-etl.iml
index b0896a1..7294856 100644
--- a/regional-etl/regional-etl.iml
+++ b/regional-etl/regional-etl.iml
@@ -8,7 +8,7 @@
-
+
@@ -57,24 +57,6 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-