jiangjiazhi / regional-platform

Download as
Browse Code »

Commit de05cea058d6e09ac65d41d8f4d78317c61242a8

Authored by cfl
1 parent f9caed9bdc
Exists in master and in 2 other branches dev, luanping

增加自动建档生成初检记录功能

Showing 1 changed file with 10 additions and 9 deletions

platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/RemoteController.java View file @ de05cea
... ... @@ -369,7 +369,7 @@
369 369 List<ArchiveData> list = archiveDataServicer.query(query.convertToQuery());
370 370 if (CollectionUtils.isNotEmpty(list)) {
371 371 Map map = JsonUtil.str2Obj(list.get(0).getJsonData(), HashMap.class);
372   - Map<String, Object> history = (Map<String, Object>) map.get("history");
  372 + Map<String, Object> history = JsonUtil.str2Obj(map.get("history").toString(),Map.class) ;
373 373  
374 374 PatientsQuery patientsQuery = new PatientsQuery();
375 375 patientsQuery.setYn(YnEnums.YES.getId());
376 376  
... ... @@ -388,13 +388,14 @@
388 388 antExcAddRequest.setcDueWeek(cDueWeek);
389 389  
390 390 if (history.get("bp") != null) {
391   - antExcAddRequest.setBp((Map) history.get("bp"));
  391 + String bp = history.get("bp").toString();
  392 + antExcAddRequest.setBp(JsonUtil.str2Obj(bp,Map.class) );
392 393 }
393 394 // 既往史
394 395 if (history.get("pastHistory") != null) {
395 396 String pastHistory = history.get("pastHistory").toString();
396 397 if (StringUtils.isNotEmpty(pastHistory)) {
397   - HashMap pastHistoryMap = JsonUtil.jkstr2Obj(pastHistory, HashMap.class);
  398 + Map pastHistoryMap = JsonUtil.jkstr2Obj(pastHistory, Map.class);
398 399 antExcAddRequest.setPastHistory(pastHistoryMap);
399 400 }
400 401 }
... ... @@ -402,7 +403,7 @@
402 403 if (history.get("familyHistory") != null) {
403 404 String familyHistory = history.get("familyHistory").toString();
404 405 if (StringUtils.isNotEmpty(familyHistory)) {
405   - HashMap familyHistoryMap = JsonUtil.jkstr2Obj(familyHistory, HashMap.class);
  406 + Map familyHistoryMap = JsonUtil.jkstr2Obj(familyHistory, Map.class);
406 407 antExcAddRequest.setFamilyHistory(familyHistoryMap);
407 408 }
408 409 }
... ... @@ -410,7 +411,7 @@
410 411 if (history.get("personalHistory") != null) {
411 412 String personalHistory = history.get("personalHistory").toString();
412 413 if (StringUtils.isNotEmpty(personalHistory)) {
413   - HashMap personalHistoryMap = JsonUtil.jkstr2Obj(personalHistory, HashMap.class);
  414 + Map personalHistoryMap = JsonUtil.jkstr2Obj(personalHistory, Map.class);
414 415 antExcAddRequest.setPersonalHistory(personalHistoryMap);
415 416 }
416 417 }
... ... @@ -418,7 +419,7 @@
418 419 if (history.get("fksxHistory") != null) {
419 420 String fksxHistory = history.get("fksxHistory").toString();
420 421 if (StringUtils.isNotEmpty(fksxHistory)) {
421   - HashMap fksxHistoryMap = JsonUtil.jkstr2Obj(fksxHistory, HashMap.class);
  422 + Map fksxHistoryMap = JsonUtil.jkstr2Obj(fksxHistory, Map.class);
422 423 antExcAddRequest.setFksxHistory(fksxHistoryMap);
423 424 }
424 425 }
... ... @@ -426,7 +427,7 @@
426 427 if (history.get("cestationInfo") != null) {
427 428 String cestationInfo = history.get("cestationInfo").toString();
428 429 if (StringUtils.isNotEmpty(cestationInfo)) {
429   - HashMap cestationInfoMap = JsonUtil.jkstr2Obj(cestationInfo, HashMap.class);
  430 + Map cestationInfoMap = JsonUtil.jkstr2Obj(cestationInfo, Map.class);
430 431 antExcAddRequest.setCestationInfo(cestationInfoMap);
431 432 }
432 433 }
... ... @@ -434,7 +435,7 @@
434 435 if (history.get("ysfyHistory") != null) {
435 436 String ysfyHistory = history.get("ysfyHistory").toString();
436 437 if (StringUtils.isNotEmpty(ysfyHistory)) {
437   - HashMap ysfyHistoryMap = JsonUtil.jkstr2Obj(ysfyHistory, HashMap.class);
  438 + Map ysfyHistoryMap = JsonUtil.jkstr2Obj(ysfyHistory, Map.class);
438 439 antExcAddRequest.setYsfyHistory(ysfyHistoryMap);
439 440 }
440 441 }
... ... @@ -442,7 +443,7 @@
442 443 if (history.get("infectDiseases") != null) {
443 444 String infectDiseases = history.get("infectDiseases").toString();
444 445 if (StringUtils.isNotEmpty(infectDiseases)) {
445   - HashMap infectDiseasesMap = JsonUtil.jkstr2Obj(infectDiseases, HashMap.class);
  446 + Map infectDiseasesMap = JsonUtil.jkstr2Obj(infectDiseases, Map.class);
446 447 antExcAddRequest.setInfectDiseases(infectDiseasesMap);
447 448 }
448 449 }