Browse Source

添加注释

wangfeng 5 years ago
parent
commit
0018818649

+ 6 - 0
tran-service/src/main/java/com/diagbot/dto/SysHospitalDTO.java

@@ -14,6 +14,12 @@ import java.util.List;
 @Setter
 @Setter
 public class SysHospitalDTO {
 public class SysHospitalDTO {
 
 
+    /**
+     * 顶级集团信息
+     */
     private  SysHospitalDeptInfoDTO superiorsInfo;
     private  SysHospitalDeptInfoDTO superiorsInfo;
+    /**
+     * 下级医院信息
+     */
     private List<SysHospitalDeptInfoDTO> juniorHospital ;
     private List<SysHospitalDeptInfoDTO> juniorHospital ;
 }
 }

+ 17 - 11
tran-service/src/main/java/com/diagbot/facade/SysSetFacade.java

@@ -34,7 +34,7 @@ public class SysSetFacade extends SysSetServiceImpl {
      * @return
      * @return
      */
      */
     public List<SysSetInfoDTO> getSysSetInfoData(HospitalSetVO hospitalSetVO) {
     public List<SysSetInfoDTO> getSysSetInfoData(HospitalSetVO hospitalSetVO) {
-        
+
         if (IntegerUtil.isNull(hospitalSetVO.getPlan())) {
         if (IntegerUtil.isNull(hospitalSetVO.getPlan())) {
             hospitalSetVO.setPlan(0);
             hospitalSetVO.setPlan(0);
         }
         }
@@ -43,33 +43,39 @@ public class SysSetFacade extends SysSetServiceImpl {
         return data;
         return data;
     }
     }
 
 
+    /**
+     * @param sysHospitalCodeVO
+     * @return
+     */
     public SysHospitalDTO getHospitalDeptInfoData(SysHospitalCodeVO sysHospitalCodeVO) {
     public SysHospitalDTO getHospitalDeptInfoData(SysHospitalCodeVO sysHospitalCodeVO) {
+        //取出下级医院Code
         QueryWrapper<SysSet> sysSetInfo = new QueryWrapper<>();
         QueryWrapper<SysSet> sysSetInfo = new QueryWrapper<>();
         sysSetInfo.eq("is_deleted", IsDeleteEnum.N.getKey());
         sysSetInfo.eq("is_deleted", IsDeleteEnum.N.getKey());
         sysSetInfo.eq("hospital_code", sysHospitalCodeVO.getHospitalCode());
         sysSetInfo.eq("hospital_code", sysHospitalCodeVO.getHospitalCode());
-        sysSetInfo.eq("code",sysHospitalCodeVO.getJuniorHospitalCode());
+        sysSetInfo.eq("code", sysHospitalCodeVO.getJuniorHospitalCode());
         sysSetInfo.eq("sys_type", sysHospitalCodeVO.getSysType());
         sysSetInfo.eq("sys_type", sysHospitalCodeVO.getSysType());
         SysSet sysSetInfoData = getOne(sysSetInfo, false);
         SysSet sysSetInfoData = getOne(sysSetInfo, false);
-        SysHospitalInfoVO sysHospitalInfoVO =new SysHospitalInfoVO();
-        List<String> listCode=Lists.newArrayList(sysSetInfoData.getValue().split(","));
+        SysHospitalInfoVO sysHospitalInfoVO = new SysHospitalInfoVO();
+        List<String> listCode = Lists.newArrayList(sysSetInfoData.getValue().split(","));
+        //追加集团code
         listCode.add(sysHospitalCodeVO.getHospitalCode());
         listCode.add(sysHospitalCodeVO.getHospitalCode());
+        //查询下级医院的默认科室
         sysHospitalInfoVO.setHospitalCode(listCode);
         sysHospitalInfoVO.setHospitalCode(listCode);
         sysHospitalInfoVO.setCode(sysHospitalCodeVO.getDefaultDeptCode());
         sysHospitalInfoVO.setCode(sysHospitalCodeVO.getDefaultDeptCode());
         sysHospitalInfoVO.setSysType(sysHospitalCodeVO.getSysType());
         sysHospitalInfoVO.setSysType(sysHospitalCodeVO.getSysType());
-        List<SysHospitalDeptInfoDTO>  juniorHospitalData= getjuniorHospitalData(sysHospitalInfoVO);
-        SysHospitalDTO sysHospitalDTO =new SysHospitalDTO();
-        List<SysHospitalDeptInfoDTO>  hospitalDatas =new ArrayList<SysHospitalDeptInfoDTO>();
-        for(SysHospitalDeptInfoDTO superiorsInfoData : juniorHospitalData){
-            if(superiorsInfoData.getHospitalCode().equals(sysHospitalCodeVO.getHospitalCode())){
+        List<SysHospitalDeptInfoDTO> juniorHospitalData = getjuniorHospitalData(sysHospitalInfoVO);
+        SysHospitalDTO sysHospitalDTO = new SysHospitalDTO();
+        List<SysHospitalDeptInfoDTO> hospitalDatas = new ArrayList<SysHospitalDeptInfoDTO>();
+        for (SysHospitalDeptInfoDTO superiorsInfoData : juniorHospitalData) {
+            if (superiorsInfoData.getHospitalCode().equals(sysHospitalCodeVO.getHospitalCode())) {
                 //取出顶级集团信息
                 //取出顶级集团信息
                 sysHospitalDTO.setSuperiorsInfo(superiorsInfoData);
                 sysHospitalDTO.setSuperiorsInfo(superiorsInfoData);
-            }else {
+            } else {
                 //下级医院信息
                 //下级医院信息
                 hospitalDatas.add(superiorsInfoData);
                 hospitalDatas.add(superiorsInfoData);
             }
             }
         }
         }
         sysHospitalDTO.setJuniorHospital(hospitalDatas);
         sysHospitalDTO.setJuniorHospital(hospitalDatas);
-
         return sysHospitalDTO;
         return sysHospitalDTO;
     }
     }
 }
 }

