Browse Source

标签删除查体模板关联提示

wangyu 5 years atrás
parent
commit
30c3978293

+ 24 - 0
icssman-service/src/main/java/com/diagbot/facade/QuestionFacade.java

@@ -37,6 +37,7 @@ import com.diagbot.util.RespDTOUtil;
 import com.diagbot.util.StringUtil;
 import com.diagbot.util.UserUtils;
 import com.diagbot.vo.ConceptExistVO;
+import com.diagbot.vo.ConceptSearchVO;
 import com.diagbot.vo.DeleteQuestionVO;
 import com.diagbot.vo.GetQuestionIdsByTypeVO;
 import com.diagbot.vo.GetQuestionInfoVO;
@@ -95,6 +96,8 @@ public class QuestionFacade extends QuestionInfoServiceImpl {
     KnowledgemanServiceClient knowledgemanServiceClient;
     @Autowired
     CacheFacade cacheFacade;
+    @Autowired
+    private KnowledgemanServiceClient klmServiceClient;
 
 
 
@@ -525,6 +528,27 @@ public class QuestionFacade extends QuestionInfoServiceImpl {
                 throw new CommonException(CommonErrorCode.SERVER_IS_ERROR,
                         getQuestiongAndModuleRelationsDTO.getRelationInfos().toString());
             }
+            //查体模板
+            QueryWrapper<DeptVital> deptVitalQueryWrapper = new QueryWrapper<>();
+            deptVitalQueryWrapper.in("vital_id", Arrays.asList(ids.split(","))).
+                    eq("is_deleted", IsDeleteEnum.N.getKey());
+            List<DeptVital> deptVitals = deptVitalFacade.list(deptVitalQueryWrapper);
+            if (ListUtil.isNotEmpty(deptVitals)) {
+                //科室信息
+                List<Long> deptIds = deptVitals.stream().map(deptVitalDTO -> deptVitalDTO.getDeptId()).collect(Collectors.toList());
+                ConceptSearchVO conceptSearchVO = new ConceptSearchVO();
+                conceptSearchVO.setConceptIds(deptIds);
+                RespDTO<Map<Long, String>> deptMap = klmServiceClient.getConceptMap(conceptSearchVO);
+                Map<Long, String> depts = deptMap.data;
+                //输入内容
+                StringBuffer sb = new StringBuffer();
+                sb.append("请先删除科室查体模板关联中的对应标签:");
+                for (DeptVital deptVital : deptVitals) {
+                    sb.append("【" + depts.get(deptVital.getDeptId()) + "】").append("<br/>");
+                }
+                throw new CommonException(CommonErrorCode.SERVER_IS_ERROR,
+                        sb.toString());
+            }
             //删除自身
             this.deleteByIds(paramMap);
             //删除明细

+ 2 - 0
precman-service/src/main/java/com/diagbot/vo/QuestionPageVO.java

@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import lombok.Getter;
 import lombok.Setter;
 
+import javax.validation.constraints.NotNull;
 import java.util.List;
 
 /**
@@ -20,6 +21,7 @@ public class QuestionPageVO extends Page {
     private List<Integer> tagTypeList;
     private List<Integer> controlTypeList;
     private List<Integer> notTypeList;
+    @NotNull(message = "调用类型不能为空:(1.独立填写单 2.组合填写单)")
     private Integer callType;//调用类型(1.独立填写单 2.组合填写单)
     private String combinationName;//组合项名称
     private String name;//界面名称

+ 2 - 1
precman-service/src/main/java/com/diagbot/web/QuestionInfoController.java

@@ -23,6 +23,7 @@ import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
+import javax.validation.Valid;
 import java.util.List;
 import java.util.Map;
 
@@ -58,7 +59,7 @@ public class QuestionInfoController {
             notes = "")
     @PostMapping("/page")
     @SysLogger("page")
-    public RespDTO<IPage<QuestionPageDTO>> list(@RequestBody QuestionPageVO questionPageVO) {
+    public RespDTO<IPage<QuestionPageDTO>> list(@RequestBody @Valid QuestionPageVO questionPageVO) {
         IPage<QuestionPageDTO> data = questionFacade.getListFac(questionPageVO);
         return RespDTO.onSuc(data);
     }