删除业务

config-server/src/main/resources/shared/knowledgeman-service-dev.yml

@@ -83,7 +83,7 @@ mybatis-plus:
       #主键类型  0:"数据库ID自增", 1:"用户输入ID",2:"全局唯一ID (数字类型唯一ID)", 3:"全局唯一ID UUID";
       id-type: id_worker
       #字段策略 0:"忽略判断",1:"非 NULL 判断"),2:"非空判断"
-      field-strategy: not_empty
+      field-strategy: 1
       #驼峰下划线转换
       column-underline: true
       #数据库大写下划线转换

config-server/src/main/resources/shared/knowledgeman-service-local.yml

@@ -83,7 +83,7 @@ mybatis-plus:
       #主键类型  0:"数据库ID自增", 1:"用户输入ID",2:"全局唯一ID (数字类型唯一ID)", 3:"全局唯一ID UUID";
       id-type: id_worker
       #字段策略 0:"忽略判断",1:"非 NULL 判断"),2:"非空判断"
-      field-strategy: not_empty
+      field-strategy: 1
       #驼峰下划线转换
       column-underline: true
       #数据库大写下划线转换

config-server/src/main/resources/shared/knowledgeman-service-pro.yml

@@ -83,7 +83,7 @@ mybatis-plus:
       #主键类型  0:"数据库ID自增", 1:"用户输入ID",2:"全局唯一ID (数字类型唯一ID)", 3:"全局唯一ID UUID";
       id-type: id_worker
       #字段策略 0:"忽略判断",1:"非 NULL 判断"),2:"非空判断"
-      field-strategy: not_empty
+      field-strategy: 1
       #驼峰下划线转换
       column-underline: true
       #数据库大写下划线转换

config-server/src/main/resources/shared/knowledgeman-service-test.yml

@@ -83,7 +83,7 @@ mybatis-plus:
       #主键类型  0:"数据库ID自增", 1:"用户输入ID",2:"全局唯一ID (数字类型唯一ID)", 3:"全局唯一ID UUID";
       id-type: id_worker
       #字段策略 0:"忽略判断",1:"非 NULL 判断"),2:"非空判断"
-      field-strategy: not_empty
+      field-strategy: 1
       #驼峰下划线转换
       column-underline: true
       #数据库大写下划线转换

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

@@ -27,6 +27,7 @@ import com.diagbot.exception.CommonErrorCode;
 import com.diagbot.exception.CommonException;
 import com.diagbot.service.DiagnoseDetailService;
 import com.diagbot.service.DiagnoseQuestionService;
+import com.diagbot.service.DiagnoseService;
 import com.diagbot.service.impl.DiagnoseServiceImpl;
 import com.diagbot.util.BeanUtil;
 import com.diagbot.util.DateUtil;
@@ -59,6 +60,9 @@ public class DiagnoseFacade extends DiagnoseServiceImpl {
     @Autowired
     ConceptFacade conceptFacade;
     @Autowired
+    @Qualifier("diagnoseServiceImpl")
+    DiagnoseService diagnoseService;
+    @Autowired
     @Qualifier("diagnoseDetailServiceImpl")
     DiagnoseDetailService diagnoseDetailService;
     @Autowired
@@ -263,10 +267,12 @@ public class DiagnoseFacade extends DiagnoseServiceImpl {
                         if (StringUtil.isNotEmpty(bean.getCode())) {
                             flag = VerifyUtil.verifyCode(String.valueOf(bean.getType()), bean.getCode());
                             if (!flag) {
-                                bean.setVerifyCode(String.valueOf(HasQuestionEnum.HAS_QUESTION.getKey()));
+                                bean.setVerifyCode(bean.getCode());
                                 DiagnoseQuestion diagnoseQuestion = createDiagnoseQuestion(bean.getDiagnoseId(), bean.getDisName(), bean.getType(),
-                                        bean.getCode(), DiagnoseFieldEnum.code.getKey(), initCommonParam(), ++j);
+                                        bean.getCode(), DiagnoseFieldEnum.code.getKey(), param, ++j);
                                 diagnoseQuestionList.add(diagnoseQuestion);
+                            } else {
+                                bean.setVerifyCode(""); // 将原值清空
                             }
                         }
 
@@ -275,26 +281,36 @@ public class DiagnoseFacade extends DiagnoseServiceImpl {
                             typeList = DiagnoseTypeConvertUtil.diagnoseType2LibType(bean.getType(), DiagnoseFieldEnum.standard.getKey());
                             flag = verifyExist(libraryForDiagnoseDTOS, bean.getStandard(), typeList);
                             if (!flag) {
-                                bean.setVerifyStandard(String.valueOf(HasQuestionEnum.HAS_QUESTION.getKey()));
+                                bean.setVerifyStandard(String.valueOf(bean.getStandard()));
                                 DiagnoseQuestion diagnoseQuestion = createDiagnoseQuestion(bean.getDiagnoseId(), bean.getDisName(), bean.getType(),
-                                        bean.getStandard(), DiagnoseFieldEnum.standard.getKey(), initCommonParam(), ++j);
+                                        bean.getStandard(), DiagnoseFieldEnum.standard.getKey(), param, ++j);
                                 diagnoseQuestionList.add(diagnoseQuestion);
+                            } else {
+                                bean.setVerifyStandard(""); // 将原值清空
                             }
                         }
 
                         // 校验关联词
                         if (StringUtil.isNotEmpty(bean.getRelation())) {
                             String[] arr = bean.getRelation().split("、");
+                            StringBuffer sb = new StringBuffer();
                             for (String s : arr) {
                                 typeList = DiagnoseTypeConvertUtil.diagnoseType2LibType(bean.getType(), DiagnoseFieldEnum.relation.getKey());
                                 flag = verifyExist(libraryForDiagnoseDTOS, s.trim(), typeList);
                                 if (!flag) {
-                                    bean.setVerifyRelation(String.valueOf(HasQuestionEnum.HAS_QUESTION.getKey()));
+                                    sb.append(s).append("、");
+                                    bean.setVerifyRelation(bean.getRelation());
                                     DiagnoseQuestion diagnoseQuestion = createDiagnoseQuestion(bean.getDiagnoseId(), bean.getDisName(), bean.getType(),
-                                            s.trim(), DiagnoseFieldEnum.relation.getKey(), initCommonParam(), ++j);
+                                            s.trim(), DiagnoseFieldEnum.relation.getKey(), param, ++j);
                                     diagnoseQuestionList.add(diagnoseQuestion);
                                 }
                             }
