Commit fc58427c274c1a5d0ac9cde9d99ab50b1899e57c
1 parent
275f879e6f
Exists in
master
and in
6 other branches
lis修改
Showing 3 changed files with 13 additions and 8 deletions
platform-biz-service/src/main/java/com/lyms/platform/permission/service/impl/LisServiceImpl.java
View file @
fc58427
| ... | ... | @@ -5,6 +5,7 @@ |
| 5 | 5 | import com.lyms.platform.common.constants.ErrorCodeConstants; |
| 6 | 6 | import com.lyms.platform.common.enums.YnEnums; |
| 7 | 7 | import com.lyms.platform.common.result.BaseResponse; |
| 8 | +import com.lyms.platform.common.utils.DateUtil; | |
| 8 | 9 | import com.lyms.platform.common.utils.JsonUtil; |
| 9 | 10 | import com.lyms.platform.permission.DataAccessLayerService; |
| 10 | 11 | import com.lyms.platform.permission.dao.master.MasterLisMapper; |
| 11 | 12 | |
| ... | ... | @@ -214,14 +215,17 @@ |
| 214 | 215 | } |
| 215 | 216 | } else { |
| 216 | 217 | AntenatalExaminationModel antenatalExaminationModel = AntenatalExaminationModels.get(AntenatalExaminationModels.size() - 1); |
| 217 | - AntenatalExaminationModel antenatalExaminationModel1 = new AntenatalExaminationModel(); | |
| 218 | - //3 更新复诊记录 | |
| 219 | - if ("2100001291".equals(antenatalExaminationModel.getHospitalId())) { | |
| 220 | - fuZhenUpdate(model, antenatalExaminationModel, antenatalExaminationModel1); | |
| 221 | - } else if ("216".equals(antenatalExaminationModel.getHospitalId())) { | |
| 222 | - fuZhenQHDUpdate(model, antenatalExaminationModel, antenatalExaminationModel1); | |
| 218 | + if (antenatalExaminationModel.getCreated().getTime() > DateUtil.addDay(model.getPublishTime(),-7).getTime()) | |
| 219 | + { | |
| 220 | + AntenatalExaminationModel antenatalExaminationModel1 = new AntenatalExaminationModel(); | |
| 221 | + //3 更新复诊记录 | |
| 222 | + if ("2100001291".equals(antenatalExaminationModel.getHospitalId())) { | |
| 223 | + fuZhenUpdate(model, antenatalExaminationModel, antenatalExaminationModel1); | |
| 224 | + } else if ("216".equals(antenatalExaminationModel.getHospitalId())) { | |
| 225 | + fuZhenQHDUpdate(model, antenatalExaminationModel, antenatalExaminationModel1); | |
| 226 | + } | |
| 227 | + antExService.updateOneAnt(antenatalExaminationModel1, antenatalExaminationModel.getId()); | |
| 223 | 228 | } |
| 224 | - antExService.updateOneAnt(antenatalExaminationModel1, antenatalExaminationModel.getId()); | |
| 225 | 229 | } |
| 226 | 230 | } |
| 227 | 231 |
platform-common/src/main/java/com/lyms/platform/common/utils/HttpClientUtil.java
View file @
fc58427
platform-operate-api/src/main/java/com/lyms/platform/operate/web/utils/MessageCenterService.java
View file @
fc58427
| ... | ... | @@ -98,6 +98,7 @@ |
| 98 | 98 | String json = ""; |
| 99 | 99 | try { |
| 100 | 100 | json = JsonUtil.obj2Str(list); |
| 101 | + System.out.println(json); | |
| 101 | 102 | String result = HttpClientUtil.doPostSSL(CENTER_BASE_URL + "/biz-push-web/push", json); |
| 102 | 103 | if (StringUtils.isNotEmpty(result)) { |
| 103 | 104 | Map<String, Integer> map = JsonUtil.str2Obj(result, Map.class); |