Merge remote-tracking branch 'origin/dev/prec20191118_new' into dev/prec20191118_new

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

@@ -47,35 +47,26 @@ public class SysSetFacade extends SysSetServiceImpl {
         QueryWrapper<SysSet> sysSetInfo = new QueryWrapper<>();
         sysSetInfo.eq("is_deleted", IsDeleteEnum.N.getKey());
         sysSetInfo.eq("hospital_code", sysHospitalCodeVO.getHospitalCode());
-        sysSetInfo.eq("code","junior_hospital");
-        sysSetInfo.eq("sys_type", 17);
+        sysSetInfo.eq("code",sysHospitalCodeVO.getJuniorHospitalCode());
+        sysSetInfo.eq("sys_type", sysHospitalCodeVO.getSysType());
         SysSet sysSetInfoData = getOne(sysSetInfo, false);
         SysHospitalInfoVO sysHospitalInfoVO =new SysHospitalInfoVO();
         List<String> listCode=Lists.newArrayList(sysSetInfoData.getValue().split(","));
         listCode.add(sysHospitalCodeVO.getHospitalCode());
         sysHospitalInfoVO.setHospitalCode(listCode);
-        sysHospitalInfoVO.setCode("default_dept");
-        sysHospitalInfoVO.setSysType(17);
+        sysHospitalInfoVO.setCode(sysHospitalCodeVO.getDefaultDeptCode());
+        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())){
-                SysHospitalDeptInfoDTO data = new SysHospitalDeptInfoDTO();
-                data.setDeptCode(superiorsInfoData.getDeptCode());
-                data.setDeptName(superiorsInfoData.getDeptName());
-                data.setHospitalCode(superiorsInfoData.getHospitalCode());
-                data.setHospitalName(superiorsInfoData.getHospitalName());
-                sysHospitalDTO.setSuperiorsInfo(data);
+                //取出顶级集团信息
+                sysHospitalDTO.setSuperiorsInfo(superiorsInfoData);
             }else {
-                SysHospitalDeptInfoDTO data = new SysHospitalDeptInfoDTO();
-                data.setDeptCode(superiorsInfoData.getDeptCode());
-                data.setDeptName(superiorsInfoData.getDeptName());
-                data.setHospitalCode(superiorsInfoData.getHospitalCode());
-                data.setHospitalName(superiorsInfoData.getHospitalName());
-                hospitalDatas.add(data);
+                //下级医院信息
+                hospitalDatas.add(superiorsInfoData);
             }
-
         }
         sysHospitalDTO.setJuniorHospital(hospitalDatas);
 

tran-service/src/main/java/com/diagbot/vo/SysHospitalCodeVO.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:
@@ -11,5 +14,13 @@ import lombok.Setter;
 @Getter
 @Setter
 public class SysHospitalCodeVO {
+    @NotBlank(message = "请输入医院编码")
     private  String hospitalCode;
+    @NotBlank(message = "请输入下级编码")
+    private  String juniorHospitalCode;
+    @NotBlank(message = "请输入部门编码")
+    private  String defaultDeptCode;
+    @NotNull(message = "请输入患者id")
+    private  Integer sysType;
+
 }