From fc58427c274c1a5d0ac9cde9d99ab50b1899e57c Mon Sep 17 00:00:00 2001 From: liquanyu Date: Sat, 10 Oct 2020 19:58:45 +0800 Subject: [PATCH] =?UTF-8?q?lis=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../permission/service/impl/LisServiceImpl.java | 18 +++++++++++------- .../com/lyms/platform/common/utils/HttpClientUtil.java | 2 +- .../operate/web/utils/MessageCenterService.java | 1 + 3 files changed, 13 insertions(+), 8 deletions(-) diff --git a/platform-biz-service/src/main/java/com/lyms/platform/permission/service/impl/LisServiceImpl.java b/platform-biz-service/src/main/java/com/lyms/platform/permission/service/impl/LisServiceImpl.java index d060794..9c8a551 100644 --- a/platform-biz-service/src/main/java/com/lyms/platform/permission/service/impl/LisServiceImpl.java +++ b/platform-biz-service/src/main/java/com/lyms/platform/permission/service/impl/LisServiceImpl.java @@ -5,6 +5,7 @@ import com.lyms.platform.biz.service.PatientsService; import com.lyms.platform.common.constants.ErrorCodeConstants; import com.lyms.platform.common.enums.YnEnums; import com.lyms.platform.common.result.BaseResponse; +import com.lyms.platform.common.utils.DateUtil; import com.lyms.platform.common.utils.JsonUtil; import com.lyms.platform.permission.DataAccessLayerService; import com.lyms.platform.permission.dao.master.MasterLisMapper; @@ -214,14 +215,17 @@ public class LisServiceImpl implements LisService { } } else { AntenatalExaminationModel antenatalExaminationModel = AntenatalExaminationModels.get(AntenatalExaminationModels.size() - 1); - AntenatalExaminationModel antenatalExaminationModel1 = new AntenatalExaminationModel(); - //3 更新复诊记录 - if ("2100001291".equals(antenatalExaminationModel.getHospitalId())) { - fuZhenUpdate(model, antenatalExaminationModel, antenatalExaminationModel1); - } else if ("216".equals(antenatalExaminationModel.getHospitalId())) { - fuZhenQHDUpdate(model, antenatalExaminationModel, antenatalExaminationModel1); + if (antenatalExaminationModel.getCreated().getTime() > DateUtil.addDay(model.getPublishTime(),-7).getTime()) + { + AntenatalExaminationModel antenatalExaminationModel1 = new AntenatalExaminationModel(); + //3 更新复诊记录 + if ("2100001291".equals(antenatalExaminationModel.getHospitalId())) { + fuZhenUpdate(model, antenatalExaminationModel, antenatalExaminationModel1); + } else if ("216".equals(antenatalExaminationModel.getHospitalId())) { + fuZhenQHDUpdate(model, antenatalExaminationModel, antenatalExaminationModel1); + } + antExService.updateOneAnt(antenatalExaminationModel1, antenatalExaminationModel.getId()); } - antExService.updateOneAnt(antenatalExaminationModel1, antenatalExaminationModel.getId()); } } diff --git a/platform-common/src/main/java/com/lyms/platform/common/utils/HttpClientUtil.java b/platform-common/src/main/java/com/lyms/platform/common/utils/HttpClientUtil.java index d29ba5b..96579fb 100644 --- a/platform-common/src/main/java/com/lyms/platform/common/utils/HttpClientUtil.java +++ b/platform-common/src/main/java/com/lyms/platform/common/utils/HttpClientUtil.java @@ -32,7 +32,7 @@ public class HttpClientUtil { private static PoolingHttpClientConnectionManager connMgr; private static RequestConfig requestConfig; - private static final int MAX_TIMEOUT = 7000; + private static final int MAX_TIMEOUT = 70000; static { // 设置连接池 diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/utils/MessageCenterService.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/utils/MessageCenterService.java index bcf5bd0..46be840 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/utils/MessageCenterService.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/utils/MessageCenterService.java @@ -98,6 +98,7 @@ public class MessageCenterService { String json = ""; try { json = JsonUtil.obj2Str(list); + System.out.println(json); String result = HttpClientUtil.doPostSSL(CENTER_BASE_URL + "/biz-push-web/push", json); if (StringUtils.isNotEmpty(result)) { Map map = JsonUtil.str2Obj(result, Map.class); -- 1.8.3.1