Merge remote-tracking branch 'origin/develop' into develop

openhis-server-new/openhis-application/src/main/java/com/openhis/web/triageandqueuemanage/appservice/CallNumberVoiceConfigAppService.java

@@ -7,4 +7,6 @@ public interface CallNumberVoiceConfigAppService {
     R<?> addCallNumberVoiceConfig(CallNumberVoiceConfig callNumberVoiceConfig);
 
     R<?> updateCallNumberVoiceConfig(CallNumberVoiceConfig callNumberVoiceConfig);
+
+    R<?> getCallNumberVoiceConfig();
 }

openhis-server-new/openhis-application/src/main/java/com/openhis/web/triageandqueuemanage/appservice/impl/CallNumberVoiceConfigAppServiceImpl.java

@@ -8,6 +8,7 @@ import com.openhis.web.triageandqueuemanage.appservice.CallNumberVoiceConfigAppS
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
+import java.util.List;
 
 @Service
 public class CallNumberVoiceConfigAppServiceImpl implements CallNumberVoiceConfigAppService {
@@ -15,6 +16,12 @@ public class CallNumberVoiceConfigAppServiceImpl implements CallNumberVoiceConfi
     @Resource
     private CallNumberVoiceConfigService callNumberVoiceConfigService;
 
+    @Override
+    public R<?> getCallNumberVoiceConfig() {
+        List<CallNumberVoiceConfig> list = callNumberVoiceConfigService.list();
+        return R.ok(list);
+    }
+
     @Override
     public R<?> addCallNumberVoiceConfig(CallNumberVoiceConfig callNumberVoiceConfig) {
         if(ObjectUtil.isNull(callNumberVoiceConfig)){
@@ -32,4 +39,5 @@ public class CallNumberVoiceConfigAppServiceImpl implements CallNumberVoiceConfi
         boolean updateById = callNumberVoiceConfigService.updateById(callNumberVoiceConfig);
         return R.ok(updateById);
     }
+
 }

openhis-server-new/openhis-application/src/main/java/com/openhis/web/triageandqueuemanage/controller/CallNumberVoiceConfigController.java

@@ -16,6 +16,16 @@ public class CallNumberVoiceConfigController {
     @Resource
     private CallNumberVoiceConfigAppService callNumberVoiceConfigAppService;
 
+    /**
+     * 查询叫号语音设置
+     *
+     * @return 结果
+     */
+    @GetMapping("/get")
+    public R<?> getCallNumberVoiceConfig(){
+        return R.ok(callNumberVoiceConfigAppService.getCallNumberVoiceConfig());
+    }
+
     /**
      * 新增叫号语音设置实体
      *