Skip to content

S
sv-springboot
Commit e22c704a by Suvalue
Options

1.疾病接口修改 

2.指标接口修改
parent 2f4a9329
Showing with 60 additions and 39 deletions
bsoft-api/src/main/java/com/bsoft/api/controller/SerDiseaseController.java
...@@ -29,9 +29,9 @@ public class SerDiseaseController { ...@@ -29,9 +29,9 @@ public class SerDiseaseController {
*/ */
@PostMapping("disease/list") @PostMapping("disease/list")
@Token @Token
@ApiOperation("根据ID或者等级查询疾病信息") @ApiOperation("根据疾病编码或者疾病等级查询疾病列表")
public Object getDiseaseByLevel(@RequestBody Disease.DiseaseIDorLevel disease) throws InterruptedException { public Object getDiseaseByLevel(@RequestBody Disease.DiseaseIDorLevel disease) throws InterruptedException {
List<DiseaseLevel> diseaseLevel = serDiseaseService.selectListByIdorLevel(disease.getDate(),disease.getDiseaseId(),disease.getLevel()); List<DiseaseLevel> diseaseLevel = serDiseaseService.selectListByIdorLevel(disease.getDate(),disease.getDisease(),disease.getLevel());
return Result.success(diseaseLevel); return Result.success(diseaseLevel);
} }
......
bsoft-api/src/main/java/com/bsoft/api/mapper/SerDiseaseMapper.java
...@@ -14,12 +14,16 @@ public interface SerDiseaseMapper { ...@@ -14,12 +14,16 @@ public interface SerDiseaseMapper {
SerDisease selectByPrimaryKey(Long id); SerDisease selectByPrimaryKey(Long id);
SerDisease selectByCode(String code,String date);
List<SerDisease> selectAll(); List<SerDisease> selectAll();
List<SerDisease> selectByMdcName(@Param("date") String date,@Param("mdcName") String mdcName); List<SerDisease> selectByMdcName(@Param("date") String date,@Param("mdcName") String mdcName);
List<DiseaseLevel> selectByLevel(@Param("date") String date,@Param("level") Integer level); List<DiseaseLevel> selectByLevel(@Param("date") String date,@Param("level") Integer level);
List<DiseaseLevel> selectByParentId(@Param("date") String date,@Param("parentId") Integer parentId);
DiseaseLevel selectParentById(@Param("date") String date, @Param("diseaseId") Integer diseaseId); DiseaseLevel selectParentById(@Param("date") String date, @Param("diseaseId") Integer diseaseId);
List<DiseaseLevel> selectSonById(@Param("date") String date, @Param("diseaseId") Integer diseaseId); List<DiseaseLevel> selectSonById(@Param("date") String date, @Param("diseaseId") Integer diseaseId);
......
bsoft-api/src/main/java/com/bsoft/api/model/reqmodel/Disease.java
...@@ -12,22 +12,14 @@ public class Disease { ...@@ -12,22 +12,14 @@ public class Disease {
@ApiModelProperty(value = "时间",required = true) @ApiModelProperty(value = "时间",required = true)
private String date; private String date;
@ApiModelProperty(value = "疾病ID",required = false) @ApiModelProperty(value = "疾病编码",required = false)
private Integer diseaseId; private String disease;
@ApiModelProperty(value = "等级",required = false) @ApiModelProperty(value = "等级",required = false)
private Integer level; private Integer level;
@ApiModelProperty(value = "科室编码",required = false) @ApiModelProperty(value = "科室编码",required = false)
private String docCode; private String doctor;
@ApiModelProperty(value = "医生编码",required = false) @ApiModelProperty(value = "医生编码",required = false)
private String deptCode; private String dept;
public Integer getDiseaseId() {
return diseaseId;
}
public void setDiseaseId(Integer diseaseId) {
this.diseaseId = diseaseId;
}
public String getDate() { public String getDate() {
return date; return date;
...@@ -37,6 +29,14 @@ public class Disease { ...@@ -37,6 +29,14 @@ public class Disease {
this.date = date; this.date = date;
} }
public String getDisease() {
return disease;
}
public void setDisease(String disease) {
this.disease = disease;
}
public Integer getLevel() { public Integer getLevel() {
return level; return level;
} }
...@@ -45,22 +45,21 @@ public class Disease { ...@@ -45,22 +45,21 @@ public class Disease {
this.level = level; this.level = level;
} }
public String getDocCode() { public String getDoctor() {
return docCode; return doctor;
} }
public void setDocCode(String docCode) { public void setDoctor(String doctor) {
this.docCode = docCode; this.doctor = doctor;
} }
public String getDeptCode() { public String getDept() {
return deptCode; return dept;
} }
public void setDeptCode(String deptCode) { public void setDept(String dept) {
this.deptCode = deptCode; this.dept = dept;
} }
} }
/** /**
......
bsoft-api/src/main/java/com/bsoft/api/service/Impl/BlockValuesServiceImpl.java
...@@ -135,7 +135,7 @@ public class BlockValuesServiceImpl implements BlockValuesService { ...@@ -135,7 +135,7 @@ public class BlockValuesServiceImpl implements BlockValuesService {
for (SerPageBlockRs data : pageBlocklist) { for (SerPageBlockRs data : pageBlocklist) {
//获取表名 //获取表名
Long blockId = data.getBlockId(); Long blockId = data.getBlockId();
String tableName = "VAL_BLOCK_VALUES_" + blockId; String tableName = "VAL_BLOCK_VALUES_" +pageCode+"_"+page.getId()+"_"+ blockId;
asynBlockValuesServiceImpl.getBlockValues(list, blockId, tableName, whereClause, latch); asynBlockValuesServiceImpl.getBlockValues(list, blockId, tableName, whereClause, latch);
} }
......
bsoft-api/src/main/java/com/bsoft/api/service/Impl/SerDiseaseServiceImpl.java
...@@ -15,10 +15,10 @@ public class SerDiseaseServiceImpl implements SerDiseaseService { ...@@ -15,10 +15,10 @@ public class SerDiseaseServiceImpl implements SerDiseaseService {
private SerDiseaseMapper serDiseaseMapper; private SerDiseaseMapper serDiseaseMapper;
@Override @Override
public List<DiseaseLevel> selectListByIdorLevel(String date, Integer diseaseId,Integer level){ public List<DiseaseLevel> selectListByIdorLevel(String date, String diseaseCode,Integer level){
List<DiseaseLevel> list = new ArrayList<>(); List<DiseaseLevel> list = new ArrayList<>();
if(diseaseId!=null){ if(diseaseCode!=null){
list = selectById(date,diseaseId); list = selectById(date,diseaseCode);
}else{ }else{
list = selectByLevel(date,level); list = selectByLevel(date,level);
} }
...@@ -33,26 +33,26 @@ public class SerDiseaseServiceImpl implements SerDiseaseService { ...@@ -33,26 +33,26 @@ public class SerDiseaseServiceImpl implements SerDiseaseService {
/** /**
* 根据id查询父子级别列表 * 根据id查询父子级别列表
* @param date 时间 * @param date 时间
* @param diseaseId ID * @param diseaseCode ID
* @return * @return
*/ */
private List<DiseaseLevel> selectById(String date, Integer diseaseId){ private List<DiseaseLevel> selectById(String date, String diseaseCode){
SerDisease disease = serDiseaseMapper.selectByPrimaryKey(Long.valueOf(diseaseId)); SerDisease disease = serDiseaseMapper.selectByCode(diseaseCode,date);
if(disease==null){ if(disease==null){
return null; return null;
} }
//查询父级菜单对象 //查询父级菜单对象
DiseaseLevel diseaseLevel = serDiseaseMapper.selectParentById(date,diseaseId); DiseaseLevel diseaseLevel = serDiseaseMapper.selectParentById(date,disease.getId().intValue());
List<DiseaseLevel> parentList = new ArrayList<>(); List<DiseaseLevel> parentList = new ArrayList<>();
//查询同级菜单列表 //查询同级菜单列表
List<DiseaseLevel> serDiseaseList = serDiseaseMapper.selectByLevel(date,disease.getLevel().intValue()); List<DiseaseLevel> serDiseaseList = serDiseaseMapper.selectByParentId(date,disease.getParentId().intValue());
List<DiseaseLevel> diseaseLevelList = new ArrayList<>(); List<DiseaseLevel> diseaseLevelList = new ArrayList<>();
for (DiseaseLevel serDiseases: serDiseaseList) { for (DiseaseLevel serDiseases: serDiseaseList) {
DiseaseLevel diseaseLevel1 = new DiseaseLevel(); DiseaseLevel diseaseLevel1 = new DiseaseLevel();
//查询子级菜单列表 //查询子级菜单列表
if(serDiseases.getId().intValue()==diseaseId){ if(serDiseases.getMdcCode().equals(diseaseCode)){
List<DiseaseLevel> diseaseLevelList1 = serDiseaseMapper.selectSonById(date,diseaseId); List<DiseaseLevel> diseaseLevelList1 = serDiseaseMapper.selectSonById(date,disease.getId().intValue());
diseaseLevel1.setDiseaseLevelList(diseaseLevelList1); diseaseLevel1.setDiseaseLevelList(diseaseLevelList1);
} }
diseaseLevel1.setDate(serDiseases.getDate()); diseaseLevel1.setDate(serDiseases.getDate());
......
bsoft-api/src/main/java/com/bsoft/api/service/SerDiseaseService.java
...@@ -8,5 +8,5 @@ import java.util.List; ...@@ -8,5 +8,5 @@ import java.util.List;
public interface SerDiseaseService { public interface SerDiseaseService {
List<SerDisease> selectByMdcName(String date,String mdcName); List<SerDisease> selectByMdcName(String date,String mdcName);
List<DiseaseLevel> selectListByIdorLevel(String date,Integer diseaseId,Integer level); List<DiseaseLevel> selectListByIdorLevel(String date,String diseaseCode,Integer level);
} }
bsoft-api/src/main/resources/mapper/SerDiseaseMapper.xml
...@@ -33,8 +33,8 @@ ...@@ -33,8 +33,8 @@
select SEQ_SER_DISEASE_ID.nextval from dual select SEQ_SER_DISEASE_ID.nextval from dual
</selectKey> </selectKey>
insert into LL.SER_DISEASE ( insert into LL.SER_DISEASE (
MDC_CODE, MDC_NAME, DATE, MDC_CODE, MDC_NAME, DATE,
MDC_NUM, PARENT_ID, LEVEL, MDC_NUM, PARENT_ID, LEVEL,
ORG_ID, ORG_NAME) ORG_ID, ORG_NAME)
values ( values (
#{mdcCode,jdbcType=VARCHAR}, #{mdcName,jdbcType=VARCHAR}, #{date,jdbcType=DECIMAL}, #{mdcCode,jdbcType=VARCHAR}, #{mdcName,jdbcType=VARCHAR}, #{date,jdbcType=DECIMAL},
...@@ -60,8 +60,14 @@ ...@@ -60,8 +60,14 @@
from LL.SER_DISEASE from LL.SER_DISEASE
where ID = #{id,jdbcType=DECIMAL} where ID = #{id,jdbcType=DECIMAL}
</select> </select>
<select id="selectByCode" resultMap="BaseResultMap">
select ID, CREATE_DATE, CREATE_USERID, STATE, MDC_CODE, MDC_NAME, "DATE", MDC_NUM,
PARENT_ID, "LEVEL", ORG_ID, ORG_NAME
from LL.SER_DISEASE
where MDC_CODE = #{code,jdbcType=VARCHAR} and "DATE" = #{date,jdbcType=VARCHAR}
</select>
<select id="selectAll" resultMap="BaseResultMap"> <select id="selectAll" resultMap="BaseResultMap">
select ID, CREATE_DATE, CREATE_USERID, STATE, MDC_CODE, MDC_NAME, DATE, MDC_NUM, select ID, CREATE_DATE, CREATE_USERID, STATE, MDC_CODE, MDC_NAME, DATE, MDC_NUM,
PARENT_ID, LEVEL, ORG_ID, ORG_NAME PARENT_ID, LEVEL, ORG_ID, ORG_NAME
from LL.SER_DISEASE from LL.SER_DISEASE
</select> </select>
...@@ -89,6 +95,18 @@ ...@@ -89,6 +95,18 @@
and "LEVEL" = #{level,jdbcType=DECIMAL} and "LEVEL" = #{level,jdbcType=DECIMAL}
</if> </if>
</select> </select>
<select id="selectByParentId" resultMap="DiseaseLevel">
select ID, CREATE_DATE, CREATE_USERID, STATE, MDC_CODE, MDC_NAME, "DATE", MDC_NUM,
PARENT_ID,"LEVEL", ORG_ID, ORG_NAME
from LL.SER_DISEASE
where 1 = 1 and STATE=1
<if test="date!=null">
and "DATE" = #{date,jdbcType=VARCHAR}
</if>
<if test="parentId!=null">
and PARENT_ID = #{parentId,jdbcType=DECIMAL}
</if>
</select>
<select id="selectParentById" resultMap="DiseaseLevel"> <select id="selectParentById" resultMap="DiseaseLevel">
select * select *
from SER_DISEASE from SER_DISEASE
......
bsoft-api/src/main/resources/mapper/SysMenuMapper.xml
...@@ -52,7 +52,7 @@ ...@@ -52,7 +52,7 @@
SYS_MENU m on rmr.MENU_ID = m.ID SYS_MENU m on rmr.MENU_ID = m.ID
LEFT JOIN LEFT JOIN
SYS_USER_ROLE_RS urr on rmr.ROLE_ID = urr.Role_ID SYS_USER_ROLE_RS urr on rmr.ROLE_ID = urr.Role_ID
where rmr.STATE=1 and m.STATE=1 and urr.STATE=1 and urr.USER_ID = 2 where rmr.STATE=1 and m.STATE=1 and urr.STATE=1 and urr.USER_ID = #{userId,jdbcType=DECIMAL}
union union
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment