From 62b3920b2bbcec17c4e331e7cb47f5edb8f99734 Mon Sep 17 00:00:00 2001 From: liquanyu Date: Thu, 11 Jun 2020 11:39:21 +0800 Subject: [PATCH] update --- .../com/lyms/platform/common/utils/DateUtil.java | 6 +- .../operate/web/controller/ViewController.java | 13 +++ .../platform/operate/web/facade/ViewFacade.java | 106 +++++++++++++++++++-- .../operate/web/request/MessagesResult.java | 28 ++++++ .../operate/web/result/BabyCheckPageResult.java | 11 +++ 5 files changed, 151 insertions(+), 13 deletions(-) create mode 100644 platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/MessagesResult.java diff --git a/platform-common/src/main/java/com/lyms/platform/common/utils/DateUtil.java b/platform-common/src/main/java/com/lyms/platform/common/utils/DateUtil.java index 3afee87..7aa85cd 100644 --- a/platform-common/src/main/java/com/lyms/platform/common/utils/DateUtil.java +++ b/platform-common/src/main/java/com/lyms/platform/common/utils/DateUtil.java @@ -1578,10 +1578,10 @@ public class DateUtil { public static void main(String[] args) { Date bir = parseYMD("1992-03-29"); - Date bir1 = parseYMD("2020-03-29"); + Date bir1 = parseYMD("2020-03-25"); - Integer i = getAge(bir, bir1); - System.out.println(i); + Date i = addDay(bir1, 280); + System.out.println(getyyyy_MM_dd(i)); } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/ViewController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/ViewController.java index ab5c436..1a3d2b8 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/ViewController.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/ViewController.java @@ -832,6 +832,19 @@ public class ViewController extends BaseController { return viewFacade.getBabyCheckPageInfo(id); } + + /** + * 儿童检查页面打印获ams短信内容显示 + * @param buildId + * @param checkDate + * @return + */ + @RequestMapping(value = "/getBabyCheckMessage", method = RequestMethod.GET) + @ResponseBody + public BaseObjectResponse getBabyCheckMessage(@RequestParam String buildId,@RequestParam String checkDate) { + return viewFacade.getBabyCheckMessage(buildId,checkDate); + } + /** * 根据儿童ID获取儿童量表数据 * diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ViewFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ViewFacade.java index bf22f42..3bf9b4c 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ViewFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ViewFacade.java @@ -18,7 +18,12 @@ import java.util.Map; import java.util.Set; import com.lyms.hospitalapi.qhdfy.QhdfyHisService; +import com.lyms.platform.common.utils.*; +import com.lyms.platform.common.utils.HttpClientUtil; +import com.lyms.platform.operate.web.request.MessagesResult; import com.lyms.platform.operate.web.result.*; +import com.lyms.platform.operate.web.utils.*; +import net.sf.json.JSONArray; import org.apache.commons.collections.CollectionUtils; import org.apache.commons.collections.MapUtils; import org.apache.commons.collections.map.HashedMap; @@ -87,19 +92,9 @@ import com.lyms.platform.common.enums.YnEnums; import com.lyms.platform.common.result.BaseObjectResponse; import com.lyms.platform.common.result.BaseResponse; import com.lyms.platform.common.result.RespBuilder; -import com.lyms.platform.common.utils.DateUtil; -import com.lyms.platform.common.utils.ExceptionUtils; -import com.lyms.platform.common.utils.JsonUtil; -import com.lyms.platform.common.utils.SystemConfig; import com.lyms.platform.operate.web.request.AntExcAddOther; import com.lyms.platform.operate.web.request.MatDeliverAddRequest; import com.lyms.platform.operate.web.service.BabyEvaluationCriterionService; -import com.lyms.platform.operate.web.utils.CommonsHelper; -import com.lyms.platform.operate.web.utils.FunvCommonUtil; -import com.lyms.platform.operate.web.utils.MongoUtil; -import com.lyms.platform.operate.web.utils.ResolveUtils; -import com.lyms.platform.operate.web.utils.UnitConstants; -import com.lyms.platform.operate.web.utils.UnitUtils; import com.lyms.platform.permission.dao.master.CouponMapper; import com.lyms.platform.permission.model.Organization; import com.lyms.platform.permission.model.OrganizationQuery; @@ -147,6 +142,9 @@ import com.lyms.platform.query.StopPregQuery; */ @Component public class ViewFacade { + + public static final String AMS_URL = PropertiesUtils.getPropertyValue("ams_url"); + @Autowired private BasicConfigService basicConfigService; @Autowired @@ -5094,8 +5092,10 @@ public class ViewFacade { if (CollectionUtils.isNotEmpty(models)) { babyModel = models.get(0); } + result = getBabyCheckResult(checkModel, babyModel); + /** 优惠券编号 */ result.setCouponCode(couponService.findByType(id, 8)); /** 优惠券编号血红蛋白 */ @@ -5113,6 +5113,92 @@ public class ViewFacade { } + /** + * + * @param id 儿童档案id + * @param checkDate 儿童检查日期 + * @return + */ + public BaseObjectResponse getBabyCheckMessage(String id,String checkDate) { + BabyModelQuery babyQuery = new BabyModelQuery(); + babyQuery.setId(id); + babyQuery.setYn(YnEnums.YES.getId()); + BabyModel babyModel = null; + + BaseObjectResponse br = new BaseObjectResponse(); + List list = null; + List models = babyBookbuildingService.queryBabyBuildByCond(babyQuery); + if (CollectionUtils.isNotEmpty(models)) { + babyModel = models.get(0); + list = getBabyMessage(babyModel, checkDate); + } + + br.setData(list); + br.setErrorcode(ErrorCodeConstants.SUCCESS); + br.setErrormsg("成功"); + return br; + } + + /** + * 从ams获取对应儿童周龄的短信消息 + */ + private List getBabyMessage(BabyModel babyModel,String checkDate) + { + List contents = new ArrayList<>(); + try { + Date birth = babyModel.getBirth(); + int week = DateUtil.getWeek(birth, DateUtil.parseYMD(checkDate)); + StringBuffer sb = new StringBuffer(); + if (week <= 154) + { + sb.append(week); + sb.append(","); + sb.append(week+1); + sb.append(","); + sb.append(week+2); + sb.append(""); + } + else + { + sb.append("154"); + sb.append(","); + sb.append("155"); + sb.append(","); + sb.append("156"); + } + Map param = new HashMap<>(); + param.put("versionId","2"); + param.put("title", sb.toString()); + + String url = AMS_URL +"/v1/getMessages"; + String json = HttpClientUtil.doGet(url, param, "utf-8", ""); + + + net.sf.json.JSONObject jsonObject = JsonUtil.getObj(json); + if (jsonObject != null && jsonObject.getJSONArray("list") != null) { + JSONArray jsonArray = jsonObject.getJSONArray("list"); + String list = jsonArray.toString(); + + List messages = JsonUtil.toList(list, MessagesResult.class); + if (messages != null && CollectionUtils.isNotEmpty(messages)) + { + for (MessagesResult msg : messages) + { + contents.add(msg.getContent()); + } + } + } + + }catch (Exception e) + { + ExceptionUtils.catchException(e,"getMessages error"); + } + return contents; + + } + + + private BabyCheckPageResult getBabyCheckResult(BabyCheckModel checkModel, BabyModel babyModel) { BabyCheckPageResult model = new BabyCheckPageResult(); diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/MessagesResult.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/MessagesResult.java new file mode 100644 index 0000000..65b24bd --- /dev/null +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/MessagesResult.java @@ -0,0 +1,28 @@ +package com.lyms.platform.operate.web.request; + + +/** + * Created by Administrator on 2020-06-10. + */ +public class MessagesResult { + + private String id; + private String content; + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getContent() { + return content; + } + + public void setContent(String content) { + this.content = content; + } + +} diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BabyCheckPageResult.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BabyCheckPageResult.java index 236fa0d..24eeb1e 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BabyCheckPageResult.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BabyCheckPageResult.java @@ -509,6 +509,17 @@ public class BabyCheckPageResult { private String socialContactIA; private String socialContactDQ; + + private List messages; + + public List getMessages() { + return messages; + } + + public void setMessages(List messages) { + this.messages = messages; + } + public String getExerciseIA() { return exerciseIA; } -- 1.8.3.1