gaodm 4 年 前
コミット
8f6bc7c26c

+ 1 - 0
src/main/java/com/diagbot/config/ResourceServerConfigurer.java

@@ -84,6 +84,7 @@ public class ResourceServerConfigurer extends ResourceServerConfigurerAdapter {
                 .antMatchers("/tran/operationConfig/exportExcel").permitAll()
                 .antMatchers("/tran/hospitalInfo/saveRecord").permitAll()
                 .antMatchers("/tran/hospitalInfo/getHospitalInfo").permitAll()
+                .antMatchers("/tran/hospitalInfo/getHospitalInfoById").permitAll()
                 .antMatchers("/sys/versionInfo/getVersionInfoAlls").permitAll()
                 .antMatchers("/sys/disclaimerInfo/getDisclaimerInfo").permitAll()
                 .antMatchers("/sys/mr/createMr").permitAll()

+ 1 - 0
src/main/java/com/diagbot/config/security/UrlAccessDecisionManager.java

@@ -127,6 +127,7 @@ public class UrlAccessDecisionManager implements AccessDecisionManager {
                 || matchers("/tran/operationConfig/exportExcel", request)
                 || matchers("/tran/hospitalInfo/saveRecord", request)
                 || matchers("/tran/hospitalInfo/getHospitalInfo", request)
+                || matchers("/tran/hospitalInfo/getHospitalInfoById", request)
                 || matchers("/sys/versionInfo/getVersionInfoAlls", request)
                 || matchers("/sys/disclaimerInfo/getDisclaimerInfo", request)
                 || matchers("/sys/mr/createMr", request)

+ 0 - 9
src/main/java/com/diagbot/dto/HospitalInfoDTO.java

@@ -41,15 +41,6 @@ public class HospitalInfoDTO {
      */
     private Integer connect;
 
-    /**
-     * 化验导入方式
-     */
-    private Integer importWayLis;
-
-    /**
-     * 辅检导入方式
-     */
-    private Integer importWayPacs;
     /**
      * 备注
      */

+ 2 - 2
src/main/java/com/diagbot/facade/HospitalInfoFacade.java

@@ -31,10 +31,10 @@ public class HospitalInfoFacade extends HospitalInfoServiceImpl {
      * @param hospitalInfoVO
      * @return
      */
-    public HospitalInfoDTO getHospitalInfo(HospitalInfoVO hospitalInfoVO) {
+    public HospitalInfoDTO getHospitalInfoById(HospitalInfoVO hospitalInfoVO) {
         QueryWrapper<HospitalInfo> queryWrapper = new QueryWrapper<HospitalInfo>();
         queryWrapper.eq("is_deleted", IsDeleteEnum.N.getKey())
-                .eq("code", hospitalInfoVO.getCode());
+                .eq("id", hospitalInfoVO.getId());
         HospitalInfo datas = this.getOne(queryWrapper, false);
         HospitalInfoDTO data = new HospitalInfoDTO();
         BeanUtil.copyProperties(datas, data);

+ 5 - 5
src/main/java/com/diagbot/vo/HospitalInfoVO.java

@@ -19,9 +19,9 @@ public class HospitalInfoVO {
      */
     private Long id;
 
-    /**
-     * 医院编码
-     */
-    @NotNull(message = "请输入医院编码")
-    private String code;
+//    /**
+//     * 医院编码
+//     */
+//    @NotNull(message = "请输入医院编码")
+//    private String code;
 }

+ 7 - 9
src/main/java/com/diagbot/web/HospitalInfoController.java

@@ -38,14 +38,12 @@ public class HospitalInfoController {
     @Autowired
     private HospitalInfoFacade hospitalInfoFacade;
 
-    @ApiOperation(value = "医院信息——根据医院编码获取医院信息[by:wangfeng]",
-            notes = "id: 医院id<br>" +
-                    "code:医院编码<br>")
-    @PostMapping("/getHospitalInfo")
-    @SysLogger("getHospitalInfo")
-    @ApiIgnore
-    public RespDTO<HospitalInfoDTO> getHospitalInfo(@RequestBody @Valid HospitalInfoVO hospitalInfoVO) {
-        HospitalInfoDTO data = hospitalInfoFacade.getHospitalInfo(hospitalInfoVO);
+    @ApiOperation(value = "医院信息——根据医院Id获取医院信息[by:wangfeng]",
+            notes = "id: 医院id<br>")
+    @PostMapping("/getHospitalInfoById")
+    @SysLogger("getHospitalInfoById")
+    public RespDTO<HospitalInfoDTO> getHospitalInfoById(@RequestBody @Valid HospitalInfoVO hospitalInfoVO) {
+        HospitalInfoDTO data = hospitalInfoFacade.getHospitalInfoById(hospitalInfoVO);
         return RespDTO.onSuc(data);
     }
 
@@ -70,7 +68,7 @@ public class HospitalInfoController {
 
     @ApiOperation(value = "医院信息——获取医院信息[by:zhaops]",
             notes = "")
-    @GetMapping("/getHospitalInfo")
+    @PostMapping("/getHospitalInfo")
     @SysLogger("getHospitalInfo")
     public RespDTO<HospitalInfo> getHospitalInfo() {
         return RespDTO.onSuc(hospitalInfoFacade.getHospitalInfo());