diff --git a/platform-dal/src/main/java/com/lyms/platform/query/LisCrisisItemQuery.java b/platform-dal/src/main/java/com/lyms/platform/query/LisCrisisItemQuery.java index 1346240..15bd934 100644 --- a/platform-dal/src/main/java/com/lyms/platform/query/LisCrisisItemQuery.java +++ b/platform-dal/src/main/java/com/lyms/platform/query/LisCrisisItemQuery.java @@ -191,7 +191,7 @@ public class LisCrisisItemQuery extends BaseQuery implements IConvertToNativeQue public MongoQuery convertToQuery() { MongoCondition condition = MongoCondition.newInstance(); if (null != id) { - condition = condition.and("id", new ObjectId(id), MongoOper.IS); + condition = condition.and("id", id, MongoOper.IS); } if (null != name) { condition = condition.and("name", name, MongoOper.IS); diff --git a/platform-operate-api/src/main/java/com/lyms/hospitalapi/qhdfy/QhdfyHisService.java b/platform-operate-api/src/main/java/com/lyms/hospitalapi/qhdfy/QhdfyHisService.java index 8733c10..ea2f277 100644 --- a/platform-operate-api/src/main/java/com/lyms/hospitalapi/qhdfy/QhdfyHisService.java +++ b/platform-operate-api/src/main/java/com/lyms/hospitalapi/qhdfy/QhdfyHisService.java @@ -101,7 +101,7 @@ public class QhdfyHisService { List itemList = queryRunner.query(conn, subSql+report.getHospitalId()+"'", new BeanListHandler(LisReportItem.class)); if (itemList.size() > 0) { - report.setId(hospitalId + ":" + report.getHospitalId()); + report.setId(hospitalId + "_" + report.getHospitalId()); report.setItemList(itemList); report.setHospitalId(hospitalId + ""); lisReportService.addLisReport(report); @@ -109,7 +109,7 @@ public class QhdfyHisService { // crisis init for (LisReportItem item:itemList) { if (item.getFlag() != null) { - crisisItem.setId(report.getId() + ":" + item.getCode()); + crisisItem.setId(report.getId() + "_" + item.getCode()); AssayConfig assayConfig = assayConfigMap.get(item.getCode()); if (assayConfig != null) { crisisItem.setClassify(assayConfig.getClassify()); diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/TestController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/TestController.java index 5ed4fb4..a8423eb 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/TestController.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/TestController.java @@ -166,16 +166,15 @@ public class TestController { @Autowired private AssayConfigService assayConfigService; - @RequestMapping(value = "/assayconfiginit", method = RequestMethod.GET) + @RequestMapping(value = "/assayconfiginit", method = RequestMethod.POST) @ResponseBody - public String assayconfiginit() { + public String assayconfiginit(String json) { try { - String json = FileUtils.readFileToString(new File("d:/assayconfig.json"), "utf-8"); List list = JsonUtil.toList(json, AssayConfig.class); for (AssayConfig config:list) { assayConfigService.save(config); } - } catch (IOException e) { + } catch (Exception e) { e.printStackTrace(); } return "assayconfiginit";