Merge remote-tracking branch 'origin/master'

src/main/java/com/diagbot/config/ResourceServerConfigurer.java

@@ -46,7 +46,7 @@ public class ResourceServerConfigurer extends ResourceServerConfigurerAdapter {
                 .antMatchers("/sys/disclaimerInfo/getDisclaimerInfo").permitAll()
                 .antMatchers("/sys/mr/createMr").permitAll()
                 .antMatchers("/sys/mr/getMr").permitAll()
-                .antMatchers("/sysPlan/getSysPlanInfoDatas").permitAll()
+                .antMatchers("/sys/sysPlan/getSysPlanInfoDatas").permitAll()
                 .antMatchers("/**").authenticated();
 //                .antMatchers("/**").permitAll();
     }

src/main/java/com/diagbot/config/security/UrlAccessDecisionManager.java

@@ -89,7 +89,7 @@ public class UrlAccessDecisionManager implements AccessDecisionManager {
                 || matchers("/sys/disclaimerInfo/getDisclaimerInfo", request)
                 || matchers("/sys/mr/createMr", request)
                 || matchers("/sys/mr/getMr", request)
-                 || matchers("/sysPlan/getSysPlanInfoDatas", request)
+                 || matchers("/sys/sysPlan/getSysPlanInfoDatas", request)
                 || matchers("/", request)) {
             return true;
         }

src/main/java/com/diagbot/facade/SysPlanFacade.java

