新增系统字典枚举

common/common-entity/src/main/java/com/yihu/jw/entity/base/doctor/BaseDoctorDO.java

@@ -2,6 +2,8 @@ package com.yihu.jw.entity.base.doctor;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.yihu.jw.entity.UuidIdentityEntityWithOperator;
import org.hibernate.annotations.Where;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Table;
@@ -16,6 +18,7 @@ import java.util.Date;
*/
@Entity
@Table(name = "base_doctor")
@Where(clause = "del = 1")
public class BaseDoctorDO extends UuidIdentityEntityWithOperator {
    /**

svr/svr-base/src/main/java/com/yihu/jw/base/dao/dict/DictDiseaseDao.java

@@ -1,9 +1,15 @@
package com.yihu.jw.base.dao.dict;
import com.yihu.jw.entity.base.dict.DictDiseaseDO;
import com.yihu.jw.entity.base.dict.DictIcd10DO;
import feign.Param;
import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
import org.springframework.data.jpa.repository.Query;
import org.springframework.data.repository.PagingAndSortingRepository;
import java.util.List;
import java.util.Map;
/**
 * 
@@ -18,4 +24,10 @@ import org.springframework.data.repository.PagingAndSortingRepository;
 * @since 1.
 */
public interface DictDiseaseDao extends PagingAndSortingRepository<DictDiseaseDO, Integer>, JpaSpecificationExecutor<DictDiseaseDO>  {
    @Query("select code as code,name as name from DictDiseaseDO where saasId = :saasId")
    List<Map<String,Object>> findCodeAndNameBySaasId(@Param("saasId") String saasId);
    @Query("select code as code,name as name from DictDiseaseDO")
    List<Map<String,Object>> findCodeAndName();
}

svr/svr-base/src/main/java/com/yihu/jw/base/dao/dict/DictHealthProblemDao.java

@@ -1,12 +1,16 @@
package com.yihu.jw.base.dao.dict;
import com.yihu.jw.entity.base.dict.DictDiseaseDO;
import com.yihu.jw.entity.base.dict.DictIcd10DO;
import feign.Param;
import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
import org.springframework.data.jpa.repository.Query;
import org.springframework.data.repository.PagingAndSortingRepository;
import com.yihu.jw.entity.base.dict.DictHealthProblemDO;
import java.util.List;
import java.util.Map;
/**
 * 
@@ -22,7 +26,9 @@ import java.util.List;
 */
public interface DictHealthProblemDao extends PagingAndSortingRepository<DictHealthProblemDO, Integer>, JpaSpecificationExecutor<DictHealthProblemDO>  {
    List<DictIcd10DO> findCodeAndNameBySaasId(String saasId);
    @Query("select code as code,name as name from DictHealthProblemDO where saasId = :saasId")
    List<DictHealthProblemDO> findCodeAndNameBySaasId(@Param("saasId") String saasId);
    List<DictIcd10DO> findCodeAndName();
    @Query("select code as code,name as name from DictHealthProblemDO")
    List<Map<String,Object>> findCodeAndName();
}

svr/svr-base/src/main/java/com/yihu/jw/base/dao/dict/DictHospitalDeptDao.java

@@ -1,12 +1,16 @@
package com.yihu.jw.base.dao.dict;
import com.yihu.jw.entity.base.dict.DictHealthProblemDO;
import com.yihu.jw.entity.base.dict.DictIcd10DO;
import feign.Param;
import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
import org.springframework.data.jpa.repository.Query;
import org.springframework.data.repository.PagingAndSortingRepository;
import com.yihu.jw.entity.base.dict.DictHospitalDeptDO;
import java.util.List;
import java.util.Map;
/**
 * 
@@ -22,7 +26,9 @@ import java.util.List;
 */
public interface DictHospitalDeptDao extends PagingAndSortingRepository<DictHospitalDeptDO, Integer>, JpaSpecificationExecutor<DictHospitalDeptDO>  {
    List<DictIcd10DO> findCodeAndNameBySaasId(String saasId);
    @Query("select code as code,name as name from DictHospitalDeptDO where saasId = :saasId")
    List<Map<String,Object>> findCodeAndNameBySaasId(@Param("saasId") String saasId);
    List<DictIcd10DO> findCodeAndName();
    @Query("select code as code,name as name from DictHospitalDeptDO")
    List<Map<String,Object>> findCodeAndName();
}

svr/svr-base/src/main/java/com/yihu/jw/base/dao/dict/DictIcd10Dao.java

@@ -1,11 +1,15 @@
package com.yihu.jw.base.dao.dict;
import com.yihu.jw.entity.base.dict.DictHospitalDeptDO;
import feign.Param;
import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
import org.springframework.data.jpa.repository.Query;
import org.springframework.data.repository.PagingAndSortingRepository;
import com.yihu.jw.entity.base.dict.DictIcd10DO;
import java.util.List;
import java.util.Map;
/**
 * 
@@ -21,7 +25,9 @@ import java.util.List;
 */
public interface DictIcd10Dao extends PagingAndSortingRepository<DictIcd10DO, Integer>, JpaSpecificationExecutor<DictIcd10DO>  {
    List<DictIcd10DO> findCodeAndNameBySaasId(String saasId);
    @Query("select code as code,name as name from DictIcd10DO where saasId = :saasId")
    List<Map<String,Object>> findCodeAndNameBySaasId(@Param("saasId") String saasId);
    List<DictIcd10DO> findCodeAndName();
    @Query("select code as code,name as name from DictIcd10DO")
    List<Map<String,Object>> findCodeAndName();
}

svr/svr-base/src/main/java/com/yihu/jw/base/dao/dict/DictJobTitleDao.java

@@ -1,12 +1,15 @@
package com.yihu.jw.base.dao.dict;
import com.yihu.jw.entity.base.dict.DictIcd10DO;
import feign.Param;
import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
import org.springframework.data.jpa.repository.Query;
import org.springframework.data.repository.PagingAndSortingRepository;
import com.yihu.jw.entity.base.dict.DictJobTitleDO;
import java.util.List;
import java.util.Map;
/**
 * 
@@ -21,8 +24,10 @@ import java.util.List;
 * @since 1.
 */
public interface DictJobTitleDao extends PagingAndSortingRepository<DictJobTitleDO, Integer>, JpaSpecificationExecutor<DictJobTitleDO>  {
    
