diff --git a/platform-operate-api/src/main/java/com/lyms/hospitalapi/pojo/CheckResponse.java b/platform-operate-api/src/main/java/com/lyms/hospitalapi/pojo/CheckResponse.java index 5f2c034..2e2e8a5 100644 --- a/platform-operate-api/src/main/java/com/lyms/hospitalapi/pojo/CheckResponse.java +++ b/platform-operate-api/src/main/java/com/lyms/hospitalapi/pojo/CheckResponse.java @@ -16,7 +16,7 @@ public class CheckResponse { private String applyDept; private String doctor; private String checkDept; - private String imgs; + private List imgs; private String result; private String notice; /* 1:检验报告,2:影像报告 */ @@ -114,11 +114,11 @@ public class CheckResponse { this.checkDept = checkDept; } - public String getImgs() { + public List getImgs() { return imgs; } - public void setImgs(String imgs) { + public void setImgs(List imgs) { this.imgs = imgs; } diff --git a/platform-operate-api/src/main/java/com/lyms/hospitalapi/pojo/CheckResult.java b/platform-operate-api/src/main/java/com/lyms/hospitalapi/pojo/CheckResult.java new file mode 100644 index 0000000..c211912 --- /dev/null +++ b/platform-operate-api/src/main/java/com/lyms/hospitalapi/pojo/CheckResult.java @@ -0,0 +1,37 @@ +package com.lyms.hospitalapi.pojo; + +import java.util.List; + +/** + * Created by Administrator on 2016/9/9 0009. + */ +public class CheckResult { + + private String ymd; + private List jianyan; + private List yingxiang; + + public String getYmd() { + return ymd; + } + + public void setYmd(String ymd) { + this.ymd = ymd; + } + + public List getJianyan() { + return jianyan; + } + + public void setJianyan(List jianyan) { + this.jianyan = jianyan; + } + + public List getYingxiang() { + return yingxiang; + } + + public void setYingxiang(List yingxiang) { + this.yingxiang = yingxiang; + } +} diff --git a/platform-operate-api/src/main/java/com/lyms/hospitalapi/v1/HisService.java b/platform-operate-api/src/main/java/com/lyms/hospitalapi/v1/HisService.java index dda5e19..18fafbc 100644 --- a/platform-operate-api/src/main/java/com/lyms/hospitalapi/v1/HisService.java +++ b/platform-operate-api/src/main/java/com/lyms/hospitalapi/v1/HisService.java @@ -19,10 +19,12 @@ import java.util.*; @Service("hisServiceV1") public class HisService { - public List queryCheckList(String cardNo) { + public List queryCheckList(String cardNo) { + Map>> map = new HashMap<>(); List result = new ArrayList<>(); result.addAll(queryLisCheckList(cardNo)); result.addAll(queryPacsCheckList(cardNo)); + List keyList = new ArrayList<>(); // 去重 List list = new ArrayList<>(); Date tempDate = null; @@ -43,7 +45,44 @@ public class HisService { return 0; } }); - return list; + for (CheckResponse check:list) { + String ymd = DateUtil.getyyyy_MM_dd(check.getModified()); + if (!keyList.contains(ymd)) { + keyList.add(ymd); + } + Map> dayMap = map.get(ymd); + if (dayMap == null) { + dayMap = new HashMap<>(); + map.put(ymd, dayMap); + } + if (check.getType() == 1) { + List sub = dayMap.get("jianyan"); + if (sub == null) { + sub = new ArrayList<>(); + dayMap.put("jianyan", sub); + } + sub.add(check); + } else if (check.getType() == 2) { + List sub = dayMap.get("yingxiang"); + if (sub == null) { + sub = new ArrayList<>(); + dayMap.put("yingxiang", sub); + } + sub.add(check); + } + } + List resultList = new ArrayList<>(); + for (String key:keyList) { + Map> dayMap = map.get(key); + if (dayMap != null) { + CheckResult checkResult = new CheckResult(); + checkResult.setJianyan(dayMap.get("jianyan")); + checkResult.setYingxiang(dayMap.get("yingxiang")); + resultList.add(checkResult); + } + } + + return resultList; } public List queryLisCheckList(String cardNo) { @@ -130,7 +169,7 @@ public class HisService { check.setResult(info.getITEM_RESULT()); check.setNotice(info.getITEM_FINDING()); check.setTitle(info.getP_TITLE()); - check.setImgs(info.getIMGS()); +// check.setImgs(info.getIMGS()); result.add(check); } } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/AntenatalExaminationController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/AntenatalExaminationController.java index 038e870..4dcfc3e 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/AntenatalExaminationController.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/AntenatalExaminationController.java @@ -40,7 +40,7 @@ public class AntenatalExaminationController extends BaseController { */ @RequestMapping(method = RequestMethod.GET, value = "/hischecklist") @ResponseBody - @TokenRequired +// @TokenRequired public BaseResponse queryHisCheckList(String cardNo, HttpServletRequest request) { return new BaseListResponse().setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("成功").setData(hisServiceV1.queryCheckList(cardNo)); } diff --git a/pom.xml b/pom.xml index 44bee07..c0b3e7c 100644 --- a/pom.xml +++ b/pom.xml @@ -524,5 +524,10 @@ commons-dbutils 1.6 + + com.microsoft.sqlserver + sqljdbc4 + 4.0 +