add

mqtt信息发送

nb-service/app-doctor/src/main/java/com/nb/app/doctor/controller/EvalController.java

@@ -6,11 +6,11 @@ import com.nb.app.assistant.api.entity.AssistantEvalEntity;
 import com.nb.app.assistant.api.feign.IAssistantEvalClient;
 import com.nb.app.doctor.controller.vo.MonitorEvalVo;
 import com.nb.app.doctor.enums.EvalEnum;
-import com.nb.core.annotation.Log;
 import com.nb.core.entity.GenericEntity;
-import com.nb.core.enums.UserPlatformEnum;
 import com.nb.core.result.R;
+import com.nb.web.api.dto.EvalBatchDTO;
 import com.nb.web.api.entity.BusEvaluationEntity;
+import com.nb.web.api.entity.BusHospitalConfigEntity;
 import com.nb.web.api.feign.IClinicEvalClient;
 import com.nb.web.api.feign.IHospitalConfigClient;
 import io.swagger.annotations.Api;
@@ -22,6 +22,7 @@ import org.springframework.web.bind.annotation.*;
 
 import java.util.LinkedList;
 import java.util.List;
+import java.util.Optional;
 
 /**
  * @author lifang
@@ -76,8 +77,13 @@ public class EvalController {
 
     @PostMapping("/config/{tenantId}")
     @ApiOperation("获取评价信息配置项")
-    @Log(title = "患者端获取评价信息配置项",userPlatform= UserPlatformEnum.APP_DOCTOR)
-    public R config(@PathVariable("tenantId") String tenantId){
-        return R.success(configClient.getEvalConfig(tenantId));
+    public R<BusHospitalConfigEntity> config(@PathVariable("tenantId") String tenantId){
+        return R.success(Optional.ofNullable(configClient.getEvalConfig(tenantId)).orElse(new BusHospitalConfigEntity()));
+    }
+
+    @PostMapping("/batch")
+    @ApiOperation(value = "批量新增评价信息")
+    public R<Boolean> batchAdd(@RequestBody @Validated EvalBatchDTO evaluations) {
+        return R.success(clinicEvalClient.saveBatchEval(evaluations));
     }
 }

nb-service/app-doctor/src/main/java/com/nb/app/doctor/controller/UserController.java

@@ -32,8 +32,8 @@ public class UserController {
     @PostMapping("/consult/{userId}")
     @ApiOperation("查询医生咨询设置")
     public R<AppUserConsultConfigEntity> getConsultConfig(@PathVariable("userId") String userId){
-        return R.success(consultConfigService.getOne(new QueryWrapper<AppUserConsultConfigEntity>().lambda()
-                .eq(AppUserConsultConfigEntity::getUserId,userId)));
+        return R.success(Optional.ofNullable(consultConfigService.getOne(new QueryWrapper<AppUserConsultConfigEntity>().lambda()
+                .eq(AppUserConsultConfigEntity::getUserId,userId))).orElse(new AppUserConsultConfigEntity()));
     }
 
     @PostMapping("/consult/edit")

nb-service/web-service/src/main/java/com/nb/web/service/bus/service/LocalBusEvaluationService.java

@@ -178,6 +178,7 @@ public class LocalBusEvaluationService extends BaseService<BusEvaluationMapper,
             BusClinicEntity clinic = clinicService.getById(clinicId);
             clinic.setLastBadEval(adverseReactions);
             clinic.setEvalTime(Optional.ofNullable(entity.getEvaluateTime()).orElse(new Date()));
+            clinic.setAbnormal(StrUtil.isNotEmpty(adverseReactions));
             clinicService.updateById(clinic);
             if(CharSequenceUtil.isNotBlank(entity.getPatientId())){
                 wsPublishUtils.publishPatientMonitor(entity.getPatientId(),entity.getTenantId());