    List<DictIcd10DO> findCodeAndNameBySaasId(String saasId);
    List<DictIcd10DO> findCodeAndName();
    @Query("select code as code,name as name from DictJobTitleDO where saasId = :saasId")
    List<Map<String,Object>> findCodeAndNameBySaasId(@Param("saasId") String saasId);
    @Query("select code as code,name as name from DictJobTitleDO")
    List<Map<String,Object>> findCodeAndName();
}

svr/svr-base/src/main/java/com/yihu/jw/base/enums/SystemDictEnum.java

@@ -0,0 +1,9 @@
package com.yihu.jw.base.enums;
/**
 * @author litaohong on 2018/10/8
 * @project jw2.0
 */
public enum SystemDictEnum {
    Icd10Dict,HospitalDeptDict,JobTitleDict,HealthProblemDict,DiseaseDict,MedicineDict;
}

svr/svr-base/src/main/java/com/yihu/jw/base/service/dict/DictDiseaseService.java

@@ -1,10 +1,19 @@
package com.yihu.jw.base.service.dict;
import com.alibaba.fastjson.JSONObject;
import com.yihu.jw.base.dao.dict.DictDiseaseDao;
import com.yihu.jw.base.dao.dict.DictJobTitleDao;
import com.yihu.jw.base.enums.SystemDictEnum;
import com.yihu.jw.entity.base.dict.DictDiseaseDO;
import com.yihu.mysql.query.BaseJpaService;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
/**
 * 
 * 病种字典服务service
@@ -19,4 +28,23 @@ import org.springframework.stereotype.Service;
 */
@Service
public class DictDiseaseService extends BaseJpaService<DictDiseaseDO, DictDiseaseDao> {
    @Autowired
    private DictDiseaseDao dictDiseaseDao;
    /**
     * 查询某一租户下的病种字典信息，如果saadId为空表示当前用户角色为超级管理员，超级管理员可以看到所有数据
     * @param saasId
     * @return
     */
    public String queryAll(String saasId){
        JSONObject jsonObject = new JSONObject();
        List<Map<String,Object>> list = new ArrayList<>();
        if(StringUtils.isEmpty(saasId)){
            list = dictDiseaseDao.findCodeAndName();
        }else{
            list = dictDiseaseDao.findCodeAndNameBySaasId(saasId);
        }
        jsonObject.put(SystemDictEnum.DiseaseDict.toString(),list);
        return jsonObject.toJSONString();
    }
}

svr/svr-base/src/main/java/com/yihu/jw/base/service/dict/DictHealthProblemService.java

@@ -3,6 +3,7 @@ package com.yihu.jw.base.service.dict;
import com.alibaba.fastjson.JSONObject;
import com.yihu.jw.base.dao.dict.DictHealthProblemDao;
import com.yihu.jw.base.dao.dict.DictJobTitleDao;
import com.yihu.jw.base.enums.SystemDictEnum;
import com.yihu.jw.entity.base.dict.DictIcd10DO;
import com.yihu.mysql.query.BaseJpaService;
import org.apache.commons.lang3.StringUtils;
@@ -12,6 +13,7 @@ import com.yihu.jw.entity.base.dict.DictHealthProblemDO;
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
/**
 * 
@@ -37,13 +39,13 @@ public class DictHealthProblemService extends BaseJpaService<DictHealthProblemDO
     */
    public String queryAll(String saasId){
        JSONObject jsonObject = new JSONObject();
        List<DictIcd10DO> list = new ArrayList<>();
        List<Map<String,Object>> list = new ArrayList<>();
        if(StringUtils.isEmpty(saasId)){
            list = dictJobTitleDao.findCodeAndName();
        }else{
            list = dictJobTitleDao.findCodeAndNameBySaasId(saasId);
        }
        jsonObject.put("healthProDict",list);
        jsonObject.put(SystemDictEnum.HealthProblemDict.toString(),list);
        return jsonObject.toJSONString();
    }

svr/svr-base/src/main/java/com/yihu/jw/base/service/dict/DictHospitalDeptService.java

@@ -3,6 +3,7 @@ package com.yihu.jw.base.service.dict;
import com.alibaba.fastjson.JSONObject;
import com.netflix.discovery.converters.Auto;
import com.yihu.jw.base.dao.dict.DictHospitalDeptDao;
import com.yihu.jw.base.enums.SystemDictEnum;
import com.yihu.jw.entity.base.dict.DictIcd10DO;
import com.yihu.mysql.query.BaseJpaService;
import org.apache.commons.lang3.StringUtils;
@@ -12,6 +13,7 @@ import com.yihu.jw.entity.base.dict.DictHospitalDeptDO;
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
/**
 * 
@@ -37,13 +39,13 @@ public class DictHospitalDeptService extends BaseJpaService<DictHospitalDeptDO,
     */
    public String queryAll(String saasId){
        JSONObject jsonObject = new JSONObject();
        List<DictIcd10DO> list = new ArrayList<>();
        List<Map<String,Object>> list = new ArrayList<>();
        if(StringUtils.isEmpty(saasId)){
            list = dictHospitalDeptDao.findCodeAndName();
        }else{
            list = dictHospitalDeptDao.findCodeAndNameBySaasId(saasId);
        }
        jsonObject.put("hosDeptDict",list);
        jsonObject.put(SystemDictEnum.HospitalDeptDict.toString(),list);
        return jsonObject.toJSONString();
    }

svr/svr-base/src/main/java/com/yihu/jw/base/service/dict/DictIcd10Service.java

@@ -2,6 +2,7 @@ package com.yihu.jw.base.service.dict;
import com.alibaba.fastjson.JSONObject;
import com.yihu.jw.base.dao.dict.DictIcd10Dao;
import com.yihu.jw.base.enums.SystemDictEnum;
import com.yihu.mysql.query.BaseJpaService;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
@@ -10,6 +11,7 @@ import com.yihu.jw.entity.base.dict.DictIcd10DO;
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
/**
 * 
@@ -36,13 +38,13 @@ public class DictIcd10Service extends BaseJpaService<DictIcd10DO, DictIcd10Dao>
     */
    public String queryAll(String saasId){
        JSONObject jsonObject = new JSONObject();
        List<DictIcd10DO> list = new ArrayList<>();
        List<Map<String,Object>> list = new ArrayList<>();
        if(StringUtils.isEmpty(saasId)){
           list = dictIcd10Dao.findCodeAndName();
        }else{
           list = dictIcd10Dao.findCodeAndNameBySaasId(saasId);
        }
        jsonObject.put("icd10Dict",list);
        jsonObject.put(SystemDictEnum.Icd10Dict.toString(),list);
        return jsonObject.toJSONString();
    }

svr/svr-base/src/main/java/com/yihu/jw/base/service/dict/DictJobTitleService.java

@@ -1,8 +1,8 @@
package com.yihu.jw.base.service.dict;
import com.alibaba.fastjson.JSONObject;
import com.yihu.jw.base.dao.dict.DictHospitalDeptDao;
import com.yihu.jw.base.dao.dict.DictJobTitleDao;
import com.yihu.jw.base.enums.SystemDictEnum;
import com.yihu.jw.entity.base.dict.DictIcd10DO;
import com.yihu.mysql.query.BaseJpaService;
import org.apache.commons.lang3.StringUtils;
@@ -12,6 +12,7 @@ import com.yihu.jw.entity.base.dict.DictJobTitleDO;
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
/**
 * 
@@ -37,13 +38,13 @@ public class DictJobTitleService extends BaseJpaService<DictJobTitleDO, DictJobT
     */
    public String queryAll(String saasId){
        JSONObject jsonObject = new JSONObject();
        List<DictIcd10DO> list = new ArrayList<>();
        List<Map<String,Object>> list = new ArrayList<>();
        if(StringUtils.isEmpty(saasId)){
            list = dictJobTitleDao.findCodeAndName();
        }else{
            list = dictJobTitleDao.findCodeAndNameBySaasId(saasId);
        }
        jsonObject.put("hosDeptDict",list);
        jsonObject.put(SystemDictEnum.JobTitleDict.toString(),list);
        return jsonObject.toJSONString();
    }

svr/svr-base/src/main/java/com/yihu/jw/base/service/patient/BasePatientService.java

@@ -1,7 +1,6 @@
package com.yihu.jw.base.service.patient;
import com.yihu.jw.base.dao.patient.BasePatientDao;
import com.yihu.jw.base.dao.patient.SpecificFieldOnly;
import com.yihu.jw.base.util.JavaBeanUtils;
import com.yihu.mysql.query.BaseJpaService;
import org.apache.commons.lang3.StringUtils;
@@ -48,21 +47,7 @@ public class BasePatientService extends BaseJpaService<BasePatientDO, BasePatien
            return resultMap;
        }
        resultMap = JavaBeanUtils.bean2Map(patientDOList.get(0));
//        getByName(patientDOList.get(0).getName());
        getSome(patientId);
        return resultMap;
    }
    public Map<String,Object> getByName(String name){
        Map<String,Object> map = new HashMap<>();
        Collection<SpecificFieldOnly> specificFieldOnly = basePatientDao.findByName(name);
        if(CollectionUtils.isEmpty(specificFieldOnly)){
            return map;
        }
//        map = specificFieldOnly.
        return map;
    }
    public void getSome(String id){
         basePatientDao.findsome(id);
    }
}