+                            String errWord = sb.toString();
+                            if (StringUtil.isNotEmpty(errWord)) {
+                                bean.setVerifyRelation(errWord.substring(0, errWord.length()-1));
+                            } else {
+                                bean.setVerifyRelation(""); // 将原值清空
+                            }
                         }
 
                         // 校验结果
@@ -302,10 +318,12 @@ public class DiagnoseFacade extends DiagnoseServiceImpl {
                             typeList = DiagnoseTypeConvertUtil.diagnoseType2LibType(bean.getType(), DiagnoseFieldEnum.result.getKey());
                             flag = verifyExist(libraryForDiagnoseDTOS, bean.getResult(), typeList);
                             if (!flag) {
-                                bean.setVerifyResult(String.valueOf(HasQuestionEnum.HAS_QUESTION.getKey()));
+                                bean.setVerifyResult(bean.getResult());
                                 DiagnoseQuestion diagnoseQuestion = createDiagnoseQuestion(bean.getDiagnoseId(), bean.getDisName(), bean.getType(),
-                                        bean.getStandard(), DiagnoseFieldEnum.standard.getKey(), initCommonParam(), ++j);
+                                        bean.getStandard(), DiagnoseFieldEnum.standard.getKey(), param, ++j);
                                 diagnoseQuestionList.add(diagnoseQuestion);
+                            } else {
+                                bean.setVerifyResult(""); // 将原值清空
                             }
                         }
                     }
@@ -337,13 +355,10 @@ public class DiagnoseFacade extends DiagnoseServiceImpl {
             }
         }
         // 更新主表信息
-        this.saveOrUpdateBatch(diagnoseListWithDB);
+        diagnoseService.saveOrUpdateBatch(diagnoseListWithDB);
     }
 
 
