Commit a88914aa53e0b70278501bcdfadac9fdaa950dbd
1 parent
de05cea058
Exists in
master
and in
2 other branches
增加自动建档生成初检记录功能
Showing 1 changed file with 10 additions and 10 deletions
platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/RemoteController.java
View file @
a88914a
| ... | ... | @@ -388,12 +388,12 @@ |
| 388 | 388 | antExcAddRequest.setcDueWeek(cDueWeek); |
| 389 | 389 | |
| 390 | 390 | if (history.get("bp") != null) { |
| 391 | - String bp = history.get("bp").toString(); | |
| 392 | - antExcAddRequest.setBp(JsonUtil.str2Obj(bp,Map.class) ); | |
| 391 | + String bp = JsonUtil.obj2JsonString(history.get("bp")); | |
| 392 | + antExcAddRequest.setBp(JsonUtil.str2Obj(bp, Map.class)); | |
| 393 | 393 | } |
| 394 | 394 | // 既往史 |
| 395 | 395 | if (history.get("pastHistory") != null) { |
| 396 | - String pastHistory = history.get("pastHistory").toString(); | |
| 396 | + String pastHistory = JsonUtil.obj2JsonString(history.get("pastHistory")); | |
| 397 | 397 | if (StringUtils.isNotEmpty(pastHistory)) { |
| 398 | 398 | Map pastHistoryMap = JsonUtil.jkstr2Obj(pastHistory, Map.class); |
| 399 | 399 | antExcAddRequest.setPastHistory(pastHistoryMap); |
| ... | ... | @@ -401,7 +401,7 @@ |
| 401 | 401 | } |
| 402 | 402 | // 家族史 |
| 403 | 403 | if (history.get("familyHistory") != null) { |
| 404 | - String familyHistory = history.get("familyHistory").toString(); | |
| 404 | + String familyHistory = JsonUtil.obj2JsonString(history.get("familyHistory")); | |
| 405 | 405 | if (StringUtils.isNotEmpty(familyHistory)) { |
| 406 | 406 | Map familyHistoryMap = JsonUtil.jkstr2Obj(familyHistory, Map.class); |
| 407 | 407 | antExcAddRequest.setFamilyHistory(familyHistoryMap); |
| ... | ... | @@ -409,7 +409,7 @@ |
| 409 | 409 | } |
| 410 | 410 | //个人史 |
| 411 | 411 | if (history.get("personalHistory") != null) { |
| 412 | - String personalHistory = history.get("personalHistory").toString(); | |
| 412 | + String personalHistory = JsonUtil.obj2JsonString(history.get("personalHistory")); | |
| 413 | 413 | if (StringUtils.isNotEmpty(personalHistory)) { |
| 414 | 414 | Map personalHistoryMap = JsonUtil.jkstr2Obj(personalHistory, Map.class); |
| 415 | 415 | antExcAddRequest.setPersonalHistory(personalHistoryMap); |
| ... | ... | @@ -417,7 +417,7 @@ |
| 417 | 417 | } |
| 418 | 418 | //妇科手术史 |
| 419 | 419 | if (history.get("fksxHistory") != null) { |
| 420 | - String fksxHistory = history.get("fksxHistory").toString(); | |
| 420 | + String fksxHistory = JsonUtil.obj2JsonString(history.get("fksxHistory")); | |
| 421 | 421 | if (StringUtils.isNotEmpty(fksxHistory)) { |
| 422 | 422 | Map fksxHistoryMap = JsonUtil.jkstr2Obj(fksxHistory, Map.class); |
| 423 | 423 | antExcAddRequest.setFksxHistory(fksxHistoryMap); |
| ... | ... | @@ -425,7 +425,7 @@ |
| 425 | 425 | } |
| 426 | 426 | //本次妊娠情况 |
| 427 | 427 | if (history.get("cestationInfo") != null) { |
| 428 | - String cestationInfo = history.get("cestationInfo").toString(); | |
| 428 | + String cestationInfo = JsonUtil.obj2JsonString(history.get("cestationInfo")); | |
| 429 | 429 | if (StringUtils.isNotEmpty(cestationInfo)) { |
| 430 | 430 | Map cestationInfoMap = JsonUtil.jkstr2Obj(cestationInfo, Map.class); |
| 431 | 431 | antExcAddRequest.setCestationInfo(cestationInfoMap); |
| ... | ... | @@ -433,7 +433,7 @@ |
| 433 | 433 | } |
| 434 | 434 | //叶酸服用情况 |
| 435 | 435 | if (history.get("ysfyHistory") != null) { |
| 436 | - String ysfyHistory = history.get("ysfyHistory").toString(); | |
| 436 | + String ysfyHistory = JsonUtil.obj2JsonString(history.get("ysfyHistory")); | |
| 437 | 437 | if (StringUtils.isNotEmpty(ysfyHistory)) { |
| 438 | 438 | Map ysfyHistoryMap = JsonUtil.jkstr2Obj(ysfyHistory, Map.class); |
| 439 | 439 | antExcAddRequest.setYsfyHistory(ysfyHistoryMap); |
| ... | ... | @@ -441,7 +441,7 @@ |
| 441 | 441 | } |
| 442 | 442 | //传染病史 |
| 443 | 443 | if (history.get("infectDiseases") != null) { |
| 444 | - String infectDiseases = history.get("infectDiseases").toString(); | |
| 444 | + String infectDiseases = JsonUtil.obj2JsonString(history.get("infectDiseases")); | |
| 445 | 445 | if (StringUtils.isNotEmpty(infectDiseases)) { |
| 446 | 446 | Map infectDiseasesMap = JsonUtil.jkstr2Obj(infectDiseases, Map.class); |
| 447 | 447 | antExcAddRequest.setInfectDiseases(infectDiseasesMap); |
| ... | ... | @@ -498,7 +498,6 @@ |
| 498 | 498 | } |
| 499 | 499 | if (history.get("height") != null) { |
| 500 | 500 | antExcAddRequest.setHeight(history.get("height").toString()); |
| 501 | - | |
| 502 | 501 | } |
| 503 | 502 | if (StringUtils.isNotEmpty(antExcAddRequest.getWeight()) && StringUtils.isNotEmpty(antExcAddRequest.getHeight())) { |
| 504 | 503 | Double wh = Double.parseDouble(antExcAddRequest.getHeight()) / 100; |
| ... | ... | @@ -529,6 +528,7 @@ |
| 529 | 528 | } |
| 530 | 529 | }).start(); |
| 531 | 530 | |
| 531 | + System.out.println("confirmArchive return :"+JsonUtil.obj2JsonString(baseObjectResponse)); | |
| 532 | 532 | if(baseObjectResponse.getErrorcode()==ErrorCodeConstants.SUCCESS){ |
| 533 | 533 | writeString(response,"success"); |
| 534 | 534 | return; |