Merge branch 'dev' of http://192.168.1.220:10080/Amoy2/wlyy2.0 into dev

business/base-service/src/main/java/com/yihu/jw/dict/dao/BaseDictJobTitleDao.java

@@ -0,0 +1,39 @@
package com.yihu.jw.dict.dao;
import com.yihu.jw.entity.base.dict.DictJobTitleDO;
import org.springframework.data.domain.Pageable;
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;
/**
 * 
 * 职称字典 数据库访问层
 * 
 * @version 
 * <pre>
 * Author	Version		Date		Changes
 * litaohong 	1.0  		2018年08月31日 	Created
 *
 * </pre>
 * @since 1.
 */
public interface BaseDictJobTitleDao extends PagingAndSortingRepository<DictJobTitleDO, Integer>, JpaSpecificationExecutor<DictJobTitleDO>  {
    @Query("select code as code,name as name from DictJobTitleDO where saasId = ?1")
    List<Map<String,Object>> findCodeAndNameBySaasId(String saasId, Pageable pageable);
    @Query("select code as code,name as name from DictJobTitleDO")
    List<Map<String,Object>> findCodeAndName(Pageable pageable);
    List<DictJobTitleDO> findBySaasId(String saasId);
    Long countBySaasId(String saasId);
    DictJobTitleDO findByCode(String code);
    boolean existsByCode(String code);
}

business/base-service/src/main/java/com/yihu/jw/dict/service/BaseDictJobTitleService.java

@@ -0,0 +1,47 @@
package com.yihu.jw.dict.service;
import com.alibaba.fastjson.JSONObject;
import com.yihu.jw.dict.dao.BaseDictJobTitleDao;
import com.yihu.jw.entity.base.dict.DictJobTitleDO;
import com.yihu.jw.enums.BaseSystemDictEnum;
import com.yihu.mysql.query.BaseJpaService;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.data.domain.Pageable;
import org.springframework.stereotype.Service;
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
@Service
public class BaseDictJobTitleService extends BaseJpaService<DictJobTitleDO, BaseDictJobTitleDao> {
    @Autowired
    private BaseDictJobTitleDao baseDictJobTitleDao;
    /**
     * 查询某一租户下的职称字典信息，如果saadId为空表示当前用户角色为超级管理员，超级管理员可以看到所有数据
     * @param saasId
     * @return
     */
    public JSONObject queryAll(String saasId, Pageable pageable){
        JSONObject jsonObject = new JSONObject();
        long count = 0;
        List<Map<String,Object>> list = new ArrayList<>();
        if(StringUtils.isEmpty(saasId)){
            list = baseDictJobTitleDao.findCodeAndName(pageable);
            count = baseDictJobTitleDao.count();
        }else{
            list = baseDictJobTitleDao.findCodeAndNameBySaasId(saasId,pageable);
            count = baseDictJobTitleDao.countBySaasId(saasId);
        }
        jsonObject.put("count",count);
        jsonObject.put(BaseSystemDictEnum.JobTitleDict.toString(),list);
        return jsonObject;
    }
    public void deleteById(Integer id){
        baseDictJobTitleDao.delete(id);
    }
}

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

@@ -0,0 +1,23 @@
package com.yihu.jw.dict.service;
import com.yihu.jw.area.dao.BaseCityDao;
import com.yihu.jw.dict.dao.DictHospitalDeptDao;
import com.yihu.jw.entity.base.area.BaseCityDO;
import com.yihu.jw.entity.base.dict.DictHospitalDeptDO;
import com.yihu.mysql.query.BaseJpaService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.util.List;
@Service
public class DictHospitalDeptService extends BaseJpaService<BaseCityDO, BaseCityDao> {
    @Autowired
    private DictHospitalDeptDao dictHospitalDeptDao;
    // 基于机构编码，获取该机构下所有的科室列表
    public List<DictHospitalDeptDO> getHosDeptByCode(String orgCode) {
        return dictHospitalDeptDao.findByOrgCode(orgCode);
    }
}

business/base-service/src/main/java/com/yihu/jw/doctor/dao/BaseDoctorDao.java

@@ -19,4 +19,6 @@ import org.springframework.data.repository.PagingAndSortingRepository;
public interface BaseDoctorDao extends PagingAndSortingRepository<BaseDoctorDO, String>, JpaSpecificationExecutor<BaseDoctorDO>  {
    BaseDoctorDO findById(String id);
}

