Browse Source

fix:
修改了一些bug

18339543638 1 year ago
parent
commit
76815e5a90

+ 12 - 0
nb-service/web-service/src/main/java/com/nb/web/service/bus/controller/BusHospitalConfigController.java

@@ -16,6 +16,8 @@ import org.springframework.web.bind.annotation.*;
 
 import java.util.Arrays;
 import java.util.List;
+import java.util.concurrent.ExecutionException;
+import java.util.concurrent.TimeoutException;
 
 /**
  * @author lifang
@@ -56,6 +58,16 @@ public class BusHospitalConfigController extends BaseCrudController<BusHospitalC
         }
     }
 
+    @PostMapping("/look/reset/{type}")
+    @ApiOperation(value = "查询某一功能项的默认配置",notes = "权限【无】")
+    public R<BusHospitalConfigEntity> lookReset(@RequestAttribute("tenantId")String tenantId,@PathVariable("type") int type) throws InterruptedException, ExecutionException, TimeoutException {
+        ConfigEnum configEnum = ConfigEnum.valueOf(type);
+        if(configEnum==null){
+            throw new CustomException("无此配置项");
+        }
+        return R.success(hospitalConfigService.getDefaultConfig(configEnum));
+    }
+
     @PostMapping("/reset/{type}")
     @SaCheckPermission("hospital:config:edit")
     @ApiOperation(value = "将某一功能项改为默认配置",notes = "权限【hospital:config:edit】")

+ 16 - 2
nb-service/web-service/src/main/java/com/nb/web/service/bus/service/LocalBusFormulaService.java

@@ -1,5 +1,8 @@
 package com.nb.web.service.bus.service;
 
+import cn.hutool.core.util.ObjectUtil;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.nb.core.exception.CustomException;
 import com.nb.web.service.bus.entity.BusFormulaEntity;
 import com.nb.web.service.bus.mapper.BusFormulaMapper;
 import com.nb.common.crud.BaseService;
@@ -16,12 +19,23 @@ import org.springframework.stereotype.Service;
 public class LocalBusFormulaService extends BaseService<BusFormulaMapper, BusFormulaEntity,String> {
     @Override
     public void validateBeforeSave(BusFormulaEntity entity) {
-
+        BusFormulaEntity source = this.baseMapper.selectOne(new LambdaQueryWrapper<BusFormulaEntity>()
+                .eq(BusFormulaEntity::getName, entity.getName())
+                .last("limit 1"));
+        if(ObjectUtil.isNotNull(source)){
+            throw new CustomException("配方名称不能重复");
+        }
     }
 
     @Override
     public void validateBeforeUpdate(BusFormulaEntity entity) {
-
+        BusFormulaEntity source = this.baseMapper.selectOne(new LambdaQueryWrapper<BusFormulaEntity>()
+                .eq(BusFormulaEntity::getName, entity.getName())
+                .ne(BusFormulaEntity::getId,entity.getId())
+                .last("limit 1"));
+        if(ObjectUtil.isNotNull(source)){
+            throw new CustomException("配方名称不能重复");
+        }
     }
 
     @Override

+ 2 - 2
nb-service/web-service/src/main/java/com/nb/web/service/bus/stats/analyse/EvalStatsAnalyse.java

@@ -378,7 +378,7 @@ public class EvalStatsAnalyse implements CommonStats<CombineEvalResult> {
         }
 
         if (Boolean.TRUE.equals(evalConfig.getCalm())) {
-            LineResult<BigDecimal> clamLine = LineResult.of("clamLine",false,false,"镇静评分评分走势图");
+            LineResult<BigDecimal> clamLine = LineResult.of("clamLine",false,false,"镇静评分走势图");
             handleMixPolyLines(groupByTime,clamLine,
                     evalResult -> evalResult.getCalm()!=null,
                     evalResult -> BigDecimal.valueOf(evalResult.getCalm()));
@@ -470,7 +470,7 @@ public class EvalStatsAnalyse implements CommonStats<CombineEvalResult> {
 
 
         if (Boolean.TRUE.equals(evalConfig.getHoarseness())) {
-            LineResult<BigDecimal> hoarsenessLine =  LineResult.of("hoarsenessLine",false,false,"眩晕评分走势图");
+            LineResult<BigDecimal> hoarsenessLine =  LineResult.of("hoarsenessLine",false,false,"声音嘶哑评分走势图");
             handleMixPolyLines(groupByTime,hoarsenessLine,
                     evalResult -> evalResult.getHoarseness()!=null,
                     evalResult -> BigDecimal.valueOf(evalResult.getHoarseness()));