Merge remote-tracking branch 'origin/master'

src/main/java/com.yihu.ehr/basic/org/controller/OrgEndPoint.java

@@ -5,6 +5,7 @@ import com.fasterxml.jackson.databind.node.ObjectNode;
import com.yihu.ehr.basic.address.service.AddressDictService;
import com.yihu.ehr.basic.org.model.Organization;
import com.yihu.ehr.basic.security.service.UserSecurityService;
import com.yihu.ehr.commons.constants.BasicServiceApi;
import com.yihu.ehr.constants.ApiVersion;
import com.yihu.ehr.constants.ServiceApi;
import com.yihu.ehr.controller.EnvelopRestEndPoint;
@@ -56,7 +57,8 @@ public class OrgEndPoint extends EnvelopRestEndPoint {
    private OrgDeptService orgDeptService;
    @Autowired
    private AddressDictService addressDictService;
    @Autowired
    private AddressDictService geographyDictService;
    @RequestMapping(value = "/organizations/getAllOrgs", method = RequestMethod.GET, consumes = MediaType.APPLICATION_JSON_UTF8_VALUE)
    @ApiOperation(value = "查询所有机构列表")
@@ -591,48 +593,48 @@ public class OrgEndPoint extends EnvelopRestEndPoint {
        Map<String, String> map = new HashMap<>();
        String[] temp = null;
        temp = location.split("省");
        String str ="";
        for(int i=0;i<temp.length;i++){
            if(temp[0].indexOf("省")>0){
        String str = "";
        for (int i = 0; i < temp.length; i++) {
            if (temp[0].indexOf("省") > 0) {
                //不包括直辖市、自治区
                map.put("provinceName", temp[0]+"省");
                map.put("provinceName", temp[0] + "省");
            }
            str=temp[temp.length-1];
            str = temp[temp.length - 1];
        }
        if (StringUtils.isNotEmpty(str)) {
            temp = str.split("市");
            str=temp[temp.length-1];
            if(temp.length>2){
                map.put("cityName", temp[0]+"市");
                map.put("district", temp[1]+"市");
            str = temp[temp.length - 1];
            if (temp.length > 2) {
                map.put("cityName", temp[0] + "市");
                map.put("district", temp[1] + "市");
                map.put("street", temp[2]);
            }else if(temp.length>1){
                map.put("cityName", temp[0]+"市");
            } else if (temp.length > 1) {
                map.put("cityName", temp[0] + "市");
                map.put("district", temp[1]);
                temp = str.split("县");
                if (temp.length>1) {
                    map.put("district", temp[0]+"县");
                if (temp.length > 1) {
                    map.put("district", temp[0] + "县");
                    map.put("street", temp[1]);
                }else{
                } else {
                    temp = str.split("区");
                    if (temp.length>1) {
                        map.put("district", temp[0]+"区");
                    if (temp.length > 1) {
                        map.put("district", temp[0] + "区");
                        map.put("street", temp[1]);
                    }else {
                    } else {
                        map.put("street", temp[0]);
                    }
                }
            }else{
            } else {
                temp = str.split("县");
                if (temp.length>1) {
                    map.put("district", temp[0]+"县");
                if (temp.length > 1) {
                    map.put("district", temp[0] + "县");
                    map.put("street", temp[1]);
                }else{
                } else {
                    temp = str.split("区");
                    if (temp.length>1) {
                        map.put("district", temp[0]+"区");
                    if (temp.length > 1) {
                        map.put("district", temp[0] + "区");
                        map.put("street", temp[1]);
                    }else {
                    } else {
                        map.put("street", temp[0]);
                    }
                }
@@ -640,4 +642,39 @@ public class OrgEndPoint extends EnvelopRestEndPoint {
        }
        return map;
    }
    @RequestMapping(value = BasicServiceApi.Org.getAllOrgByAdministrativeDivision, method = RequestMethod.GET)
    @ApiOperation(value = "用户修改-按照区域获取机构；查询所有机构列表")
    public Envelop getAllOrgs(
            @ApiParam(name = "areaId", value = "区域id")
            @RequestParam(value = "areaId", required = false) String areaId,
            @ApiParam(name = "fullName", value = "机构名称")
            @RequestParam(value = "fullName", required = false) String fullName) {
        Envelop envelop = new Envelop();
        try {
            List<Organization> orgList;
            if (StringUtils.isEmpty(fullName)&&StringUtils.isNotEmpty(areaId)) {
                //区域id存在，机构名称不存在
                orgList = orgService.findByOrgArea(areaId.toString());
            } else if (StringUtils.isNotEmpty(fullName)&&StringUtils.isEmpty(areaId)) {
                //区域id不存在，机构名称存在
                String filters="fullName?" +fullName;
                orgList =  orgService.search("", filters, "-createDate", 1, 999);
            }else if (StringUtils.isNotEmpty(fullName)&&StringUtils.isNotEmpty(areaId)) {
                //区域和机构名称都存在
                orgList = orgService.getOrgListByAreaidAndParam(Integer.valueOf(areaId), fullName);
            }else {
                envelop.setSuccessFlg(false);
                envelop.setErrorMsg("区域和机构名称不能同时为空！");
                return envelop;
            }
            envelop.setSuccessFlg(true);
            envelop.setDetailModelList(orgList);
        } catch (Exception e) {
            e.printStackTrace();
            envelop.setSuccessFlg(false);
            envelop.setErrorMsg(e.getMessage());
        }
        return envelop;
    }
}

src/main/java/com.yihu.ehr/basic/org/dao/OrganizationRepository.java

@@ -76,4 +76,7 @@ public interface OrganizationRepository extends PagingAndSortingRepository<Organ
    @Query(value = "SELECT org.* from Organizations org WHERE org.administrative_division in(SELECT id from address_dict where pid = :pid) and org.administrative_division = :orgArea", nativeQuery = true)
    List<Organization> getOrgListByAddressPidAndOrgArea(@Param("pid") Integer pid, @Param("orgArea") String orgArea);
    @Query(value = "SELECT org.* from Organizations org WHERE org.administrative_division = :administrativeDivision and org.full_name like %:fullName% ", nativeQuery = true)
    List<Organization> getOrgListByAreaidAndParam(@Param("administrativeDivision") Integer administrativeDivision, @Param("fullName") String fullName);
}

src/main/java/com.yihu.ehr/basic/org/service/OrgService.java

@@ -424,4 +424,9 @@ public class OrgService extends BaseJpaService<Organization, OrganizationReposit
            return 0 ;
        }
    }
    public List<Organization> getOrgListByAreaidAndParam(Integer area, String fullName) {
        List<Organization> list = organizationRepository.getOrgListByAreaidAndParam(area, fullName);
        return list;
    }
}

src/main/java/com.yihu.ehr/commons/constants/BasicServiceApi.java

@@ -74,12 +74,50 @@ public class BasicServiceApi {
        public Doctors() {
        }
        //私有库已存在
        //私有库已存在-end
        //basic服务拆分之后追加
        public static final String GetDoctorById = "/doctors/GetDoctorById/{doctor_id}";
    }
    //私有库已存在-start
    public static class Org {
        public static final String getUserOrglistByUserId = "/org/getUserOrglistByUserId/";
        public static final String getUserOrgSaasByUserOrgCode = "/org/getUserOrgSaasByUserOrgCode/";
        public static final String GetOrgDeptsDate = "/org/getOrgDeptsDate";
        public static final String GetOrgDeptInfoList = "/org/userId/getOrgDeptInfoList";
        public static final String getseaOrgsByOrgCode = "/organizations/seaOrgsByOrgCode";
        public static final String ChildOrgSaasByAreaCode = "/org/childOrgSaasByAreaCode";
        public static final String getOrgCodeAndFullName = "/org/getOrgCodeAndFullName";
        public static final String getUserOrgCodelistByUserId = "/org/getUserOrgCodelistByUserId";
        public Org() {
        }
        //私有库已存在-end
        //basic服务拆分之后追加
        public static final String getAllOrgByAdministrativeDivision = "/org/getAllOrgByAdministrativeDivision";
        public static class HealthCategory {
            //私有库已存在-start
            public static final String Prefix = "/org/healthCategory/";
            public static final String GetById = "/org/healthCategory/{id}";
            public static final String FindAll = "/org/healthCategory/findAll";
            public static final String Search = "/org/healthCategory/search";
            public static final String Save = "/org/healthCategory/save";
            public static final String Delete = "/org/healthCategory/delete";
            public static final String IsUniqueCode = "/org/healthCategory/isUniqueCode";
            public static final String IsUniqueName = "/org/healthCategory/isUniqueName";
            public HealthCategory() {
            }
            //私有库已存在-end
        }
    }
}