Commit 162856dd17013e5a5bd14c29bec4058f3cc1e03c
1 parent
04c7336200
Exists in
master
and in
6 other branches
产前诊断
Showing 1 changed file with 10 additions and 3 deletions
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/DiagnosisFacaed.java
View file @
162856d
| ... | ... | @@ -114,8 +114,15 @@ |
| 114 | 114 | List<SieveModel> list = sieveService.queryList1(sieveQuery, "order"); |
| 115 | 115 | if(list != null && list.size() > 0){ |
| 116 | 116 | SieveModel sieveModel = list.get(0); |
| 117 | + if(1 == sieveModel.getStatus()){//未筛查 | |
| 118 | + diagnosisResult.setIsCqSieve("0"); | |
| 119 | + }else if(2 == sieveModel.getStatus()){//筛查中 | |
| 120 | + diagnosisResult.setIsCqSieve("2"); | |
| 121 | + }else if(3 == sieveModel.getStatus()){//已产筛 | |
| 122 | + diagnosisResult.setIsCqSieve("1"); | |
| 123 | + } | |
| 117 | 124 | if(!"-".equals(sieveModel.getZtfx())) { |
| 118 | - diagnosisResult.setIsCqSieve("1");//已筛查 | |
| 125 | + //diagnosisResult.setIsCqSieve("1");//已筛查 | |
| 119 | 126 | SieveApplyOrderQuery sieveApplyOrderQuery = new SieveApplyOrderQuery(); |
| 120 | 127 | sieveApplyOrderQuery.setParentId(pat.getId()); |
| 121 | 128 | sieveApplyOrderQuery.setYn(YnEnums.YES.getId()); |
| 122 | 129 | |
| ... | ... | @@ -143,13 +150,13 @@ |
| 143 | 150 | } |
| 144 | 151 | } |
| 145 | 152 | }else{ |
| 146 | - if(1 == sieveModel.getStatus()){//未筛查 | |
| 153 | + /*if(1 == sieveModel.getStatus()){//未筛查 | |
| 147 | 154 | diagnosisResult.setIsCqSieve("0"); |
| 148 | 155 | }else if(2 == sieveModel.getStatus()){//筛查中 |
| 149 | 156 | diagnosisResult.setIsCqSieve("2"); |
| 150 | 157 | }else if(3 == sieveModel.getStatus()){//已产筛 |
| 151 | 158 | diagnosisResult.setIsCqSieve("1"); |
| 152 | - } | |
| 159 | + }*/ | |
| 153 | 160 | } |
| 154 | 161 | }else{ |
| 155 | 162 | diagnosisResult.setIsCqSieve("0");//未筛查 |