add 输注历史排序

nb-service/web-service/src/main/java/com/nb/web/service/bus/entity/BusHospitalConfigEntity.java → nb-service-api/web-service-api/src/main/java/com/nb/web/api/entity/BusHospitalConfigEntity.java

@@ -1,9 +1,9 @@
-package com.nb.web.service.bus.entity;
+package com.nb.web.api.entity;
 
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.baomidou.mybatisplus.extension.handlers.FastjsonTypeHandler;
-import com.nb.web.service.bus.enums.ConfigEnum;
+import com.nb.web.api.enums.ConfigEnum;
 import com.nb.core.entity.TenantGenericEntity;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;

nb-service/web-service/src/main/java/com/nb/web/service/bus/enums/ConfigEnum.java → nb-service-api/web-service-api/src/main/java/com/nb/web/api/enums/ConfigEnum.java

@@ -1,4 +1,4 @@
-package com.nb.web.service.bus.enums;
+package com.nb.web.api.enums;
 
 import com.baomidou.mybatisplus.annotation.IEnum;
 import lombok.AllArgsConstructor;

nb-service-api/web-service-api/src/main/java/com/nb/web/api/feign/IHospitalConfigClient.java

@@ -0,0 +1,14 @@
+package com.nb.web.api.feign;
+
+import com.nb.web.api.entity.BusHospitalConfigEntity;
+
+/**
+ * @author lifang
+ * @version 1.0.0
+ * @ClassName IHospitalConfigClient.java
+ * @Description
+ * @createTime 2022年08月24日 16:38:00
+ */
+public interface IHospitalConfigClient {
+    BusHospitalConfigEntity getEvalConfig(String hospitalId);
+}

nb-service/app-assistant/src/main/java/com/nb/app/assistant/controller/AssistantEvalController.java

@@ -6,6 +6,8 @@ import com.nb.app.assistant.service.LocalAssistantEvalService;
 import com.nb.common.crud.BaseService;
 import com.nb.core.entity.GenericEntity;
 import com.nb.core.result.R;
+import com.nb.web.api.entity.BusHospitalConfigEntity;
+import com.nb.web.api.feign.IHospitalConfigClient;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.AllArgsConstructor;
@@ -30,9 +32,11 @@ import org.springframework.web.bind.annotation.RestController;
 @Slf4j
 public class AssistantEvalController  extends AppAssistantBaseCrudController<AssistantEvalEntity,String> {
     private final LocalAssistantEvalService assistantEvalService;
+
     @Override
     public BaseService getService() {
         return assistantEvalService;
     }
 
+
 }

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

@@ -10,6 +10,7 @@ import com.nb.core.entity.GenericEntity;
 import com.nb.core.result.R;
 import com.nb.web.api.entity.BusEvaluationEntity;
 import com.nb.web.api.feign.IClinicEvalClient;
