diff --git a/platform-biz-service/src/main/java/com/lyms/platform/permission/dao/master/MasterLisMapper.java b/platform-biz-service/src/main/java/com/lyms/platform/permission/dao/master/MasterLisMapper.java index 44c8082..1fda78f 100644 --- a/platform-biz-service/src/main/java/com/lyms/platform/permission/dao/master/MasterLisMapper.java +++ b/platform-biz-service/src/main/java/com/lyms/platform/permission/dao/master/MasterLisMapper.java @@ -15,7 +15,7 @@ public interface MasterLisMapper { void deleteLisData(LisReportModel model); - List queryLisDataByModel(LisReportModel model); + List queryLisDataByModel(LisReportQuery model); List queryLisDataByLisIdAndHid(LisReportModel model); @@ -32,4 +32,6 @@ public interface MasterLisMapper { int saveLisDataTemp(LisReportModel models); List queryLisDataByStatus(LisReportQuery query); + + List queryLisCheckInfo(LisReportQuery query); } \ No newline at end of file diff --git a/platform-biz-service/src/main/java/com/lyms/platform/permission/model/LisReportQuery.java b/platform-biz-service/src/main/java/com/lyms/platform/permission/model/LisReportQuery.java index b8a3327..02b93e8 100644 --- a/platform-biz-service/src/main/java/com/lyms/platform/permission/model/LisReportQuery.java +++ b/platform-biz-service/src/main/java/com/lyms/platform/permission/model/LisReportQuery.java @@ -16,6 +16,10 @@ public class LisReportQuery extends BaseQuery { private String lisId; // 检验报告名称 private String title; + + // 检验报告名称 + private List titles; + // 检验报告类型 private String type; // 就诊卡号 @@ -69,6 +73,13 @@ public class LisReportQuery extends BaseQuery { //检验明细json private String itemJson; + public List getTitles() { + return titles; + } + + public void setTitles(List titles) { + this.titles = titles; + } public List getPhones() { return phones; diff --git a/platform-biz-service/src/main/java/com/lyms/platform/permission/service/LisService.java b/platform-biz-service/src/main/java/com/lyms/platform/permission/service/LisService.java index 0e9e7b0..9885b81 100644 --- a/platform-biz-service/src/main/java/com/lyms/platform/permission/service/LisService.java +++ b/platform-biz-service/src/main/java/com/lyms/platform/permission/service/LisService.java @@ -12,7 +12,7 @@ public interface LisService { BaseResponse saveLisData(List models); - List queryLisDataByModel(LisReportModel model); + List queryLisDataByModel(LisReportQuery model); List queryLisItemByModel(LisReportItemModel query); @@ -25,4 +25,6 @@ public interface LisService { int saveLisDataTemp(LisReportModel models); List queryLisDataByStatus(LisReportQuery query); + + List queryLisCheckInfo(LisReportQuery query); } \ No newline at end of file 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 4865f47..f0ea77c 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 @@ -58,7 +58,7 @@ public class LisServiceImpl extends DataAccessLayerService implements LisService } @Override - public List queryLisDataByModel(LisReportModel model) { + public List queryLisDataByModel(LisReportQuery model) { return masterLisMapper.queryLisDataByModel(model); } @@ -96,6 +96,11 @@ public class LisServiceImpl extends DataAccessLayerService implements LisService return masterLisMapper.queryLisDataByStatus(query); } + @Override + public List queryLisCheckInfo(LisReportQuery query) { + return masterLisMapper.queryLisCheckInfo(query); + } + public class LisSaveTask implements Runnable { 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 bce3e00..73de3b0 100644 --- a/platform-biz-service/src/main/resources/mainOrm/master/MasterLis.xml +++ b/platform-biz-service/src/main/resources/mainOrm/master/MasterLis.xml @@ -2,7 +2,7 @@ - + INSERT INTO LIS_REPORT_TBL( LIS_ID, TITLE, @@ -120,6 +120,20 @@ AND HOSPITAL_ID = #{hospitalId} + + + AND date_format(CHECK_TIME,'%Y-%m-%d') = date_format(#{checkTime},'%Y-%m-%d') + + + + AND TITLE IN + + #{title} + + + + UNION SELECT ID AS id, @@ -157,7 +171,17 @@ AND HOSPITAL_ID = #{hospitalId} + + AND date_format(CHECK_TIME,'%Y-%m-%d') = date_format(#{checkTime},'%Y-%m-%d') + + + AND TITLE IN + + #{title} + + 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 5c7e2ad..7d0af62 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 @@ -212,4 +212,25 @@ public class LisController extends BaseController { return lisFacade.updateAppLisStatus(ids); } + + + /** + * 儿童检查页面获取指定几项的辅助检查结果 + * 血常规 (血红蛋白、 白细胞计数、血小板计数） + * 尿常规 (尿蛋白、尿糖、尿酮体、尿潜血) + * @param vcCardNo 就诊卡号 + * @param phone 手机号码 + * @param request + * @return + */ + @RequestMapping(method = RequestMethod.GET, value = "/getBabyLisAssistCheckInfo") + @ResponseBody + @TokenRequired + public BaseResponse getLisAndRisData(@RequestParam(required = false) String vcCardNo, + @RequestParam(required = false) String phone, + @RequestParam(required = true) String checkTime, + HttpServletRequest request) { + LoginContext loginState = (LoginContext) request.getAttribute("loginContext"); + return lisFacade.getBabyLisAssistCheckInfo(vcCardNo, phone,checkTime,loginState.getId()); + } } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/LisFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/LisFacade.java index 6561778..22ff82a 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/LisFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/LisFacade.java @@ -313,7 +313,7 @@ public class LisFacade { } } - LisReportModel model = new LisReportModel(); + LisReportQuery model = new LisReportQuery(); model.setVcCardNo(pat.getVcCardNo()); model.setHospitalId(pat.getHospitalId()); model.setPhone(pat.getPhone()); @@ -654,4 +654,87 @@ public class LisFacade { return lists; } + + public BaseResponse getBabyLisAssistCheckInfo(String vcCardNo, String phone, String checkTime,Integer userId) { + + //根据用户id获取医院ID + String hospitalId = autoMatchFacade.getHospitalId(userId); + LisReportQuery query = new LisReportQuery(); + List titles = new ArrayList<>(); + titles.add("尿常规"); + titles.add("[丙]血常规(24项)"); + titles.add("血常规(24项)"); + query.setTitles(titles); + query.setPhone(phone); + query.setPhone(phone); + query.setVcCardNo(vcCardNo); + query.setHospitalId(hospitalId); + query.setCheckTime(DateUtil.parseYMD(checkTime)); + List lises = lisService.queryLisDataByModel(query); + Map> map = new HashMap<>(); + if (CollectionUtils.isNotEmpty(lises)) + { + for(LisReportModel model : lises) + { + if ("尿常规".equals(model.getTitle())) + { + Map map1 = new HashMap<>(); + String itemJson = model.getItemJson(); + List items = JsonUtil.toList(itemJson,LisReportItemModel.class); + if (CollectionUtils.isNotEmpty(items)) + { + for(LisReportItemModel item : items) + { + if ("尿蛋白".equals(item.getName())) + { + map1.put("ndb",item.getCharResult() == null ? item.getNumberResult() : item.getCharResult()); + } + else if ("尿糖".equals(item.getName())) + { + map1.put("tn",item.getCharResult() == null ? item.getNumberResult() : item.getCharResult()); + } + else if ("尿酮体".equals(item.getName())) + { + map1.put("ntt",item.getCharResult() == null ? item.getNumberResult() : item.getCharResult()); + } + else if ("尿潜血".equals(item.getName())) + { + map1.put("ntx",item.getCharResult() == null ? item.getNumberResult() : item.getCharResult()); + } + } + } + + map.put("ncg",map1); + } + else if ("[丙]血常规(24项)".equals(model.getTitle()) || "血常规(24项".equals(model.getTitle())) + { + Map map1 = new HashMap<>(); + String itemJson = model.getItemJson(); + List items = JsonUtil.toList(itemJson,LisReportItemModel.class); + if (CollectionUtils.isNotEmpty(items)) + { + for(LisReportItemModel item : items) + { + if ("血红蛋白".equals(item.getName())) + { + map1.put("xhdb",item.getResult()); + } + else if ("白细胞计数".equals(item.getName())) + { + map1.put("xxbjs",item.getResult()); + } + else if ("血小板计数".equals(item.getName())) + { + map1.put("xxbjs",item.getResult()); + } + } + } + + map.put("xcg",map1); + } + } + } + + return new BaseObjectResponse().setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg(ErrorCodeConstants.SUCCESS_DESCRIPTION).setData(map); + } } \ No newline at end of file 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 1fcd072..3a1a8a6 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 @@ -1265,9 +1265,10 @@ public class ViewFacade { map.put("hospitalId", hospitalId); map.put("nextCheckTime", DateUtil.getyyyy_MM_dd(data.getNextCheckTime())); - if (patients.getFmDate() != null) + if (patients.getFmDate() != null && data.getNextCheckTime() != null) { - map.put("nextCheckWeek",ResolveUtils.getPregnancyWeek(patients.getFmDate(), data.getNextCheckTime())); + int day = DateUtil.daysBetween(patients.getFmDate(),data.getNextCheckTime()); + map.put("nextCheckWeek","产后"+day+"天"); }