@@ -30,23 +30,37 @@ public class SysPlanFacade extends SysPlanServiceImpl {
     SysSetFacade sysSetFacade;
 
     public SysPlanInfoDTO getSysPlanInfoData(HospitalPlanVO hospitalPlanVO) {
+        //查询该医院有没有相关方案配置， 要是没有取默认的
         SysPlanInfoDTO sysPlanInfoDTO = new SysPlanInfoDTO();
         QueryWrapper<SysPlan> sysPlanInfo = new QueryWrapper<>();
         sysPlanInfo.eq("is_deleted", IsDeleteEnum.N.getKey());
         sysPlanInfo.eq("hospital_id", hospitalPlanVO.getHospitalId());
-        sysPlanInfo.eq(StringUtil.isNotBlank(hospitalPlanVO.getPlanCode()),"plan_code", hospitalPlanVO.getPlanCode());
+        sysPlanInfo.eq(StringUtil.isNotBlank(hospitalPlanVO.getPlanCode()), "plan_code", hospitalPlanVO.getPlanCode());
         sysPlanInfo.eq("plan_status", StatusEnum.Enable.getKey());
         SysPlan sysPlanInfoData = getOne(sysPlanInfo, false);
-        BeanUtil.copyProperties(sysPlanInfoData,sysPlanInfoDTO);
-        if(sysPlanInfoDTO!=null){
-            Long planId = sysPlanInfoDTO.getId();
-            HospitalSetVO hospitalSetVO = new HospitalSetVO();
-            hospitalSetVO.setHospitalId(hospitalPlanVO.getHospitalId());
-            hospitalSetVO.setPlanId(planId);
-            List<SysSetInfoDTO> sysSetInfoData = sysSetFacade.getSysSetInfoData(hospitalSetVO);
-            sysPlanInfoDTO.setSysSetInfo(sysSetInfoData);
+        Long planId = -1L;
+        Long hospitalId = hospitalPlanVO.getHospitalId();
+        if (sysPlanInfoData != null) {
+            BeanUtil.copyProperties(sysPlanInfoData, sysPlanInfoDTO);
+            planId = sysPlanInfoDTO.getId();
+        } else {
+            QueryWrapper<SysPlan> sysPlandefault = new QueryWrapper<>();
+            sysPlandefault.eq("is_deleted", IsDeleteEnum.N.getKey());
+            sysPlandefault.eq("hospital_id", -1);
+            sysPlandefault.eq(StringUtil.isNotBlank(hospitalPlanVO.getPlanCode()), "plan_code", hospitalPlanVO.getPlanCode());
+            sysPlandefault.eq("plan_status", StatusEnum.Enable.getKey());
+            SysPlan sysPlandefaultData = getOne(sysPlandefault, false);
+            if (sysPlandefaultData != null) {
+                planId = sysPlandefaultData.getId();
+                hospitalId = sysPlandefaultData.getHospitalId();
+                BeanUtil.copyProperties(sysPlandefaultData, sysPlanInfoDTO);
+            }
         }
-
-      return sysPlanInfoDTO;
+        HospitalSetVO hospitalSetVO = new HospitalSetVO();
+        hospitalSetVO.setHospitalId(hospitalId);
+        hospitalSetVO.setPlanId(planId);
+        List<SysSetInfoDTO> sysSetInfoData = sysSetFacade.getSysSetInfoData(hospitalSetVO);
+        sysPlanInfoDTO.setSysSetInfo(sysSetInfoData);
+        return sysPlanInfoDTO;
     }
 }

src/main/java/com/diagbot/vo/HospitalPlanVO.java

@@ -3,6 +3,9 @@ package com.diagbot.vo;
 import lombok.Getter;
 import lombok.Setter;
 
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
+
 /**
  * @author wangfeng
  * @Description:
@@ -12,6 +15,7 @@ import lombok.Setter;
 @Getter
 public class HospitalPlanVO {
 
+    @NotNull(message = "请输入医院id")
     private Long hospitalId;
     /**
      * 方案编号

src/main/java/com/diagbot/vo/HospitalSetVO.java

@@ -3,6 +3,8 @@ package com.diagbot.vo;
 import lombok.Getter;
 import lombok.Setter;
 
+import javax.validation.constraints.NotNull;
+
 /**
  * @author wangfeng
  * @Description:
@@ -11,6 +13,7 @@ import lombok.Setter;
 @Setter
 @Getter
 public class HospitalSetVO {
+    @NotNull(message = "请输入医院id")
     private Long hospitalId;
     private Long planId;
     private String code;

src/main/java/com/diagbot/web/SysPlanController.java

@@ -31,7 +31,7 @@ import java.util.List;
  * @since 2020-07-27
  */
 @RestController
-@RequestMapping("/sysPlan")
+@RequestMapping("/sys/sysPlan")
 @Api(value = "方案配置信息API", tags = { "方案配置信息API" })
 @SuppressWarnings("unchecked")
 public class SysPlanController {
@@ -39,7 +39,7 @@ public class SysPlanController {
     SysPlanFacade sysPlanFacade;
 
 
-    @ApiOperation(value = "根据医院编码获取配置信息[by:wangfeng]", notes = "hospitalCode ：医院code  必填<br> ")
+    @ApiOperation(value = "根据医院获取方案配置信息[by:wangfeng]", notes = "hospitalid ：医院id  必填<br> ")
     @PostMapping("/getSysPlanInfoDatas")
     @SysLogger("getSysPlanInfoDatas")
     public RespDTO<SysPlanInfoDTO> getSysPlanInfoDatas(@Valid @RequestBody HospitalPlanVO hospitalPlanVO) {

src/main/java/com/diagbot/web/SysSetController.java

@@ -28,7 +28,7 @@ import java.util.List;
  * @since 2020-07-27
  */
 @RestController
-@RequestMapping("/sysSet")
+@RequestMapping("/sys/sysSet")
 @Api(value = "配置信息API", tags = { "配置信息API" })
 @SuppressWarnings("unchecked")
 public class SysSetController {
@@ -36,7 +36,7 @@ public class SysSetController {
     SysSetFacade sysSetFacade;
 
 
-    @ApiOperation(value = "根据医院编码获取配置信息[by:wangfeng]", notes = "hospitalCode ：医院code  必填<br> ")
+    @ApiOperation(value = "根据医院编码获取配置信息[by:wangfeng]", notes = "hospitalId ：医院id  必填<br> ")
     @PostMapping("/getSysSetInfoDatas")
     @SysLogger("getSysSetInfoDatas")
     public RespDTO<List<SysSetInfoDTO>> getSysSetInfoDatas(@Valid @RequestBody HospitalSetVO hospitalSetVO) {