+import com.nb.web.api.feign.IHospitalConfigClient;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.AllArgsConstructor;
@@ -37,6 +38,7 @@ public class EvalController {
 
     private final IClinicEvalClient clinicEvalClient;
     private final IAssistantEvalClient assistantEvalClient;
+    private final IHospitalConfigClient configClient;
 
     @PostMapping("/list/{clinicId}")
     @ApiOperation(value = "临床评价查询",notes = "包含了医生评价和患者自评，请根据返回集合结果中的evalType字段进行判定")
@@ -70,4 +72,10 @@ public class EvalController {
     public R add(@PathVariable("clinicId") String  clinicId) {
         return R.success(assistantEvalClient.getLastEval(clinicId));
     }
+
+    @PostMapping("/config/{tenantId}")
+    @ApiOperation("获取评价信息配置项")
+    public R config(@PathVariable("tenantId") String tenantId){
+        return R.success(configClient.getEvalConfig(tenantId));
+    }
 }

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

@@ -2,8 +2,8 @@ package com.nb.web.service.bus.controller;
 
 import cn.dev33.satoken.annotation.SaCheckPermission;
 import com.baomidou.mybatisplus.core.mapper.Mapper;
-import com.nb.web.service.bus.entity.BusHospitalConfigEntity;
-import com.nb.web.service.bus.enums.ConfigEnum;
+import com.nb.web.api.entity.BusHospitalConfigEntity;
+import com.nb.web.api.enums.ConfigEnum;
 import com.nb.web.service.bus.service.LocalBusHospitalConfigService;
 import com.nb.common.crud.BaseService;
 import com.nb.common.crud.controller.BaseCrudController;

nb-service/web-service/src/main/java/com/nb/web/service/bus/hospital/HospitalManager.java

@@ -7,6 +7,7 @@ import cn.hutool.json.JSONUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.nb.web.api.bean.Script;
+import com.nb.web.api.entity.BusHospitalConfigEntity;
 import com.nb.web.api.entity.BusInfusionHistoryEntity;
 import com.nb.web.service.bus.entity.*;
 import com.nb.web.service.bus.hospital.config.*;

nb-service/web-service/src/main/java/com/nb/web/service/bus/mapper/BusHospitalConfigMapper.java

@@ -1,7 +1,7 @@
 package com.nb.web.service.bus.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.nb.web.service.bus.entity.BusHospitalConfigEntity;
+import com.nb.web.api.entity.BusHospitalConfigEntity;
 import org.apache.ibatis.annotations.Mapper;
 
 /**

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

@@ -4,9 +4,10 @@ import cn.hutool.core.util.StrUtil;
 import cn.hutool.json.JSONUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.nb.web.api.entity.common.BusDeviceRunningEntity;
-import com.nb.web.service.bus.entity.BusHospitalConfigEntity;
+import com.nb.web.api.entity.BusHospitalConfigEntity;
+import com.nb.web.api.feign.IHospitalConfigClient;
 import com.nb.web.service.bus.entity.BusPatientEntity;
-import com.nb.web.service.bus.enums.ConfigEnum;
+import com.nb.web.api.enums.ConfigEnum;
 import com.nb.web.service.bus.hospital.HospitalManager;
 import com.nb.web.service.bus.hospital.HospitalManagerRegister;
 import com.nb.web.service.bus.hospital.config.bean.*;
@@ -34,7 +35,7 @@ import java.util.concurrent.TimeoutException;
  * @createTime 2022年03月19日 09:27:00
  */
 @Service
-public class LocalBusHospitalConfigService extends BaseService<BusHospitalConfigMapper, BusHospitalConfigEntity,String> {
+public class LocalBusHospitalConfigService extends BaseService<BusHospitalConfigMapper, BusHospitalConfigEntity,String> implements IHospitalConfigClient {
     @Autowired
     @Lazy
     private HospitalManagerRegister managerRegister;
@@ -222,4 +223,13 @@ public class LocalBusHospitalConfigService extends BaseService<BusHospitalConfig
                     }
                 });
     }
+
+    @Override
+    public BusHospitalConfigEntity getEvalConfig(String hospitalId) {
+        return this.getOne(new QueryWrapper<BusHospitalConfigEntity>()
+                .lambda()
+                .eq(BusHospitalConfigEntity::getTenantId,hospitalId)
+                .eq(BusHospitalConfigEntity::getType,ConfigEnum.eval)
+                .last("limit 1"));
+    }
 }

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

@@ -9,8 +9,8 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.IdWorker;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.nb.auth.utils.SecurityUtil;
-import com.nb.core.Constants;
 import com.nb.web.api.bean.GeoPoint;
+import com.nb.web.api.entity.BusHospitalConfigEntity;
 import com.nb.web.api.feign.IHospitalClient;
 import com.nb.web.api.feign.result.HospitalResult;
 import com.nb.web.service.bus.entity.*;

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

@@ -5,8 +5,8 @@ import cn.hutool.core.collection.CollectionUtil;
 import cn.hutool.core.util.StrUtil;
 import cn.hutool.json.JSONUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.nb.web.service.bus.entity.BusHospitalConfigEntity;
-import com.nb.web.service.bus.enums.ConfigEnum;
+import com.nb.web.api.entity.BusHospitalConfigEntity;
+import com.nb.web.api.enums.ConfigEnum;
 import com.nb.web.service.bus.enums.StatsAnalyseEnum;
 import com.nb.web.service.bus.enums.StatsTimeUnit;
 import com.nb.web.service.bus.hospital.config.bean.FunctionEvalConfig;