-
-
-
     /**
      *  处理诊断特征业务（校验诊断名称|编码|标准词|关联词|结果）
      *
@@ -381,9 +396,9 @@ public class DiagnoseFacade extends DiagnoseServiceImpl {
             if (StringUtil.isNotEmpty(bean.getCode())) {
                 flag = VerifyUtil.verifyCode(String.valueOf(bean.getType()), bean.getCode());
                 if (!flag) {
-                    diagnoseDetail.setVerifyCode(String.valueOf(HasQuestionEnum.HAS_QUESTION.getKey()));
+                    diagnoseDetail.setVerifyCode(bean.getCode());
                     DiagnoseQuestion diagnoseQuestion = createDiagnoseQuestion(diagnoseWrapper.getId(), diagnoseWrapper.getDisName(), bean.getType(),
-                            bean.getCode(), DiagnoseFieldEnum.code.getKey(), initCommonParam(), ++j);
+                            bean.getCode(), DiagnoseFieldEnum.code.getKey(), param, ++j);
                     diagnoseQuestionList.add(diagnoseQuestion);
                 }
             }
@@ -393,9 +408,9 @@ public class DiagnoseFacade extends DiagnoseServiceImpl {
                 typeList = DiagnoseTypeConvertUtil.diagnoseType2LibType(bean.getType(), DiagnoseFieldEnum.standard.getKey());
                 flag = verifyExist(libraryForDiagnoseDTOS, bean.getStandard(), typeList);
                 if (!flag) {
-                    diagnoseDetail.setVerifyStandard(String.valueOf(HasQuestionEnum.HAS_QUESTION.getKey()));
+                    diagnoseDetail.setVerifyStandard(bean.getStandard());
                     DiagnoseQuestion diagnoseQuestion = createDiagnoseQuestion(diagnoseWrapper.getId(), diagnoseWrapper.getDisName(), bean.getType(),
-                            bean.getStandard(), DiagnoseFieldEnum.standard.getKey(), initCommonParam(), ++j);
+                            bean.getStandard(), DiagnoseFieldEnum.standard.getKey(), param, ++j);
                     diagnoseQuestionList.add(diagnoseQuestion);
                 }
             }
@@ -403,16 +418,21 @@ public class DiagnoseFacade extends DiagnoseServiceImpl {
             // 校验关联词
             if (StringUtil.isNotEmpty(bean.getRelation())) {
                 String[] arr = bean.getRelation().split("、");
+                StringBuffer sb = new StringBuffer();
                 for (String s : arr) {
                     typeList = DiagnoseTypeConvertUtil.diagnoseType2LibType(bean.getType(), DiagnoseFieldEnum.relation.getKey());
                     flag = verifyExist(libraryForDiagnoseDTOS, s.trim(), typeList);
                     if (!flag) {
-                        diagnoseDetail.setVerifyRelation(String.valueOf(HasQuestionEnum.HAS_QUESTION.getKey()));
+                        sb.append(s).append("、");
                         DiagnoseQuestion diagnoseQuestion = createDiagnoseQuestion(diagnoseWrapper.getId(), diagnoseWrapper.getDisName(), bean.getType(),
-                                s.trim(), DiagnoseFieldEnum.relation.getKey(), initCommonParam(), ++j);
+                                s.trim(), DiagnoseFieldEnum.relation.getKey(), param, ++j);
                         diagnoseQuestionList.add(diagnoseQuestion);
                     }
                 }
+                String errWord = sb.toString();
+                if (StringUtil.isNotEmpty(errWord)) {
+                    diagnoseDetail.setVerifyRelation(errWord.substring(0, errWord.length()-1));
+                }
             }
 
             // 校验结果
@@ -420,9 +440,9 @@ public class DiagnoseFacade extends DiagnoseServiceImpl {
                 typeList = DiagnoseTypeConvertUtil.diagnoseType2LibType(bean.getType(), DiagnoseFieldEnum.result.getKey());
                 flag = verifyExist(libraryForDiagnoseDTOS, bean.getResult(), typeList);
                 if (!flag) {
-                    diagnoseDetail.setVerifyResult(String.valueOf(HasQuestionEnum.HAS_QUESTION.getKey()));
+                    diagnoseDetail.setVerifyResult(bean.getResult());
                     DiagnoseQuestion diagnoseQuestion = createDiagnoseQuestion(diagnoseWrapper.getId(), diagnoseWrapper.getDisName(), bean.getType(),
-                            bean.getStandard(), DiagnoseFieldEnum.standard.getKey(), initCommonParam(), ++j);
+                            bean.getStandard(), DiagnoseFieldEnum.standard.getKey(), param, ++j);
                     diagnoseQuestionList.add(diagnoseQuestion);
                 }
             }

knowledgeman-service/src/main/java/com/diagbot/vo/DeleteDiagnoseVO.java

@@ -27,13 +27,8 @@ public class DeleteDiagnoseVO {
     private String isDeleted;
 
     @ApiModelProperty("删除备注")
-    @NotBlank(message="备注不能为空")
     private String remark;
 
-    @ApiModelProperty("诊断名称")
-    @NotBlank(message="诊断名称不能为空")
-    private String disName;
-
     @ApiModelProperty("修改人")
     @NotBlank(message="修改人不能为空")
     private String modifier;

knowledgeman-service/src/main/java/com/diagbot/vo/DiagnosePageVO.java

@@ -23,7 +23,7 @@ public class DiagnosePageVO extends Page implements Serializable {
 
     private static final long serialVersionUID = 1L;
 
-    @ApiModelProperty(value = "修改人姓名")
+    @ApiModelProperty(value = "修改人")
     private String modifier;
 
     @ApiModelProperty(value = "诊断名称")

knowledgeman-service/src/main/java/com/diagbot/vo/DiagnoseVerifyVO.java

@@ -1,11 +1,11 @@
 package com.diagbot.vo;
 
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Getter;
 import lombok.Setter;
 
+import javax.validation.constraints.NotBlank;
 import java.io.Serializable;
 
 /**
@@ -19,11 +19,12 @@ import java.io.Serializable;
 @Getter
 @Setter
 @ApiModel
-public class DiagnoseVerifyVO extends Page implements Serializable {
+public class DiagnoseVerifyVO implements Serializable {
 
     private static final long serialVersionUID = 1L;
 
-    @ApiModelProperty(value = "修改人姓名")
+    @ApiModelProperty("修改人")
+    @NotBlank(message="修改人不能为空")
     private String modifier;
 
 }