+ 1 - 1
tran-service/src/main/java/com/diagbot/vo/SysHospitalCodeVO.java

@@ -20,7 +20,7 @@ public class SysHospitalCodeVO {
     private  String juniorHospitalCode;
     private  String juniorHospitalCode;
     @NotBlank(message = "请输入部门编码")
     @NotBlank(message = "请输入部门编码")
     private  String defaultDeptCode;
     private  String defaultDeptCode;
-    @NotNull(message = "请输入患者id")
+    @NotNull(message = "请输入系统编号")
     private  Integer sysType;
     private  Integer sysType;
 
 
 }
 }

+ 3 - 1
tran-service/src/main/java/com/diagbot/web/SysSetController.java

@@ -42,7 +42,9 @@ public class SysSetController {
         List<SysSetInfoDTO> data = sysSetFacade.getSysSetInfoData(hospitalSetVO);
         List<SysSetInfoDTO> data = sysSetFacade.getSysSetInfoData(hospitalSetVO);
         return RespDTO.onSuc(data);
         return RespDTO.onSuc(data);
     }
     }
-    @ApiOperation(value = "根据医院编码获取医院信息及科室信息[by:wangfeng]", notes = "hospitalCode :医院code  必填<br> ")
+
+    @ApiOperation(value = "根据医院编码获取医院信息及科室信息[by:wangfeng]", notes = "hospitalCode :医院code  必填<br>" +
+            "juniorHospitalCode:请输入下级编码 必填<br> ;defaultDeptCode:请输入部门编码 必填<br>sysType :请输入系统编号,必填<br>")
     @PostMapping("/getHospitalDatas")
     @PostMapping("/getHospitalDatas")
     @SysLogger("getHospitalDatas")
     @SysLogger("getHospitalDatas")
     public RespDTO<SysHospitalDTO> getHospitalDatas(@Valid @RequestBody SysHospitalCodeVO sysHospitalCodeVO) {
     public RespDTO<SysHospitalDTO> getHospitalDatas(@Valid @RequestBody SysHospitalCodeVO sysHospitalCodeVO) {