diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/DiagnosisFacaed.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/DiagnosisFacaed.java index a200d5a..0d02c31 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/DiagnosisFacaed.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/DiagnosisFacaed.java @@ -114,8 +114,15 @@ public class DiagnosisFacaed { List list = sieveService.queryList1(sieveQuery, "order"); if(list != null && list.size() > 0){ SieveModel sieveModel = list.get(0); + if(1 == sieveModel.getStatus()){//未筛查 + diagnosisResult.setIsCqSieve("0"); + }else if(2 == sieveModel.getStatus()){//筛查中 + diagnosisResult.setIsCqSieve("2"); + }else if(3 == sieveModel.getStatus()){//已产筛 + diagnosisResult.setIsCqSieve("1"); + } if(!"-".equals(sieveModel.getZtfx())) { - diagnosisResult.setIsCqSieve("1");//已筛查 + //diagnosisResult.setIsCqSieve("1");//已筛查 SieveApplyOrderQuery sieveApplyOrderQuery = new SieveApplyOrderQuery(); sieveApplyOrderQuery.setParentId(pat.getId()); sieveApplyOrderQuery.setYn(YnEnums.YES.getId()); @@ -143,13 +150,13 @@ public class DiagnosisFacaed { } } }else{ - if(1 == sieveModel.getStatus()){//未筛查 + /*if(1 == sieveModel.getStatus()){//未筛查 diagnosisResult.setIsCqSieve("0"); }else if(2 == sieveModel.getStatus()){//筛查中 diagnosisResult.setIsCqSieve("2"); }else if(3 == sieveModel.getStatus()){//已产筛 diagnosisResult.setIsCqSieve("1"); - } + }*/ } }else{ diagnosisResult.setIsCqSieve("0");//未筛查