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 1782b11..eee70ac 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 @@ -663,9 +663,26 @@ public class LisFacade { String hospitalId = autoMatchFacade.getHospitalId(userId); LisReportQuery query = new LisReportQuery(); List titles = new ArrayList<>(); - titles.add("尿常规"); - titles.add("[丙]血常规(24项)"); - titles.add("血常规(24项)"); + + //秦皇岛 + if ("216".equals(hospitalId)) + { + titles.add("尿常规"); + titles.add("[丙]血常规(24项)"); + titles.add("血常规(24项)"); + } + //青龙满族自治县医院 + else if ("204".equals(hospitalId)) + { + titles.add("尿常规30"); + titles.add("尿常规检查"); + + titles.add("血常规、血型"); + titles.add("血常规、血型(住院)"); + titles.add("血常规5分类"); + titles.add("血常规五分类(住院)"); + } + query.setTitles(titles); query.setHospitalId(hospitalId); query.setCheckTime(DateUtil.parseYMD(checkTime)); @@ -675,69 +692,75 @@ public class LisFacade { { for(LisReportModel model : lises) { - if ("尿常规".equals(model.getTitle())) - { - Map map1 = new HashMap<>(); - map1.put("ndb",""); //尿蛋白 - map1.put("nt",""); //尿糖 - map1.put("ntt",""); //尿酮体 - map1.put("nqx",""); //尿潜血 - 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()) || "尿葡萄糖".equals(item.getName())) - { - map1.put("nt",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()) || "尿隐血".equals(item.getName())) - { - map1.put("nqx",item.getCharResult() == null ? item.getNumberResult() : item.getCharResult()); - } - } - } - - map.put("ncg",map1); - } - else if ("[丙]血常规(24项)".equals(model.getTitle()) || "血常规(24项)".equals(model.getTitle())) + if ("216".equals(hospitalId)) { - Map map1 = new HashMap<>(); - map1.put("xhdb",""); //血红蛋白 - map1.put("bxbjs","");//白细胞计数 - map1.put("xxbjs",""); //血小板计数 - String itemJson = model.getItemJson(); - List items = JsonUtil.toList(itemJson,LisReportItemModel.class); - if (CollectionUtils.isNotEmpty(items)) + if ("尿常规".equals(model.getTitle())) { - for(LisReportItemModel item : items) + Map map1 = new HashMap<>(); + map1.put("ndb",""); //尿蛋白 + map1.put("nt",""); //尿糖 + map1.put("ntt",""); //尿酮体 + map1.put("nqx",""); //尿潜血 + String itemJson = model.getItemJson(); + List items = JsonUtil.toList(itemJson,LisReportItemModel.class); + if (CollectionUtils.isNotEmpty(items)) { - if ("血红蛋白".equals(item.getName())) + for(LisReportItemModel item : items) { - map1.put("xhdb",item.getNumberResult()); - } - else if ("白细胞计数".equals(item.getName())) - { - map1.put("bxbjs",item.getNumberResult()); + if ("尿蛋白".equals(item.getName())) + { + map1.put("ndb",item.getCharResult() == null ? item.getNumberResult() : item.getCharResult()); + } + else if ("尿糖".equals(item.getName()) || "尿葡萄糖".equals(item.getName())) + { + map1.put("nt",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()) || "尿隐血".equals(item.getName())) + { + map1.put("nqx",item.getCharResult() == null ? item.getNumberResult() : item.getCharResult()); + } } - else if ("血小板计数".equals(item.getName()) || "血小板".equals(item.getName())) + } + map.put("ncg",map1); + } + else if ("[丙]血常规(24项)".equals(model.getTitle()) || "血常规(24项)".equals(model.getTitle())) + { + Map map1 = new HashMap<>(); + map1.put("xhdb",""); //血红蛋白 + map1.put("bxbjs","");//白细胞计数 + map1.put("xxbjs",""); //血小板计数 + String itemJson = model.getItemJson(); + List items = JsonUtil.toList(itemJson,LisReportItemModel.class); + if (CollectionUtils.isNotEmpty(items)) + { + for(LisReportItemModel item : items) { - map1.put("xxbjs",item.getNumberResult()); + if ("血红蛋白".equals(item.getName())) + { + map1.put("xhdb",item.getNumberResult()); + } + else if ("白细胞计数".equals(item.getName())) + { + map1.put("bxbjs",item.getNumberResult()); + } + else if ("血小板计数".equals(item.getName()) || "血小板".equals(item.getName())) + { + map1.put("xxbjs",item.getNumberResult()); + } } } + map.put("xcg",map1); } - - map.put("xcg",map1); } + else if ("204".equals(hospitalId)) + { + //TODO + } + } }