Переглянути джерело

结果一列不需要校验,代码注释

zhoutg 5 роки тому
батько
коміт
4e18f8b346

+ 56 - 56
knowledgeman-service/src/main/java/com/diagbot/facade/DiagnoseFacade.java

@@ -545,37 +545,37 @@ public class DiagnoseFacade extends DiagnoseServiceImpl {
                                 }
                             }
 
-                            // 校验结果
-                            if (StringUtil.isNotEmpty(bean.getResult())) {
-                                String oldVerifyResult = bean.getVerifyResult();
-                                String[] arr = bean.getResult().split("、");
-                                StringBuffer sb = new StringBuffer();
-                                typeList = DiagnoseTypeConvertUtil.diagnoseType2LibType(bean.getType(),
-                                        DiagnoseFieldEnum.result.getKey());
-                                for (String s : arr) {
-                                    flag = verifyExist(libSet, s.trim(), typeList);
-                                    if (!flag) {
-                                        sb.append(s).append("、");
-                                        DiagnoseQuestion diagnoseQuestion = createDiagnoseQuestion(bean.getDiagnoseId(),
-                                                bean.getDisName(), bean.getType(), s.trim(),
-                                                DiagnoseFieldEnum.result.getKey(), param, ++j);
-                                        if (addDiagnoseQuestion(diagnosetQuestionSet, diagnoseQuestion)) {
-                                            diagnoseQuestionList.add(diagnoseQuestion);
-                                        }
-                                        diagnoseName.add(bean.getDisName());
-                                    }
-                                }
-                                String errWord = sb.toString();
-                                if (StringUtil.isNotEmpty(errWord)) {
-                                    bean.setVerifyResult(errWord.substring(0, errWord.length() - 1));
-                                } else {
-                                    bean.setVerifyResult(""); // 将原值清空
-                                }
-
-                                if (!oldVerifyResult.equals(bean.getVerifyResult())) {
-                                    updateFlag = true;
-                                }
-                            }
+                            // 校验结果 2019/10/16 需求确认,不需要校验结果,代码注释
+//                            if (StringUtil.isNotEmpty(bean.getResult())) {
+//                                String oldVerifyResult = bean.getVerifyResult();
+//                                String[] arr = bean.getResult().split("、");
+//                                StringBuffer sb = new StringBuffer();
+//                                typeList = DiagnoseTypeConvertUtil.diagnoseType2LibType(bean.getType(),
+//                                        DiagnoseFieldEnum.result.getKey());
+//                                for (String s : arr) {
+//                                    flag = verifyExist(libSet, s.trim(), typeList);
+//                                    if (!flag) {
+//                                        sb.append(s).append("、");
+//                                        DiagnoseQuestion diagnoseQuestion = createDiagnoseQuestion(bean.getDiagnoseId(),
+//                                                bean.getDisName(), bean.getType(), s.trim(),
+//                                                DiagnoseFieldEnum.result.getKey(), param, ++j);
+//                                        if (addDiagnoseQuestion(diagnosetQuestionSet, diagnoseQuestion)) {
+//                                            diagnoseQuestionList.add(diagnoseQuestion);
+//                                        }
+//                                        diagnoseName.add(bean.getDisName());
+//                                    }
+//                                }
+//                                String errWord = sb.toString();
+//                                if (StringUtil.isNotEmpty(errWord)) {
+//                                    bean.setVerifyResult(errWord.substring(0, errWord.length() - 1));
+//                                } else {
+//                                    bean.setVerifyResult(""); // 将原值清空
+//                                }
+//
+//                                if (!oldVerifyResult.equals(bean.getVerifyResult())) {
+//                                    updateFlag = true;
+//                                }
+//                            }
                         }
                         if (updateFlag) {
                             diagnoseDetailList.add(bean);
@@ -796,31 +796,31 @@ public class DiagnoseFacade extends DiagnoseServiceImpl {
                 }
             }
 
-            // 校验结果
-            if (StringUtil.isNotEmpty(bean.getResult())) {
-                String[] arr = bean.getResult().split("、");
-                StringBuffer sb = new StringBuffer();
-                typeList = DiagnoseTypeConvertUtil.diagnoseType2LibType(bean.getType(),
-                        DiagnoseFieldEnum.result.getKey());
-                for (String s : arr) {
-                    flag = verifyExist(set, s.trim(), typeList);
-                    if (!flag) {
-                        sb.append(s).append("、");
-                        DiagnoseQuestion diagnoseQuestion = createDiagnoseQuestion(diagnoseWrapper.getId(),
-                                diagnoseWrapper.getDisName(), bean.getType(), s.trim(),
-                                DiagnoseFieldEnum.result.getKey(), param, ++j);
-                        if (addDiagnoseQuestion(questionSet, diagnoseQuestion)) {
-                            diagnoseQuestionList.add(diagnoseQuestion);
-                        }
-                    }
-                }
-                String errWord = sb.toString();
-                if (StringUtil.isNotEmpty(errWord)) {
-                    diagnoseDetail.setVerifyResult(errWord.substring(0, errWord.length() - 1));
-                } else {
-                    diagnoseDetail.setVerifyResult(""); // 将原值清空
-                }
-            }
+            // 校验结果 2019/10/16 需求确认,不需要校验结果,代码注释
+//            if (StringUtil.isNotEmpty(bean.getResult())) {
+//                String[] arr = bean.getResult().split("、");
+//                StringBuffer sb = new StringBuffer();
+//                typeList = DiagnoseTypeConvertUtil.diagnoseType2LibType(bean.getType(),
+//                        DiagnoseFieldEnum.result.getKey());
+//                for (String s : arr) {
+//                    flag = verifyExist(set, s.trim(), typeList);
+//                    if (!flag) {
+//                        sb.append(s).append("、");
+//                        DiagnoseQuestion diagnoseQuestion = createDiagnoseQuestion(diagnoseWrapper.getId(),
+//                                diagnoseWrapper.getDisName(), bean.getType(), s.trim(),
+//                                DiagnoseFieldEnum.result.getKey(), param, ++j);
+//                        if (addDiagnoseQuestion(questionSet, diagnoseQuestion)) {
+//                            diagnoseQuestionList.add(diagnoseQuestion);
+//                        }
+//                    }
+//                }
+//                String errWord = sb.toString();
+//                if (StringUtil.isNotEmpty(errWord)) {
+//                    diagnoseDetail.setVerifyResult(errWord.substring(0, errWord.length() - 1));
+//                } else {
+//                    diagnoseDetail.setVerifyResult(""); // 将原值清空
+//                }
+//            }
             diagnoseDetailList.add(diagnoseDetail);
         }
         param.setI(i);