系统字典

common/common-entity/src/main/java/com/yihu/jw/entity/base/peopel_num/BasePeopleNumDO.java

@@ -1,4 +1,4 @@
package com.yihu.jw.entity.base.peopel_num;
package com.yihu.jw.entity.base.population;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.yihu.jw.entity.UuidIdentityEntityWithOperator;
@@ -11,12 +11,12 @@ import java.util.Date;
/**
* 基础人口基数信息实体
*
* @author Administrator on  2018年09月05日
* @author litaohong on  2018年09月26日
*
*/
@Entity
@Table(name = "base_people_num")
public class BasePeopleNumDO extends UuidIdentityEntityWithOperator {
@Table(name = "base_population")
public class BasePopulationDO extends UuidIdentityEntityWithOperator {
    /**
	 * saas化的id
@@ -46,7 +46,7 @@ public class BasePeopleNumDO extends UuidIdentityEntityWithOperator {
    /**
	 * 人口数
	 */
	private Integer num;
	private Integer populationNum;
    /**
	 * 类别 0是省，1是市，2是区，3是机构
@@ -59,34 +59,34 @@ public class BasePeopleNumDO extends UuidIdentityEntityWithOperator {
	private Integer year;
    /**
	 * 高血压发病数
	 * 高血压发病数,HBP为医学简称
	 */
	private Integer gxyNum;
	private Integer hbpNum;
    /**
	 * 糖尿病发病数
	 * 糖尿病发病数,DM为医学简称
	 */
	private Integer tnbNum;
	private Integer dmNum;
    /**
	 * 65岁以上老年人口数
	 */
	private Integer sixFiveNum;
	private Integer olderThan65Num;
    /**
	 * 高血压任务数
	 */
	private Integer gxyTaskNum;
	private Integer hbpTaskNum;
    /**
	 * 糖尿病任务数
	 */
	private Integer tnbTaskNum;
	private Integer dmTaskNum;
    /**
	 * 65岁以上老年人口任务数
	 */
	private Integer sixFiveTaskNum;
	private Integer olderThan65TaskNum;
    /**
	 * 户籍人口任务数
@@ -140,12 +140,12 @@ public class BasePeopleNumDO extends UuidIdentityEntityWithOperator {
        this.name = name;
    }
	@Column(name = "num")
    public Integer getNum() {
        return num;
	@Column(name = "population_num")
    public Integer getPopulationNum() {
        return populationNum;
    }
    public void setNum(Integer num) {
        this.num = num;
    public void setPopulationNum(Integer populationNum) {
        this.populationNum = populationNum;
    }
	@Column(name = "type")
@@ -164,52 +164,52 @@ public class BasePeopleNumDO extends UuidIdentityEntityWithOperator {
        this.year = year;
    }
	@Column(name = "gxy_num")
    public Integer getGxyNum() {
        return gxyNum;
	@Column(name = "hbp_num")
    public Integer getHbpNum() {
        return hbpNum;
    }
    public void setGxyNum(Integer gxyNum) {
        this.gxyNum = gxyNum;
    public void setHbpNum(Integer hbpNum) {
        this.hbpNum = hbpNum;
    }
	@Column(name = "tnb_num")
    public Integer getTnbNum() {
        return tnbNum;
	@Column(name = "dm_num")
    public Integer getDmNum() {
        return dmNum;
    }
    public void setTnbNum(Integer tnbNum) {
        this.tnbNum = tnbNum;
    public void setDmNum(Integer dmNum) {
        this.dmNum = dmNum;
    }
	@Column(name = "six_five_num")
    public Integer getSixFiveNum() {
        return sixFiveNum;
	@Column(name = "older_than_65_num")
    public Integer getOlderThan65Num() {
        return olderThan65Num;
    }
    public void setSixFiveNum(Integer sixFiveNum) {
        this.sixFiveNum = sixFiveNum;
    public void setOlderThan65Num(Integer olderThan65Num) {
        this.olderThan65Num = olderThan65Num;
    }
	@Column(name = "gxy_task_num")
    public Integer getGxyTaskNum() {
        return gxyTaskNum;
	@Column(name = "hbp_task_num")
    public Integer getHbpTaskNum() {
        return hbpTaskNum;
    }
    public void setGxyTaskNum(Integer gxyTaskNum) {
        this.gxyTaskNum = gxyTaskNum;
    public void setHbpTaskNum(Integer hbpTaskNum) {
        this.hbpTaskNum = hbpTaskNum;
    }
	@Column(name = "tnb_task_num")
    public Integer getTnbTaskNum() {
        return tnbTaskNum;
	@Column(name = "dm_task_num")
    public Integer getDmTaskNum() {
        return dmTaskNum;
    }
    public void setTnbTaskNum(Integer tnbTaskNum) {
        this.tnbTaskNum = tnbTaskNum;
    public void setDmTaskNum(Integer dmTaskNum) {
        this.dmTaskNum = dmTaskNum;
    }
	@Column(name = "six_five_task_num")
    public Integer getSixFiveTaskNum() {
        return sixFiveTaskNum;
	@Column(name = "older_than_65_task_num")
    public Integer getOlderThan65TaskNum() {
        return olderThan65TaskNum;
    }
    public void setSixFiveTaskNum(Integer sixFiveTaskNum) {
        this.sixFiveTaskNum = sixFiveTaskNum;
    public void setOlderThan65TaskNum(Integer olderThan65TaskNum) {
        this.olderThan65TaskNum = olderThan65TaskNum;
    }
	@Column(name = "task_num")

common/common-request-mapping/src/main/java/com/yihu/jw/rm/base/BaseRequestMapping.java

@@ -276,8 +276,8 @@ public class BaseRequestMapping {
    /**
     * 基础人口基数
     */
    public static class BasePeopleNum extends Basic {
        public static final String PREFIX  = "/basePeopleNum";
    public static class BasePopulation extends Basic {
        public static final String PREFIX  = "/basePopulation";
    }

common/common-rest-model/src/main/java/com/yihu/jw/restmodel/base/people_num/BasePeopleNumVO.java

@@ -1,4 +1,4 @@
package com.yihu.jw.restmodel.base.people_num;
package com.yihu.jw.restmodel.base.population;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.yihu.jw.restmodel.UuidIdentityVOWithOperator;
@@ -14,13 +14,13 @@ import java.util.Date;
 * @version 
 * <pre>
 * Author	Version		Date		Changes
 * Administrator 	1.0  2018年09月05日 Created
 * litaohong 	1.0  2018年09月26日 update
 *
 * </pre>
 * @since 1.
 */
@ApiModel(value = "BasePeopleNumVO", description = "基础人口基数信息")
public class BasePeopleNumVO extends UuidIdentityVOWithOperator {
@ApiModel(value = "BasePopulationVO", description = "基础人口基数信息")
public class BasePopulationVO extends UuidIdentityVOWithOperator {
    /**
	 * saas化的id
@@ -49,14 +49,14 @@ public class BasePeopleNumVO extends UuidIdentityVOWithOperator {
    /**
	 * 所属具体名称
	 */
	@ApiModelProperty(value = "所属具体名称", example = "自然数")
	@ApiModelProperty(value = "所属具体名称", example = "")
    private String name;
    /**
	 * 人口数
	 */
	@ApiModelProperty(value = "人口数", example = "自然数")
    private Integer num;
    private Integer populationNum;
    /**
	 * 类别 0是省，1是市，2是区，3是机构
@@ -71,40 +71,40 @@ public class BasePeopleNumVO extends UuidIdentityVOWithOperator {
    private Integer year;
    /**
	 * 高血压发病数
	 * 高血压发病数,HBP为医学简称
	 */
	@ApiModelProperty(value = "高血压发病数", example = "自然数")
    private Integer gxyNum;
	@ApiModelProperty(value = "高血压发病数,HBP为医学简称", example = "模块1")
    private Integer hbpNum;
    /**
	 * 糖尿病发病数
	 * 糖尿病发病数,DM为医学简称
	 */
	@ApiModelProperty(value = "糖尿病发病数", example = "自然数")
    private Integer tnbNum;
	@ApiModelProperty(value = "糖尿病发病数,DM为医学简称", example = "模块1")
    private Integer dmNum;
    /**
	 * 65岁以上老年人口数
	 */
	@ApiModelProperty(value = "65岁以上老年人口数", example = "自然数")
    private Integer sixFiveNum;
    private Integer olderThan65Num;
    /**
	 * 高血压任务数
	 */
	@ApiModelProperty(value = "高血压任务数", example = "自然数")
    private Integer gxyTaskNum;
    private Integer hbpTaskNum;
    /**
	 * 糖尿病任务数
	 */
	@ApiModelProperty(value = "糖尿病任务数", example = "自然数")
    private Integer tnbTaskNum;
    private Integer dmTaskNum;
    /**
	 * 65岁以上老年人口任务数
	 */
	@ApiModelProperty(value = "65岁以上老年人口任务数", example = "自然数")
    private Integer sixFiveTaskNum;
    private Integer olderThan65TaskNum;
    /**
	 * 户籍人口任务数
@@ -155,11 +155,11 @@ public class BasePeopleNumVO extends UuidIdentityVOWithOperator {
        this.name = name;
    }
    public Integer getNum() {
        return num;
    public Integer getPopulationNum() {
        return populationNum;
    }
    public void setNum(Integer num) {
        this.num = num;
    public void setPopulationNum(Integer populationNum) {
        this.populationNum = populationNum;
    }
    public String getType() {
@@ -176,46 +176,46 @@ public class BasePeopleNumVO extends UuidIdentityVOWithOperator {
        this.year = year;
    }
    public Integer getGxyNum() {
        return gxyNum;
    public Integer getHbpNum() {
        return hbpNum;
    }
    public void setGxyNum(Integer gxyNum) {
        this.gxyNum = gxyNum;
    public void setHbpNum(Integer hbpNum) {
        this.hbpNum = hbpNum;
    }
    public Integer getTnbNum() {
        return tnbNum;
    public Integer getDmNum() {
        return dmNum;
    }
    public void setTnbNum(Integer tnbNum) {
        this.tnbNum = tnbNum;
    public void setDmNum(Integer dmNum) {
        this.dmNum = dmNum;
    }
    public Integer getSixFiveNum() {
        return sixFiveNum;
    public Integer getOlderThan65Num() {
        return olderThan65Num;
    }
    public void setSixFiveNum(Integer sixFiveNum) {
        this.sixFiveNum = sixFiveNum;
    public void setOlderThan65Num(Integer olderThan65Num) {
        this.olderThan65Num = olderThan65Num;
    }
    public Integer getGxyTaskNum() {
        return gxyTaskNum;
    public Integer getHbpTaskNum() {
        return hbpTaskNum;
    }
    public void setGxyTaskNum(Integer gxyTaskNum) {
        this.gxyTaskNum = gxyTaskNum;
    public void setHbpTaskNum(Integer hbpTaskNum) {
        this.hbpTaskNum = hbpTaskNum;
    }
    public Integer getTnbTaskNum() {
        return tnbTaskNum;
    public Integer getDmTaskNum() {
        return dmTaskNum;
    }
    public void setTnbTaskNum(Integer tnbTaskNum) {
        this.tnbTaskNum = tnbTaskNum;
    public void setDmTaskNum(Integer dmTaskNum) {
        this.dmTaskNum = dmTaskNum;
    }
    public Integer getSixFiveTaskNum() {
        return sixFiveTaskNum;
    public Integer getOlderThan65TaskNum() {
        return olderThan65TaskNum;
    }
    public void setSixFiveTaskNum(Integer sixFiveTaskNum) {
        this.sixFiveTaskNum = sixFiveTaskNum;
    public void setOlderThan65TaskNum(Integer olderThan65TaskNum) {
        this.olderThan65TaskNum = olderThan65TaskNum;
    }
    public Integer getTaskNum() {

sql/init.sql

@@ -216,23 +216,23 @@ CREATE TABLE `base_team_member` (
-- 基础人口信息
drop table IF EXISTS `base_people_num`;
CREATE TABLE `base_people_num` (
drop table IF EXISTS `base_population`;
CREATE TABLE `base_population` (
  `id` varchar(50) NOT NULL DEFAULT '' COMMENT '主键(uuid)，基础人口信息uuid',
  `saas_id`  varchar(100) NOT NULL COMMENT 'saas化的id',
  `province_code` varchar(50) DEFAULT NULL COMMENT '所属省代码',
  `city_code` varchar(50) DEFAULT NULL COMMENT '所属市代码',
  `district_code` varchar(50) DEFAULT NULL COMMENT '所属区代码',
  `name` varchar(200) DEFAULT NULL COMMENT '所属具体名称',
  `num` int(10) DEFAULT NULL COMMENT '人口数',
  `population_num` int(10) DEFAULT NULL COMMENT '人口数',
  `type` varchar(2) DEFAULT NULL COMMENT '类别 0是省，1是市，2是区，3是机构',
  `year` int(10) DEFAULT NULL COMMENT '每年的人口数',
  `gxy_num` int(10) DEFAULT  '0' COMMENT '高血压发病数',
  `tnb_num` int(10) DEFAULT  '0' COMMENT '糖尿病发病数',
  `six_five_num` int(10) DEFAULT  '0' COMMENT '65岁以上老年人口数',
  `gxy_task_num` int(10) DEFAULT  '0' COMMENT '高血压任务数',
  `tnb_task_num` int(10) DEFAULT  '0' COMMENT '糖尿病任务数',
  `six_five_task_num` int(10) DEFAULT  '0' COMMENT '65岁以上老年人口任务数',
  `HBP_num` int(10) DEFAULT  '0' COMMENT '高血压发病数,HBP为医学简称',
  `DM_num` int(10) DEFAULT  '0' COMMENT '糖尿病发病数,DM为医学简称',
  `older_than_65_num` int(10) DEFAULT  '0' COMMENT '65岁以上老年人口数',
  `HBP_task_num` int(10) DEFAULT  '0' COMMENT '高血压任务数',
  `DM_task_num` int(10) DEFAULT  '0' COMMENT '糖尿病任务数',
  `older_than_65_task_num` int(10) DEFAULT  '0' COMMENT '65岁以上老年人口任务数',
  `task_num` int(10) DEFAULT  '0' COMMENT '户籍人口任务数',
  `create_time` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '创建时间',
  PRIMARY KEY (`id`)

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

@@ -1,10 +1,13 @@
package com.yihu.jw.base.dao.dict;
import com.yihu.jw.entity.base.dict.DictIcd10DO;
import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
import org.springframework.data.repository.PagingAndSortingRepository;
import com.yihu.jw.entity.base.dict.DictHealthProblemDO;
import java.util.List;
/**
 * 
 * 健康问题字典 数据库访问层
@@ -18,4 +21,8 @@ import com.yihu.jw.entity.base.dict.DictHealthProblemDO;
 * @since 1.
 */
public interface DictHealthProblemDao extends PagingAndSortingRepository<DictHealthProblemDO, Integer>, JpaSpecificationExecutor<DictHealthProblemDO>  {
    List<DictIcd10DO> findCodeAndNameBySaasId(String saasId);
    List<DictIcd10DO> findCodeAndName();
}

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

@@ -1,10 +1,13 @@
package com.yihu.jw.base.dao.dict;
import com.yihu.jw.entity.base.dict.DictIcd10DO;
import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
import org.springframework.data.repository.PagingAndSortingRepository;
import com.yihu.jw.entity.base.dict.DictHospitalDeptDO;
import java.util.List;
/**
 * 
 * 医院科室字典 数据库访问层
@@ -18,4 +21,8 @@ import com.yihu.jw.entity.base.dict.DictHospitalDeptDO;
 * @since 1.
 */
public interface DictHospitalDeptDao extends PagingAndSortingRepository<DictHospitalDeptDO, Integer>, JpaSpecificationExecutor<DictHospitalDeptDO>  {
    List<DictIcd10DO> findCodeAndNameBySaasId(String saasId);
    List<DictIcd10DO> findCodeAndName();
}

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

@@ -5,6 +5,8 @@ import org.springframework.data.repository.PagingAndSortingRepository;
import com.yihu.jw.entity.base.dict.DictIcd10DO;
import java.util.List;
/**
 * 
 * ICD10字典 数据库访问层
@@ -18,4 +20,8 @@ import com.yihu.jw.entity.base.dict.DictIcd10DO;
 * @since 1.
 */
public interface DictIcd10Dao extends PagingAndSortingRepository<DictIcd10DO, Integer>, JpaSpecificationExecutor<DictIcd10DO>  {
    List<DictIcd10DO> findCodeAndNameBySaasId(String saasId);
    List<DictIcd10DO> findCodeAndName();
}

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

@@ -1,10 +1,13 @@
package com.yihu.jw.base.dao.dict;
import com.yihu.jw.entity.base.dict.DictIcd10DO;
import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
import org.springframework.data.repository.PagingAndSortingRepository;
import com.yihu.jw.entity.base.dict.DictJobTitleDO;
import java.util.List;
/**
 * 
 * 职称字典 数据库访问层
@@ -18,4 +21,8 @@ import com.yihu.jw.entity.base.dict.DictJobTitleDO;
 * @since 1.
 */
public interface DictJobTitleDao extends PagingAndSortingRepository<DictJobTitleDO, Integer>, JpaSpecificationExecutor<DictJobTitleDO>  {
    
