jiangjiazhi / regional-platform

Authored by hanshaofeng over 8 years ago

Exists in master and in 8 other branches

Showing 3 changed files with 6 additions and 7 deletions

...	...	@@ -191,7 +191,7 @@
191	191	public MongoQuery convertToQuery() {
192	192	MongoCondition condition = MongoCondition.newInstance();
193	193	if (null != id) {
194		- condition = condition.and("id", new ObjectId(id), MongoOper.IS);
	194	+ condition = condition.and("id", id, MongoOper.IS);
195	195	}
196	196	if (null != name) {
197	197	condition = condition.and("name", name, MongoOper.IS);

...	...	@@ -101,7 +101,7 @@
101	101
102	102	List<LisReportItem> itemList = queryRunner.query(conn, subSql+report.getHospitalId()+"'", new BeanListHandler<LisReportItem>(LisReportItem.class));
103	103	if (itemList.size() > 0) {
104		- report.setId(hospitalId + ":" + report.getHospitalId());
	104	+ report.setId(hospitalId + "_" + report.getHospitalId());
105	105	report.setItemList(itemList);
106	106	report.setHospitalId(hospitalId + "");
107	107	lisReportService.addLisReport(report);
...	...	@@ -109,7 +109,7 @@
109	109	// crisis init
110	110	for (LisReportItem item:itemList) {
111	111	if (item.getFlag() != null) {
112		- crisisItem.setId(report.getId() + ":" + item.getCode());
	112	+ crisisItem.setId(report.getId() + "_" + item.getCode());
113	113	AssayConfig assayConfig = assayConfigMap.get(item.getCode());
114	114	if (assayConfig != null) {
115	115	crisisItem.setClassify(assayConfig.getClassify());

...	...	@@ -166,16 +166,15 @@
166	166	@Autowired
167	167	private AssayConfigService assayConfigService;
168	168
169		- @RequestMapping(value = "/assayconfiginit", method = RequestMethod.GET)
	169	+ @RequestMapping(value = "/assayconfiginit", method = RequestMethod.POST)
170	170	@ResponseBody
171		- public String assayconfiginit() {
	171	+ public String assayconfiginit(String json) {
172	172	try {
173		- String json = FileUtils.readFileToString(new File("d:/assayconfig.json"), "utf-8");
174	173	List<AssayConfig> list = JsonUtil.toList(json, AssayConfig.class);
175	174	for (AssayConfig config:list) {
176	175	assayConfigService.save(config);
177	176	}
178		- } catch (IOException e) {
	177	+ } catch (Exception e) {
179	178	e.printStackTrace();
180	179	}
181	180	return "assayconfiginit";