diff --git a/platform-biz-service/src/main/resources/mainOrm/master/MasterLis.xml b/platform-biz-service/src/main/resources/mainOrm/master/MasterLis.xml
index 7b3acb6..f191386 100644
--- a/platform-biz-service/src/main/resources/mainOrm/master/MasterLis.xml
+++ b/platform-biz-service/src/main/resources/mainOrm/master/MasterLis.xml
@@ -163,6 +163,9 @@
AND LIS_ID = #{lisId}
+
+ AND TITLE = #{title}
+
AND HOSPITAL_ID = #{hospitalId}
@@ -229,8 +232,6 @@
LR.VCCARDNO=#{vcCardNo}
AND
LR.HOSPITAL_ID=#{hospitalId}
- AND
- LI.HOSPITAL_ID=#{hospitalId}
diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/LisController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/LisController.java
index 7d0af62..2148876 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/LisController.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/LisController.java
@@ -15,6 +15,8 @@ import com.lyms.platform.permission.model.LisReportItemModel;
import com.lyms.platform.permission.model.LisReportModel;
import com.lyms.platform.permission.service.LisService;
import org.apache.commons.collections.CollectionUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.*;
@@ -30,6 +32,9 @@ import java.util.Map;
@Controller
public class LisController extends BaseController {
+ //日志调测器
+ private static final Logger logger = LoggerFactory.getLogger("lis-sync-log");
+
@Autowired
private LisService lisService;
@Autowired
@@ -87,6 +92,7 @@ public class LisController extends BaseController {
list.add(model);
}catch (Exception e)
{
+ logger.error("lis id == "+lisRequest.getLisId());
continue;
}
diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/SyncDataTaskService.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/SyncDataTaskService.java
index cc80414..de148b4 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/SyncDataTaskService.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/SyncDataTaskService.java
@@ -237,6 +237,57 @@ public class SyncDataTaskService {
}
}
+
+ /**
+ * 同步南充中心医院的数据到线上
+ * 定时任务配置applicationContext.xml
+ */
+ public void nczxyySyncDataSSL() {
+
+ try{
+ String json = HttpClientUtil.doPost("https://area-nc-api.healthbaby.com.cn:12356/findSyncData", new HashMap(), "utf-8");
+ if (com.lyms.platform.common.utils.StringUtils.isNotEmpty(json))
+ {
+ List list = JsonUtil.toList(json, SyncDataModel.class);
+ System.out.println("nczxyy syncdata size = "+ list.size());
+ int batchSize = 200;
+ int end = 0;
+ for (int i = 0; i < list.size(); i += batchSize) {
+ end = (end + batchSize);
+ if (end > list.size()) {
+ end = list.size();
+ }
+ System.out.println("nczxyy start:" + i + ",end:" + end);
+ final List tempList = list.subList(i, end);
+ new Thread(new Runnable() {
+ @Override
+ public void run() {
+ if (CollectionUtils.isNotEmpty(tempList))
+ {
+ StringBuffer ids = new StringBuffer();
+ for (SyncDataModel model : tempList) {
+ boolean boo = mongoSyncService.syncData(model.getAction(), model.getDataId(), model.getClassName(), model.getJsonData());
+ if (boo) {
+ ids.append(model.getId());
+ ids.append(",");
+ }
+ }
+ if (ids.length() > 0) {
+ Map params = new HashMap();
+ params.put("ids", ids.toString());
+ String result = HttpClientUtil.doPost("https://area-nc-api.healthbaby.com.cn:12356/updateSyncData", params, "utf-8");
+ System.out.println("exc result = "+ result);
+ }
+ }
+ }
+ }).start();
+ }
+ }
+ }catch(Exception ex){
+ ExceptionUtils.catchException(ex, "nczxyySyncDataSSL Error.");
+ }
+ }
+
/**
* 定时任务配置applicationContext.xml
*
@@ -258,6 +309,13 @@ public class SyncDataTaskService {
}
},"dzfy-thread").start();
+ new Thread(new Runnable() {
+ @Override
+ public void run() {
+ nczxyySyncDataSSL();
+ }
+ },"nczxyy-thread").start();
+
}