jiangjiazhi / regional-platform

Download as
Browse Code »

Commit 43ae49c0dac48f73557dfbdabf6a272e37360ddf

Authored by shiyang
1 parent b0e51448c9
Exists in master and in 6 other branches autism, dev, fengning, fengning2023-06-06, longhua, luanping

update

Showing 1 changed file with 14 additions and 14 deletions

platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PremaritalCheckupFacade.java View file @ 43ae49c
... ... @@ -1930,7 +1930,7 @@
1930 1930 checkupResult.setHunJianDate(DateUtil.getyyyy_MM_dd(result.getPremaritalUpTime()));
1931 1931  
1932 1932 String baseDoctor = "";
1933   - if (result.getBaseDoctor() != null) {
  1933 + if (StringUtils.isNotEmpty(result.getBaseDoctor())) {
1934 1934 Users users = usersService.getUsers(Integer.parseInt(result.getBaseDoctor()));
1935 1935 if (users != null && users.getYn() == YnEnums.YES.getId()) {
1936 1936 baseDoctor = users.getName();
... ... @@ -1939,7 +1939,7 @@
1939 1939 checkupResult.setBaseDoctor(baseDoctor);
1940 1940  
1941 1941 String physiqueDoctor = "";
1942   - if (result.getPhysiqueDoctor() != null) {
  1942 + if (StringUtils.isNotEmpty(result.getPhysiqueDoctor())) {
1943 1943 Users users = usersService.getUsers(Integer.parseInt(result.getPhysiqueDoctor()));
1944 1944 if (users != null && users.getYn() == YnEnums.YES.getId()) {
1945 1945 physiqueDoctor = users.getName();
... ... @@ -1948,7 +1948,7 @@
1948 1948 checkupResult.setPhysiqueDoctor(physiqueDoctor);
1949 1949  
1950 1950 String repDoctor = "";
1951   - if (result.getRepDoctor() != null) {
  1951 + if (StringUtils.isNotEmpty(result.getRepDoctor())) {
1952 1952 Users users = usersService.getUsers(Integer.parseInt(result.getRepDoctor()));
1953 1953 if (users != null && users.getYn() == YnEnums.YES.getId()) {
1954 1954 repDoctor = users.getName();
... ... @@ -1957,7 +1957,7 @@
1957 1957 checkupResult.setRepDoctor(repDoctor);
1958 1958  
1959 1959 String clinicDoctor = "";
1960   - if (result.getClinicDoctor() != null) {
  1960 + if (StringUtils.isNotEmpty(result.getClinicDoctor())) {
1961 1961 Users users = usersService.getUsers(Integer.parseInt(result.getClinicDoctor()));
1962 1962 if (users != null && users.getYn() == YnEnums.YES.getId()) {
1963 1963 clinicDoctor = users.getName();
... ... @@ -1966,7 +1966,7 @@
1966 1966 checkupResult.setClinicDoctor(clinicDoctor);
1967 1967  
1968 1968 String assistDoctor = "";
1969   - if (result.getAssistDoctor() != null) {
  1969 + if (StringUtils.isNotEmpty(result.getAssistDoctor())) {
1970 1970 Users users = usersService.getUsers(Integer.parseInt(result.getAssistDoctor()));
1971 1971 if (users != null && users.getYn() == YnEnums.YES.getId()) {
1972 1972 assistDoctor = users.getName();
... ... @@ -1975,7 +1975,7 @@
1975 1975 checkupResult.setAssistDoctor(assistDoctor);
1976 1976  
1977 1977 String guidDoctor = "";
1978   - if (result.getGuidDoctor() != null) {
  1978 + if (StringUtils.isNotEmpty(result.getGuidDoctor())) {
1979 1979 Users users = usersService.getUsers(Integer.parseInt(result.getGuidDoctor()));
1980 1980 if (users != null && users.getYn() == YnEnums.YES.getId()) {
1981 1981 guidDoctor = users.getName();
... ... @@ -1984,7 +1984,7 @@
1984 1984 checkupResult.setGuidDoctor(guidDoctor);
1985 1985  
1986 1986 String hunJianDoctor = "";
1987   - if (result.getHunJianDoctor() != null) {
  1987 + if (StringUtils.isNotEmpty(result.getHunJianDoctor())) {
1988 1988 Users users = usersService.getUsers(Integer.parseInt(result.getHunJianDoctor()));
1989 1989 if (users != null && users.getYn() == YnEnums.YES.getId()) {
1990 1990 hunJianDoctor = users.getName();
1991 1991  
1992 1992  
1993 1993  
1994 1994  
1995 1995  
1996 1996  
... ... @@ -2001,43 +2001,43 @@
2001 2001 checkupResult.setUserSign(result.getUserSign());
2002 2002  
2003 2003 //查询的时候,返回医院的名称
2004   - if (result.getBaseHospitalId() != null) {
  2004 + if (StringUtils.isNotEmpty(result.getBaseHospitalId())) {
2005 2005 Organization organization = organizationService.getOrganization(Integer.valueOf(result.getBaseHospitalId()));
2006 2006 if (organization != null && organization.getYn() == YnEnums.YES.getId()) {
2007 2007 checkupResult.setBaseHospitalId(organization.getName());
2008 2008 }
2009 2009 }
2010   - if (result.getPhysiqueHospitalId() != null) {
  2010 + if (StringUtils.isNotEmpty(result.getPhysiqueHospitalId())) {
2011 2011 Organization organization = organizationService.getOrganization(Integer.valueOf(result.getPhysiqueHospitalId()));
2012 2012 if (organization != null && organization.getYn() == YnEnums.YES.getId()) {
2013 2013 checkupResult.setPhysiqueHospitalId(organization.getName());
2014 2014 }
2015 2015 }
2016   - if (result.getRepHospitalId() != null) {
  2016 + if (StringUtils.isNotEmpty(result.getRepHospitalId())) {
2017 2017 Organization organization = organizationService.getOrganization(Integer.valueOf(result.getRepHospitalId()));
2018 2018 if (organization != null && organization.getYn() == YnEnums.YES.getId()) {
2019 2019 checkupResult.setRepHospitalId(organization.getName());
2020 2020 }
2021 2021 }
2022   - if (result.getClinicHospitalId() != null) {
  2022 + if (StringUtils.isNotEmpty(result.getClinicHospitalId())) {
2023 2023 Organization organization = organizationService.getOrganization(Integer.valueOf(result.getClinicHospitalId()));
2024 2024 if (organization != null && organization.getYn() == YnEnums.YES.getId()) {
2025 2025 checkupResult.setClinicHospitalId(organization.getName());
2026 2026 }
2027 2027 }
2028   - if (result.getAssistHospitalId() != null) {
  2028 + if (StringUtils.isNotEmpty(result.getAssistHospitalId())) {
2029 2029 Organization organization = organizationService.getOrganization(Integer.valueOf(result.getAssistHospitalId()));
2030 2030 if (organization != null && organization.getYn() == YnEnums.YES.getId()) {
2031 2031 checkupResult.setAssistHospitalId(organization.getName());
2032 2032 }
2033 2033 }
2034   - if (result.getGuidHospitalId() != null) {
  2034 + if (StringUtils.isNotEmpty(result.getGuidHospitalId())) {
2035 2035 Organization organization = organizationService.getOrganization(Integer.valueOf(result.getGuidHospitalId()));
2036 2036 if (organization != null && organization.getYn() == YnEnums.YES.getId()) {
2037 2037 checkupResult.setGuidHospitalId(organization.getName());
2038 2038 }
2039 2039 }
2040   - if (result.getHospitalId() != null) {
  2040 + if (StringUtils.isNotEmpty(result.getHospitalId())) {
2041 2041 Organization organization = organizationService.getOrganization(Integer.valueOf(result.getHospitalId()));
2042 2042 if (organization != null && organization.getYn() == YnEnums.YES.getId()) {
2043 2043 checkupResult.setHunJianHospital(organization.getName());