3 Коміти 71f92893c7 ... 806d3a089c

Автор SHA1 Опис Дата
  zdm 806d3a089c Merge remote-tracking branch 'origin/dev' into dev 5 роки тому
  zdm 4e9b73b97d 指标实体追加 5 роки тому
  zdm 2dc91c3509 医生同步获取科室信息 5 роки тому

+ 2 - 0
business/base-service/src/main/java/com/yihu/jw/dict/dao/DictHospitalDeptDao.java

@ -35,6 +35,8 @@ public interface DictHospitalDeptDao extends PagingAndSortingRepository<DictHosp
    List<DictHospitalDeptDO> findByOrgCodeIn(String orgCode);
    List<DictHospitalDeptDO> findByOrgCodeAndCode(String orgCode,String code);
    Long countByCodeIn(String orgCode);
    boolean existsByCodeAndOrgCode(String code, String orgCode);

+ 6 - 0
business/base-service/src/main/java/com/yihu/jw/hospital/prescription/service/entrance/EntranceService.java

@ -1506,6 +1506,12 @@ public class EntranceService {
                                    baseDoctorHospitalDO.setOrgName("厦门市中山医院");
                                    baseDoctorHospitalDO.setDoctorCode(baseDoctorDO.getId());
                                    baseDoctorHospitalDO.setDeptCode(deptCode);
                                    //根据机构编码获取机构名称
                                    List<DictHospitalDeptDO>  dictHospitalDeptDOS=  dictHospitalDeptDao.findByOrgCodeAndCode("350211A1002",deptCode);
                                    if(null!=dictHospitalDeptDOS&&dictHospitalDeptDOS.size()>0){
                                        DictHospitalDeptDO dictHospitalDeptDO=dictHospitalDeptDOS.get(0);
                                        baseDoctorHospitalDO.setDeptName(dictHospitalDeptDO.getName());
                                    }
                                    baseDoctorHospitalDO.setDel("1");
                                    baseDoctorHospitalDao.save(baseDoctorHospitalDO);
                                }

+ 114 - 0
common/common-entity/src/main/java/com/yihu/jw/entity/dimension/DimensionDo.java

@ -0,0 +1,114 @@
package com.yihu.jw.entity.dimension;
import com.yihu.jw.entity.IdEntity;
import javax.persistence.Entity;
import javax.persistence.Table;
import java.util.Date;
/**
 * Created by chenweida on 2017/7/10.
 */
@Entity
@Table(name = "dimension")
public class DimensionDo extends IdEntity {
    private String code;
    private String type;
    private String name;
    private Date createTime;
    private String createUser;
    private String createUserName;
    private Date updateTime;
    private String updateUser;
    private String updateUserName;
    private Integer status;////-1 删除 0 禁用 可用
    private String remark;
    public String getCode() {
        return code;
    }
    public void setCode(String code) {
        this.code = code;
    }
    public String getType() {
        return type;
    }
    public void setType(String type) {
        this.type = type;
    }
    public String getName() {
        return name;
    }
    public void setName(String name) {
        this.name = name;
    }
    public Date getCreateTime() {
        return createTime;
    }
    public void setCreateTime(Date createTime) {
        this.createTime = createTime;
    }
    public String getCreateUser() {
        return createUser;
    }
    public void setCreateUser(String createUser) {
        this.createUser = createUser;
    }
    public String getCreateUserName() {
        return createUserName;
    }
    public void setCreateUserName(String createUserName) {
        this.createUserName = createUserName;
    }
    public Date getUpdateTime() {
        return updateTime;
    }
    public void setUpdateTime(Date updateTime) {
        this.updateTime = updateTime;
    }
    public String getUpdateUser() {
        return updateUser;
    }
    public void setUpdateUser(String updateUser) {
        this.updateUser = updateUser;
    }
    public String getUpdateUserName() {
        return updateUserName;
    }
    public void setUpdateUserName(String updateUserName) {
        this.updateUserName = updateUserName;
    }
    public Integer getStatus() {
        return status;
    }
    public void setStatus(Integer status) {
        this.status = status;
    }
    public String getRemark() {
        return remark;
    }
    public void setRemark(String remark) {
        this.remark = remark;
    }
}

+ 68 - 0
common/common-entity/src/main/java/com/yihu/jw/entity/dimension/DimensionQuotaDo.java

@ -0,0 +1,68 @@
package com.yihu.jw.entity.dimension;
import com.yihu.jw.entity.IdEntity;
import javax.persistence.Entity;
import javax.persistence.Table;
/**
 * Created by chenweida on 2017/7/10.
 */
@Entity
@Table(name = "dimension_quota")
public class DimensionQuotaDo extends IdEntity {
    private String quotaCode;
    private String dimensionCode;
    private String dictSql;
    private Integer sort;
    private String convertClazz;
    private String key;
    public String getQuotaCode() {
        return quotaCode;
    }
    public void setQuotaCode(String quotaCode) {
        this.quotaCode = quotaCode;
    }
    public String getDimensionCode() {
        return dimensionCode;
    }
    public void setDimensionCode(String dimensionCode) {
        this.dimensionCode = dimensionCode;
    }
    public String getDictSql() {
        return dictSql;
    }
    public void setDictSql(String dictSql) {
        this.dictSql = dictSql;
    }
    public Integer getSort() {
        return sort;
    }
    public void setSort(Integer sort) {
        this.sort = sort;
    }
    public String getConvertClazz() {
        return convertClazz;
    }
    public void setConvertClazz(String convertClazz) {
        this.convertClazz = convertClazz;
    }
    public String getKey() {
        return key;
    }
    public void setKey(String key) {
        this.key = key;
    }
}