    List<DictIcd10DO> findCodeAndNameBySaasId(String saasId);
    List<DictIcd10DO> findCodeAndName();
}

svr/svr-base/src/main/java/com/yihu/jw/base/dao/patient/BasePatientDao.java

@@ -2,7 +2,12 @@ package com.yihu.jw.base.dao.patient;
import com.yihu.jw.entity.base.patient.BasePatientDO;
import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
import org.springframework.data.jpa.repository.Query;
import org.springframework.data.repository.PagingAndSortingRepository;
import org.springframework.data.repository.query.Param;
import java.util.Collection;
import java.util.Map;
/**
 * Created by Trick on 2018/8/31.
@@ -10,4 +15,5 @@ import org.springframework.data.repository.PagingAndSortingRepository;
public interface BasePatientDao extends PagingAndSortingRepository<BasePatientDO, String>, JpaSpecificationExecutor<BasePatientDO> {
    BasePatientDO findByIdAndDel(String id,String del);
}

svr/svr-base/src/main/java/com/yihu/jw/base/dao/people_num/BasePeopleNumDao.java

@@ -1,21 +0,0 @@
package com.yihu.jw.base.dao.people_num;
import com.yihu.jw.entity.base.peopel_num.BasePeopleNumDO;
import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
import org.springframework.data.repository.PagingAndSortingRepository;
/**
 * 
 * 基础人口基数信息 数据库访问层
 * 
 * @version 
 * <pre>
 * Author	Version		Date		Changes
 * Administrator 	1.0  		2018年09月05日 	Created
 *
 * </pre>
 * @since 1.
 */
public interface BasePeopleNumDao extends PagingAndSortingRepository<BasePeopleNumDO, String>, JpaSpecificationExecutor<BasePeopleNumDO>  {
}

svr/svr-base/src/main/java/com/yihu/jw/base/dao/population/BasePopulationDao.java

@@ -0,0 +1,21 @@
package com.yihu.jw.base.dao.population;
import com.yihu.jw.entity.base.population.BasePopulationDO;
import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
import org.springframework.data.repository.PagingAndSortingRepository;
/**
 * 
 * 基础人口基数信息 数据库访问层
 * 
 * @version 
 * <pre>
 * Author	Version		Date		Changes
 * litaohong 	1.0  		2018年09月26日 	update
 *
 * </pre>
 * @since 1.
 */
public interface BasePopulationDao extends PagingAndSortingRepository<BasePopulationDO, String>, JpaSpecificationExecutor<BasePopulationDO>  {
}

svr/svr-base/src/main/java/com/yihu/jw/base/endpoint/people_num/BasePeopleNumEndpoint.java

@@ -1,8 +1,8 @@
package com.yihu.jw.base.endpoint.people_num;
package com.yihu.jw.base.endpoint.population;
import com.yihu.jw.base.service.people_num.BasePeopleNumService;
import com.yihu.jw.entity.base.peopel_num.BasePeopleNumDO;
import com.yihu.jw.restmodel.base.people_num.BasePeopleNumVO;
import com.yihu.jw.base.service.population.BasePopulationService;
import com.yihu.jw.entity.base.population.BasePopulationDO;
import com.yihu.jw.restmodel.base.population.BasePopulationVO;
import com.yihu.jw.restmodel.web.Envelop;
import com.yihu.jw.restmodel.web.ListEnvelop;
import com.yihu.jw.restmodel.web.ObjEnvelop;
@@ -18,7 +18,6 @@ import org.springframework.web.bind.annotation.*;
import java.util.List;
/**
*
* 基础人口基数信息控制器
@@ -26,54 +25,54 @@ import java.util.List;
* @version
* <pre>
 * Author	Version		Date		Changes
 * Administrator 	1.0  		2018年09月05日 	Created
 * litaohong 	1.0  		2018年09月26日 	update
 *
 * </pre>
* @since 1.
*/
@RestController
@RequestMapping(value = BaseRequestMapping.BasePeopleNum.PREFIX)
@RequestMapping(value = BaseRequestMapping.BasePopulation.PREFIX)
@Api(value = "基础人口基数信息管理", description = "基础人口基数信息管理服务接口", tags = {"wlyy基础服务 - 基础人口基数信息管理服务接口"})
public class BasePeopleNumEndpoint extends EnvelopRestEndpoint {
public class BasePopulationEndpoint extends EnvelopRestEndpoint {
@Autowired
private BasePeopleNumService basePeopleNumService;
private BasePopulationService basePopulationService;
@PostMapping(value = BaseRequestMapping.BasePeopleNum.CREATE, consumes = MediaType.APPLICATION_JSON_UTF8_VALUE)
@PostMapping(value = BaseRequestMapping.BasePopulation.CREATE, consumes = MediaType.APPLICATION_JSON_UTF8_VALUE)
@ApiOperation(value = "创建")
public ObjEnvelop<BasePeopleNumVO> create (
public ObjEnvelop<BasePopulationVO> create (
    @ApiParam(name = "json_data", value = "Json数据", required = true)
    @RequestBody String jsonData) throws Exception {
    BasePeopleNumDO basePeopleNum = toEntity(jsonData, BasePeopleNumDO.class);
    basePeopleNum = basePeopleNumService.save(basePeopleNum);
    return success(basePeopleNum, BasePeopleNumVO.class);
    BasePopulationDO basePopulation = toEntity(jsonData, BasePopulationDO.class);
    basePopulation = basePopulationService.save(basePopulation);
    return success(basePopulation, BasePopulationVO.class);
    }
    @PostMapping(value = BaseRequestMapping.BasePeopleNum.DELETE)
    @PostMapping(value = BaseRequestMapping.BasePopulation.DELETE)
    @ApiOperation(value = "删除")
    public Envelop delete(
    @ApiParam(name = "ids", value = "id串，中间用,分隔", required = true)
    @RequestParam(value = "ids") String ids) {
    basePeopleNumService.delete(ids.split(","));
    basePopulationService.delete(ids.split(","));
    return success("删除成功");
    }
    @PostMapping(value = BaseRequestMapping.BasePeopleNum.UPDATE, consumes = MediaType.APPLICATION_JSON_UTF8_VALUE)
    @PostMapping(value = BaseRequestMapping.BasePopulation.UPDATE, consumes = MediaType.APPLICATION_JSON_UTF8_VALUE)
    @ApiOperation(value = "更新")
    public ObjEnvelop<BasePeopleNumVO> update (
    public ObjEnvelop<BasePopulationVO> update (
        @ApiParam(name = "json_data", value = "Json数据", required = true)
        @RequestBody String jsonData) throws Exception {
        BasePeopleNumDO basePeopleNum = toEntity(jsonData, BasePeopleNumDO.class);
        if (null == basePeopleNum.getId()) {
        BasePopulationDO basePopulation = toEntity(jsonData, BasePopulationDO.class);
        if (null == basePopulation.getId()) {
        return failed("ID不能为空", ObjEnvelop.class);
        }
        basePeopleNum = basePeopleNumService.save(basePeopleNum);
        return success(basePeopleNum, BasePeopleNumVO.class);
        basePopulation = basePopulationService.save(basePopulation);
        return success(basePopulation, BasePopulationVO.class);
        }
        @GetMapping(value = BaseRequestMapping.BasePeopleNum.PAGE)
        @GetMapping(value = BaseRequestMapping.BasePopulation.PAGE)
        @ApiOperation(value = "获取分页")
        public PageEnvelop<BasePeopleNumVO> page (
        public PageEnvelop<BasePopulationVO> page (
            @ApiParam(name = "fields", value = "返回的字段，为空返回全部字段")
            @RequestParam(value = "fields", required = false) String fields,
            @ApiParam(name = "filters", value = "过滤器，为空检索所有条件")
@@ -84,22 +83,22 @@ public ObjEnvelop<BasePeopleNumVO> create (
            @RequestParam(value = "page") int page,
            @ApiParam(name = "size", value = "页码", required = true, defaultValue = "15")
            @RequestParam(value = "size") int size) throws Exception {
            List<BasePeopleNumDO> basePeopleNums = basePeopleNumService.search(fields, filters, sorts, page, size);
                int count = (int)basePeopleNumService.getCount(filters);
                return success(basePeopleNums, count, page, size, BasePeopleNumVO.class);
            List<BasePopulationDO> basePopulations = basePopulationService.search(fields, filters, sorts, page, size);
                int count = (int)basePopulationService.getCount(filters);
                return success(basePopulations, count, page, size, BasePopulationVO.class);
         }
         @GetMapping(value = BaseRequestMapping.BasePeopleNum.LIST)
         @GetMapping(value = BaseRequestMapping.BasePopulation.LIST)
         @ApiOperation(value = "获取列表")
         public ListEnvelop<BasePeopleNumVO> list (
         public ListEnvelop<BasePopulationVO> list (
             @ApiParam(name = "fields", value = "返回的字段，为空返回全部字段")
             @RequestParam(value = "fields", required = false) String fields,
             @ApiParam(name = "filters", value = "过滤器，为空检索所有条件")
             @RequestParam(value = "filters", required = false) String filters,
             @ApiParam(name = "sorts", value = "排序，规则参见说明文档")
             @RequestParam(value = "sorts", required = false) String sorts) throws Exception {
             List<BasePeopleNumDO> basePeopleNums = basePeopleNumService.search(fields, filters, sorts);
                  return success(basePeopleNums, BasePeopleNumVO.class);
             List<BasePopulationDO> basePopulations = basePopulationService.search(fields, filters, sorts);
                  return success(basePopulations, BasePopulationVO.class);
         }
 }

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

@@ -1,10 +1,18 @@
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.entity.base.dict.DictIcd10DO;
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 com.yihu.jw.entity.base.dict.DictHealthProblemDO;
import java.util.ArrayList;
import java.util.List;
/**
 * 
 * 健康问题字典服务service
@@ -19,4 +27,24 @@ import com.yihu.jw.entity.base.dict.DictHealthProblemDO;
 */
@Service
public class DictHealthProblemService extends BaseJpaService<DictHealthProblemDO, DictHealthProblemDao> {
    @Autowired
    private DictJobTitleDao dictJobTitleDao;
    /**
     * 查询某一租户下的健康问题字典信息，如果saadId为空表示当前用户角色为超级管理员，超级管理员可以看到所有数据
     * @param saasId
     * @return
     */
    public String queryAll(String saasId){
        JSONObject jsonObject = new JSONObject();
        List<DictIcd10DO> list = new ArrayList<>();
        if(StringUtils.isEmpty(saasId)){
            list = dictJobTitleDao.findCodeAndName();
        }else{
            list = dictJobTitleDao.findCodeAndNameBySaasId(saasId);
        }
        jsonObject.put("healthProDict",list);
        return jsonObject.toJSONString();
    }
}

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

@@ -1,10 +1,18 @@
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.entity.base.dict.DictIcd10DO;
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 com.yihu.jw.entity.base.dict.DictHospitalDeptDO;
import java.util.ArrayList;
import java.util.List;
/**
 * 
 * 医院科室字典服务service
@@ -19,4 +27,24 @@ import com.yihu.jw.entity.base.dict.DictHospitalDeptDO;
 */
@Service
public class DictHospitalDeptService extends BaseJpaService<DictHospitalDeptDO, DictHospitalDeptDao> {
    @Autowired
    private DictHospitalDeptDao dictHospitalDeptDao;
    /**
     * 查询某一租户下的医院科室字典信息，如果saadId为空表示当前用户角色为超级管理员，超级管理员可以看到所有数据
     * @param saasId
     * @return
     */
    public String queryAll(String saasId){
        JSONObject jsonObject = new JSONObject();
        List<DictIcd10DO> list = new ArrayList<>();
        if(StringUtils.isEmpty(saasId)){
            list = dictHospitalDeptDao.findCodeAndName();
        }else{
            list = dictHospitalDeptDao.findCodeAndNameBySaasId(saasId);
        }
        jsonObject.put("hosDeptDict",list);
        return jsonObject.toJSONString();
    }
}

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

@@ -1,10 +1,16 @@
package com.yihu.jw.base.service.dict;
import com.alibaba.fastjson.JSONObject;
import com.yihu.jw.base.dao.dict.DictIcd10Dao;
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 com.yihu.jw.entity.base.dict.DictIcd10DO;
import java.util.ArrayList;
import java.util.List;
/**
 * 
 * ICD10字典服务service
@@ -19,4 +25,25 @@ import com.yihu.jw.entity.base.dict.DictIcd10DO;
 */
@Service
public class DictIcd10Service extends BaseJpaService<DictIcd10DO, DictIcd10Dao> {
    @Autowired
    private DictIcd10Dao dictIcd10Dao;
    /**
     * 查询某一租户下的Icd10字典信息，如果saadId为空表示当前用户角色为超级管理员，超级管理员可以看到所有数据
     * @param saasId
     * @return
     */
    public String queryAll(String saasId){
        JSONObject jsonObject = new JSONObject();
        List<DictIcd10DO> list = new ArrayList<>();
        if(StringUtils.isEmpty(saasId)){
           list = dictIcd10Dao.findCodeAndName();
        }else{
           list = dictIcd10Dao.findCodeAndNameBySaasId(saasId);
        }
        jsonObject.put("icd10Dict",list);
        return jsonObject.toJSONString();
    }
}

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

@@ -1,10 +1,18 @@
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.entity.base.dict.DictIcd10DO;
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 com.yihu.jw.entity.base.dict.DictJobTitleDO;
import java.util.ArrayList;
import java.util.List;
/**
 * 
 * 职称字典服务service
@@ -19,4 +27,24 @@ import com.yihu.jw.entity.base.dict.DictJobTitleDO;
 */
@Service
public class DictJobTitleService extends BaseJpaService<DictJobTitleDO, DictJobTitleDao> {
    @Autowired
    private DictJobTitleDao dictJobTitleDao;
    /**
     * 查询某一租户下的职称字典信息，如果saadId为空表示当前用户角色为超级管理员，超级管理员可以看到所有数据
     * @param saasId
     * @return
     */
    public String queryAll(String saasId){
        JSONObject jsonObject = new JSONObject();
        List<DictIcd10DO> list = new ArrayList<>();
        if(StringUtils.isEmpty(saasId)){
            list = dictJobTitleDao.findCodeAndName();
        }else{
            list = dictJobTitleDao.findCodeAndNameBySaasId(saasId);
        }
        jsonObject.put("hosDeptDict",list);
        return jsonObject.toJSONString();
    }
}

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

@@ -1,6 +1,7 @@
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;
@@ -29,6 +30,9 @@ import java.util.Map;
@Service
public class BasePatientService extends BaseJpaService<BasePatientDO, BasePatientDao> {
    @Autowired
    private BasePatientDao basePatientDao;
    /**
     * 居民id
     * @param patientId
@@ -44,6 +48,21 @@ 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);
    }
}

svr/svr-base/src/main/java/com/yihu/jw/base/service/people_num/BasePeopleNumService.java

@@ -1,22 +0,0 @@
package com.yihu.jw.base.service.people_num;
import com.yihu.jw.base.dao.people_num.BasePeopleNumDao;
import com.yihu.jw.entity.base.peopel_num.BasePeopleNumDO;
import com.yihu.mysql.query.BaseJpaService;
import org.springframework.stereotype.Service;
/**
 * 
 * 基础人口基数信息服务service
 * 
 * @version 
 * <pre>
 * Author	Version		Date		Changes
 * Administrator    1.0  2018年09月05日 Created
 *
 * </pre>
 * @since 1.
 */
@Service
public class BasePeopleNumService extends BaseJpaService<BasePeopleNumDO, BasePeopleNumDao> {
}

svr/svr-base/src/main/java/com/yihu/jw/base/service/population/BasePopulationService.java

@@ -0,0 +1,22 @@
package com.yihu.jw.base.service.population;
import com.yihu.jw.base.dao.population.BasePopulationDao;
import com.yihu.jw.entity.base.population.BasePopulationDO;
import com.yihu.mysql.query.BaseJpaService;
import org.springframework.stereotype.Service;
/**
 * 
 * 基础人口基数信息服务service
 * 
 * @version 
 * <pre>
 * Author	Version		Date		Changes
 * litaohong    1.0  2018年09月26日 update
 *
 * </pre>
 * @since 1.
 */
@Service
public class BasePopulationService extends BaseJpaService<BasePopulationDO, BasePopulationDao> {
}

svr/svr-base/src/main/java/com/yihu/jw/base/service/system/SystemDictService.java

@@ -1,8 +1,12 @@
package com.yihu.jw.base.service.system;
import com.alibaba.fastjson.JSONObject;
import com.netflix.discovery.converters.Auto;
import com.yihu.jw.base.service.dict.*;
import com.yihu.jw.entity.base.system.SystemDictDO;
import com.yihu.jw.base.dao.system.SystemDictDao;
import com.yihu.mysql.query.BaseJpaService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
/**
@@ -12,4 +16,32 @@ import org.springframework.stereotype.Service;
@Service
public class SystemDictService extends BaseJpaService<SystemDictDO, SystemDictDao> {
    @Autowired
    private DictIcd10Service dictIcd10Service;
    @Autowired
    private DictHospitalDeptService dictHospitalDeptService;
    @Autowired
    private DictJobTitleService dictJobTitleService;
    @Autowired
    private DictHealthProblemService dictHealthProblemService;
    @Autowired
    private DictDiseaseService dictDiseaseService;
    @Autowired
    private DictMedicineService dictMedicineService;
    /**
     * 获取系统所有相关字典，
     * @param userId
     * @return
     */
    public String getAllDistList(String userId){
        JSONObject jsonObject = new JSONObject();
//        dictIcd10Service.queryAll();
        return null;
    }
}