Commit a84a411d36a28236b3d8cda40c835e59037b0fec
1 parent
7898789b79
Exists in
master
and in
6 other branches
产前诊断
Showing 2 changed files with 30 additions and 4 deletions
platform-dal/src/main/java/com/lyms/platform/pojo/DiagnosisModel.java
View file @
a84a411
| ... | ... | @@ -431,7 +431,11 @@ |
| 431 | 431 | map.put("resultDate",DateUtil.getyyyy_MM_dd(resultDate)); |
| 432 | 432 | map.put("CsStatus",CsStatus); |
| 433 | 433 | map.put("tireNumber",tireNumber); |
| 434 | - map.put("sieveProject",sieveProject.toString()); | |
| 434 | + if(sieveProject != null && sieveProject.size() > 0){ | |
| 435 | + map.put("sieveProject",sieveProject.toString()); | |
| 436 | + } | |
| 437 | + map.put("ztfeText",ztfeText); | |
| 438 | + map.put("refStatus",refStatus); | |
| 435 | 439 | return map; |
| 436 | 440 | } |
| 437 | 441 | } |
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/DiagnosisFacaed.java
View file @
a84a411
| ... | ... | @@ -145,9 +145,9 @@ |
| 145 | 145 | }else{ |
| 146 | 146 | if(1 == sieveModel.getStatus()){//未筛查 |
| 147 | 147 | diagnosisResult.setIsCqSieve("0"); |
| 148 | - }else if(2 == sieveModel.getStatus()){//已筛查 | |
| 148 | + }else if(2 == sieveModel.getStatus()){//筛查中 | |
| 149 | 149 | diagnosisResult.setIsCqSieve("2"); |
| 150 | - }else if(3 == sieveModel.getStatus()){//筛查中 | |
| 150 | + }else if(3 == sieveModel.getStatus()){//已产筛 | |
| 151 | 151 | diagnosisResult.setIsCqSieve("1"); |
| 152 | 152 | } |
| 153 | 153 | } |
| ... | ... | @@ -483,7 +483,14 @@ |
| 483 | 483 | diagnosisModel.setTireNumber(sieveModel.getTireNumber().toString()); |
| 484 | 484 | } |
| 485 | 485 | if(null != sieveModel.getStatus()){ |
| 486 | - diagnosisModel.setCsStatus(sieveModel.getStatus().toString()); | |
| 486 | + if(1 == sieveModel.getStatus()){ | |
| 487 | + diagnosisModel.setCsStatus("0"); | |
| 488 | + }else if(2 == sieveModel.getStatus()){ | |
| 489 | + diagnosisModel.setCsStatus("2"); | |
| 490 | + }else if(3 == sieveModel.getStatus()){ | |
| 491 | + diagnosisModel.setCsStatus("1"); | |
| 492 | + } | |
| 493 | + //diagnosisModel.setCsStatus(sieveModel.getStatus().toString()); | |
| 487 | 494 | } |
| 488 | 495 | if(null != sieveModel.getZtfx()){ |
| 489 | 496 | if (0 == sieveModel.getZtfx()) { |
| ... | ... | @@ -498,6 +505,21 @@ |
| 498 | 505 | diagnosisModel.setZtfx("2"); |
| 499 | 506 | diagnosisModel.setZtfeText("高风险"); |
| 500 | 507 | } |
| 508 | + | |
| 509 | + //产筛项目 | |
| 510 | + SieveApplyOrderQuery sieveApplyOrderQuery = new SieveApplyOrderQuery(); | |
| 511 | + sieveApplyOrderQuery.setParentId(patients.getId()); | |
| 512 | + sieveApplyOrderQuery.setYn(YnEnums.YES.getId()); | |
| 513 | + List<SieveApplyOrderModel> applyOrderModels = applyOrderService.querySieveApplyOrderWithQuery(sieveApplyOrderQuery); | |
| 514 | + List sList = new ArrayList(); | |
| 515 | + if(applyOrderModels != null && applyOrderModels.size() > 0){ | |
| 516 | + SieveApplyOrderModel sieveAppModel = applyOrderModels.get(0); | |
| 517 | + if (StringUtils.isNotEmpty(sieveAppModel.getCheckItem())) { | |
| 518 | + sList = JsonUtil.jkstr2Obj(sieveAppModel.getCheckItem(), List.class); | |
| 519 | + } | |
| 520 | + } | |
| 521 | + diagnosisModel.setSieveProject(sList); | |
| 522 | + | |
| 501 | 523 | } |
| 502 | 524 | |
| 503 | 525 | } |