全部校验

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

@@ -354,7 +354,7 @@ public class DiagnoseFacade extends DiagnoseServiceImpl {
             for (String key : map.keySet()) {
                 List<DiagnoseDetail> detail = map.get(key);
                 List<String> codeList = detail.stream().map(row -> row.getCode()).distinct().collect(Collectors.toList());
-                codeList.add("拟诊");
+                codeList.add("拟诊"); // 公式校验手动添加拟诊文字
                 int j = 0;
                 if (ListUtil.isNotEmpty(detail)) {
                     // 判断诊断名称是否在词库中
@@ -390,7 +390,7 @@ public class DiagnoseFacade extends DiagnoseServiceImpl {
                                 if (!flag) {
                                     bean.setVerifyCode(bean.getCode());
                                     diagnoseName.add(bean.getDisName());
-                                    // TODO 不需要添加问题词
+                                    // 不需要添加问题词
 //                                    DiagnoseQuestion diagnoseQuestion = createDiagnoseQuestion(bean.getDiagnoseId(), bean.getDisName(), bean.getType(),
 //                                            bean.getCode(), DiagnoseFieldEnum.code.getKey(), param, ++j);
 //                                    diagnoseQuestionList.add(diagnoseQuestion);
@@ -428,8 +428,8 @@ public class DiagnoseFacade extends DiagnoseServiceImpl {
                                 String oldVerifyRelation = bean.getVerifyRelation();
                                 String[] arr = bean.getRelation().split("、");
                                 StringBuffer sb = new StringBuffer();
+                                typeList = DiagnoseTypeConvertUtil.diagnoseType2LibType(bean.getType(), DiagnoseFieldEnum.relation.getKey());
                                 for (String s : arr) {
-                                    typeList = DiagnoseTypeConvertUtil.diagnoseType2LibType(bean.getType(), DiagnoseFieldEnum.relation.getKey());
                                     flag = verifyExist(libSet, s.trim(), typeList);
                                     if (!flag) {
                                         sb.append(s).append("、");
@@ -452,19 +452,19 @@ public class DiagnoseFacade extends DiagnoseServiceImpl {
                                 }
                             }
 
-                            // 校验公表
-                            if (StringUtil.isNotEmpty(bean.getUniqueName())) {
+                            // 校验公表，不需要插入问题词
+                            if (DiagnoseFeatureTypeEnum.Lis.getKey() == bean.getType()) {
                                 String oldVerifyUnique = bean.getVerifyUnique();
-                                if (!lisMappingSet.contains(bean.getStandard() + "__" + bean.getRelation() + "__" + bean.getUniqueName())) {
+                                if (StringUtil.isNotEmpty(bean.getUniqueName())) { // 公表项数据不为空
+                                    if (!lisMappingSet.contains(bean.getStandard() + "__" + bean.getRelation() + "__" + bean.getUniqueName())) {
+                                        bean.setVerifyUnique("无公表项");
+                                        diagnoseName.add(bean.getDisName());
+                                    } else {
+                                        bean.setVerifyUnique(""); // 将原值清空
+                                    }
+                                } else { // 公表项数据为空
                                     bean.setVerifyUnique("无公表项");
-//                                    DiagnoseQuestion diagnoseQuestion = createDiagnoseQuestion(bean.getDiagnoseId(), bean.getDisName(), bean.getType(),
-//                                            bean.getStandard(), DiagnoseFieldEnum.standard.getKey(), param, ++j);
-//                                    if (addDiagnoseQuestion(diagnosetQuestionSet, diagnoseQuestion)) {
-//                                        diagnoseQuestionList.add(diagnoseQuestion);
-//                                    }
                                     diagnoseName.add(bean.getDisName());
-                                } else {
-                                    bean.setVerifyUnique(""); // 将原值清空
                                 }
                                 if (!oldVerifyUnique.equals(bean.getVerifyUnique())) {
                                     updateFlag = true;
@@ -476,8 +476,8 @@ public class DiagnoseFacade extends DiagnoseServiceImpl {
                                 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) {
-                                    typeList = DiagnoseTypeConvertUtil.diagnoseType2LibType(bean.getType(), DiagnoseFieldEnum.result.getKey());
                                     flag = verifyExist(libSet, s.trim(), typeList);
                                     if (!flag) {
                                         sb.append(s).append("、");

knowledgeman-service/src/main/java/com/diagbot/service/LisMappingService.java

@@ -47,7 +47,6 @@ public interface LisMappingService extends IService<LisMapping> {
      * @return 返回公表项内容，格式：套餐__明细__公表项
      */
     public Set<String> loadLisMapping();
-}
 
     /**
      * 获取化验公表映射