business/base-service/src/main/java/com/yihu/jw/doctor/dao/BaseDoctorHospitalDao.java

@@ -20,4 +20,7 @@ public interface BaseDoctorHospitalDao extends PagingAndSortingRepository<BaseDo
    List<Map<String,Object>> getOrgAndDutyByDoctorCode(String doctorCode);
    List<BaseDoctorHospitalDO> findByDoctorCode(String doctorCode);
    List<BaseDoctorHospitalDO> findByOrgCodeAndDeptCode(String orgCode,String deptCode);
}

business/base-service/src/main/java/com/yihu/jw/doctor/service/BaseDoctorHosService.java

@@ -0,0 +1,22 @@
package com.yihu.jw.doctor.service;
import com.yihu.jw.doctor.dao.BaseDoctorHospitalDao;
import com.yihu.jw.entity.base.doctor.BaseDoctorHospitalDO;
import com.yihu.mysql.query.BaseJpaService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.util.List;
@Service
public class BaseDoctorHosService extends BaseJpaService<BaseDoctorHospitalDO, BaseDoctorHospitalDao> {
    @Autowired
    private BaseDoctorHospitalDao baseDoctorHospitalDao;
    // 基于机构编码及科室编码，获取科室下所有的医生列表
    public List<BaseDoctorHospitalDO> getDoctorByOrgAndDept(String orgCode, String deptCode) {
        return baseDoctorHospitalDao.findByOrgCodeAndDeptCode(orgCode,deptCode);
    }
}

business/base-service/src/main/java/com/yihu/jw/doctor/service/BaseDoctorService.java

@@ -0,0 +1,19 @@
package com.yihu.jw.doctor.service;
import com.yihu.jw.doctor.dao.BaseDoctorDao;
import com.yihu.jw.entity.base.doctor.BaseDoctorDO;
import com.yihu.mysql.query.BaseJpaService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@Service
public class BaseDoctorService extends BaseJpaService<BaseDoctorDO, BaseDoctorDao> {
    @Autowired
    private BaseDoctorDao baseDoctorDao;
    // 基于医生ID，获取医生基础信息
    public BaseDoctorDO getDoctorByCode(String id) {
        return baseDoctorDao.findById(id);
    }
}

business/base-service/src/main/java/com/yihu/jw/enums/BaseSystemDictEnum.java

@@ -0,0 +1,6 @@
package com.yihu.jw.enums;
public enum BaseSystemDictEnum {
    Icd10Dict, HospitalDeptDict, JobTitleDict, HealthProblemDict, DiseaseDict, MedicineDict,SystemDict;
}

business/base-service/src/main/java/com/yihu/jw/hospital/consult/dao/DoctorClinicRoomConsultDao.java

@@ -1,7 +1,6 @@
package com.yihu.jw.hospital.consult.dao;
import com.yihu.jw.entity.hospital.consult.WlyyDoctorClinicRoomDO;
import com.yihu.jw.entity.hospital.prescription.WlyyPrescriptionDO;
import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
import org.springframework.data.repository.PagingAndSortingRepository;

business/base-service/src/main/java/com/yihu/jw/org/dao/BaseOrgDao.java

@@ -42,4 +42,7 @@ public interface BaseOrgDao extends PagingAndSortingRepository<BaseOrgDO, String
    @Query("select code as code,name as name from BaseOrgDO where del = 1")
    List<Map<String,Object>> findOrgListBySaasId();
    List<BaseOrgDO> findByCityCode(String cityCode);
}

business/base-service/src/main/java/com/yihu/jw/org/service/BaseOrgService.java

@@ -0,0 +1,21 @@
package com.yihu.jw.org.service;
import com.yihu.jw.entity.base.org.BaseOrgDO;
import com.yihu.jw.org.dao.BaseOrgDao;
import com.yihu.mysql.query.BaseJpaService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.util.List;
@Service
public class BaseOrgService extends BaseJpaService<BaseOrgDO, BaseOrgDao> {
    @Autowired
    private BaseOrgDao baseOrgDao;
    // 基于市，获取医院列表信息
    public List<BaseOrgDO> getOrgByCity(String cityCode) {
        return baseOrgDao.findByCityCode(cityCode);
    }
}