Skip to content

S
sv-springboot
Commit 7b216d74 by Suvalue
Options

预算编制-汇总优化

parent 95732721
Showing with 124 additions and 44 deletions
hs-api/src/main/java/com/hs/api/common/aspect/RequestMappingAspect.java
......@@ -49,7 +49,7 @@ public class RequestMappingAspect {
Object[] params = joinPoint.getArgs();
List<Object> paramsList = Arrays.asList(params);
Date endDate = new Date();
logger.debug("执行时间：" +
logger.info("执行时间：" +
(endDate.getTime() - beginDate.getTime())
+ ",URL:" + uri + "入参参数：" + paramsList + "返回结果：" + result);
return result;
......
hs-api/src/main/java/com/hs/api/mapper/SerProjValueMapper.java
......@@ -2,6 +2,7 @@ package com.hs.api.mapper;
import com.hs.api.model.SerProjValue;
import com.hs.api.model.respmodel.SerProjValueResp;
import com.hs.api.model.respmodel.Summary;
import org.apache.ibatis.annotations.Param;
import java.math.BigDecimal;
......@@ -21,14 +22,16 @@ public interface SerProjValueMapper {
List<SerProjValueResp> selectValue(@Param("projType") Integer projType,
@Param("typeState") Integer typeState,
@Param("exponentId") Integer exponentId,
@Param("dept") String dept,@Param("date") Integer date,
@Param("budgetType") Integer budgetType,@Param("hosCode") String hosCode);
@Param("dept") String dept, @Param("date") Integer date,
@Param("budgetType") Integer budgetType, @Param("hosCode") String hosCode);
int deleteByDeptWithDate(@Param("dept") String dept,@Param("date") BigDecimal date,
@Param("projType") Integer projType,@Param("orgCode") String orgCode);
int deleteByDeptWithDate(@Param("dept") String dept, @Param("date") BigDecimal date,
@Param("projType") Integer projType, @Param("orgCode") String orgCode);
int insertToHistory(@Param("dept") String dept,@Param("date") BigDecimal date,
@Param("projType") Integer projType,@Param("orgCode") String orgCode);
int insertToHistory(@Param("dept") String dept, @Param("date") BigDecimal date,
@Param("projType") Integer projType, @Param("orgCode") String orgCode);
void updateValue(@Param("date") BigDecimal date,@Param("hosCode") String hosCode);
void updateValue(@Param("date") BigDecimal date, @Param("hosCode") String hosCode);
List<Summary> selectSummary(@Param("date") Integer date, @Param("hosCode") String hosCode);
}
\ No newline at end of file
hs-api/src/main/java/com/hs/api/service/Impl/SerProjValueServiceImpl.java
......@@ -117,39 +117,30 @@ public class SerProjValueServiceImpl implements SerProjValueService {
List<DicOrg> orgList = dicOrgMapper.selectByUser(userId);
String orgCode = orgList.get(0).getOrgCode();
List<Summary> result = serProjMapper.selectDept(date, budgetType, userId);
if (result != null && result.size() > 0) {
for (Summary summary : result) {
summary.setProjTypeList(new ArrayList<>());
List<Map<String, Object>> enumList = ProjectType.all();
SummaryProjType projType = null;
List<ProjectInfo> projectInfo = null;
SerProjValueSz valueSz = null;
List<SerProjValueResp> values = null;
if (enumList != null && enumList.size() > 0) {
for (Map<String, Object> enumInfo : enumList) {
projType = new SummaryProjType();
projType.setProjTypeName(String.valueOf(enumInfo.get("description")));
values = serProjValueMapper.selectValue((Integer) enumInfo.get("value"), null,
null, summary.getDeptCode(), date, budgetType, orgCode);
// if (values != null && values.size() > 0) {
// for (SerProjValueResp value : values) {
// valueSz = projValueSzMapper.selectByProj(value.getProjId(), date, summary.getDeptCode(), orgCode);
// if (valueSz != null) {
// value.setSz(valueSz.getSz());
// value.setZxpl(valueSz.getZxpl());
// valueSz = null;
// }
// }
projType.setProject(values);
// }
summary.getProjTypeList().add(projType);
}
} else {
summary.setProjTypeList(null);
}
}
}
// List<Summary> result = serProjMapper.selectDept(date, budgetType, userId);
// if (result != null && result.size() > 0) {
// for (Summary summary : result) {
// summary.setProjTypeList(new ArrayList<>());
// List<Map<String, Object>> enumList = ProjectType.all();
// SummaryProjType projType = null;
// List<ProjectInfo> projectInfo = null;
// SerProjValueSz valueSz = null;
// List<SerProjValueResp> values = null;
// if (enumList != null && enumList.size() > 0) {
// for (Map<String, Object> enumInfo : enumList) {
// projType = new SummaryProjType();
// projType.setProjTypeName(String.valueOf(enumInfo.get("description")));
// values = serProjValueMapper.selectValue((Integer) enumInfo.get("value"), null,
// null, summary.getDeptCode(), date, budgetType, orgCode);
// projType.setProject(values);
// summary.getProjTypeList().add(projType);
// }
// } else {
// summary.setProjTypeList(null);
// }
// }
// }
List<Summary> result = serProjValueMapper.selectSummary(date, orgCode);
return result;
}
......
hs-api/src/main/resources/application-test.properties
......@@ -3,6 +3,7 @@ spring.datasource.url=jdbc:mysql://192.168.18.176:3306/scml_sy2.0?useUnicode=tru
spring.datasource.username=root
spring.datasource.password=Suvalue2016
spring.datasource.driver-class-name=com.mysql.jdbc.Driver
spring.datasource.druid.initial-size=1
project.path=localhost
......
hs-api/src/main/resources/application.properties
spring.application.name=hs
spring.profiles.active=test
#server.port=8080
#server.servlet.context-path=/api
mybatis.mapper-locations=classpath:mapper/*.xml
mybatis.type-aliases-package=com.hs.api.model
......@@ -9,6 +8,8 @@ server.compression.enabled=true
server.compression.min-response-size=1024
server.compression.mime-types=application/json
spring.mvc.servlet.load-on-startup=1
config.path.include[0]=/token
config.path.include[1]=/user/**
config.path.exclude[0]=/login
......
hs-api/src/main/resources/mapper/SerProjValueMapper.xml
......@@ -33,6 +33,41 @@
<result column="IS_BUDGET" jdbcType="DECIMAL" property="isBudget"/>
<result column="PARENT" jdbcType="DECIMAL" property="parent"/>
</resultMap>
<resultMap id="Summary" type="com.hs.api.model.respmodel.Summary">
<result column="DEPT_CODE" jdbcType="VARCHAR" property="deptCode"/>
<collection property="projTypeList" column="ID" ofType="com.hs.api.model.respmodel.SummaryProjType">
<result column="PROJ_TYPE_NAME" jdbcType="VARCHAR" property="projTypeName"/>
<collection property="project" column="ID" ofType="com.hs.api.model.respmodel.SerProjValueResp">
<result column="CREATE_DATE" jdbcType="TIMESTAMP" property="createDate"/>
<result column="CREATE_USERID" jdbcType="DECIMAL" property="createUserid"/>
<result column="STATE" jdbcType="DECIMAL" property="state"/>
<result column="PROJ_ID" jdbcType="DECIMAL" property="projId"/>
<result column="QNZ" jdbcType="DECIMAL" property="qnz"/>
<result column="WQQS" jdbcType="DECIMAL" property="wqqs"/>
<result column="LS" jdbcType="DECIMAL" property="ls"/>
<result column="MB" jdbcType="DECIMAL" property="mb"/>
<result column="CSYSZ" jdbcType="DECIMAL" property="csysz"/>
<result column="CSYSZ_TB" jdbcType="DECIMAL" property="csyszTb"/>
<result column="YSZ" jdbcType="DECIMAL" property="ysz"/>
<result column="YSZ_TB" jdbcType="DECIMAL" property="yszTb"/>
<result column="SZ2" jdbcType="DECIMAL" property="sz"/>
<result column="ZXPL2" jdbcType="DECIMAL" property="zxpl"/>
<result column="DATE" jdbcType="DECIMAL" property="date"/>
<result column="DEPT_CODE" jdbcType="VARCHAR" property="deptCode"/>
<result column="SORT" jdbcType="DECIMAL" property="sort"/>
<result column="VERSION" jdbcType="VARCHAR" property="version"/>
<result column="QNZ_UNIT" jdbcType="VARCHAR" property="qnzUnit"/>
<result column="CSYSZ_UNIT" jdbcType="VARCHAR" property="csyszUnit"/>
<result column="YSZ_UNIT" jdbcType="VARCHAR" property="yszUnit"/>
<result column="SZ_UNIT" jdbcType="VARCHAR" property="szUnit"/>
<result column="WQQS_ZYPZ_JS" jdbcType="DECIMAL" property="wqqsZypzJs"/>
<result column="DEPT_NAME" jdbcType="VARCHAR" property="deptName"/>
<result column="PROJ_NAME" jdbcType="VARCHAR" property="projName"/>
<result column="IS_BUDGET" jdbcType="VARCHAR" property="isBudget"/>
<result column="PARENT" jdbcType="VARCHAR" property="parent"/>
</collection>
</collection>
</resultMap>
<delete id="deleteByPrimaryKey" parameterType="java.math.BigDecimal">
delete
from val_proj_value
......@@ -215,4 +250,29 @@
#{hosCode,jdbcType=VARCHAR}
)}
</update>
<select id="selectSummary" resultMap="Summary">
SELECT v.*,
p.PROJ_NAME,
p.IS_BUDGET,
p.PARENT,
(CASE p.PROJ_TYPE
WHEN 1 THEN '门诊'
WHEN 2 THEN '住院'
WHEN 3 THEN '汇总'
ELSE '未知' END) as PROJ_TYPE_NAME,
sz.SZ as SZ2,
sz.ZXPL as ZXPL2
FROM dic_bgt_proj p
left JOIN val_proj_value v ON v.PROJ_ID = p.ID
AND v.`DATE` = LEFT(#{date,jdbcType=DECIMAL}, 4)
AND v.HOS_CODE = #{hosCode,jdbcType=VARCHAR}
left join val_proj_value_sz sz on sz.PROJ_ID = p.ID
AND sz.DEPT_CODE = v.DEPT_CODE
AND sz.`DATE` = #{date,jdbcType=DECIMAL}
AND sz.HOS_CODE = v.HOS_CODE
WHERE 1 = 1
and p.`STATE` = 1
AND p.IS_BUDGET &amp; 2 > 0
ORDER BY p.SORT
</select>
</mapper>
\ No newline at end of file
hs-api/src/main/resources/更新日志.txt
时间：2020.08.05 版本号：2.02.0805001
时间：2020.08.07 版本号：2.02.0807001
时间：2020.08.07 版本号：2.02.0807001
前端更新说明
587 预算编制右上角筛选选“心脏外科”。一直点下钻，到能效的趋势图界面时，中间趋势图无法切换到医生
588 绩效科室下默认图柱子优化
后端更新说明
预算编制-总览 查询速度优化
-------------------------------------------------------------------------------------------------------------------------------------------------------------------------
时间：2020.08.06 版本号：2.02.0806001
前端更新说明
585 费用主题下，默认选中指偏，药偏，耗偏三个折线
584 能效下趋势图图标，折线显示异常
573 所有趋势图的柱子例数少时看不到，优化，固定高度
547 趋势图优化，所有模块（排除成本，绩效）
581 科室内医保的右下三级病组初始支付率不要灰色
580 绩效科室内右下二级病组点击应没有效果
554 成本科室内的中下病组和右下病组列表高亮对不上，左下的主病组要联动
520 趋势图可拖动标杆尺，先做一张能效的全院科室趋势图
----------------------------------------------------------------------------------------------------------------------------------------------------------------------
时间：2020.08.05 版本号：2.02.0805001
后端更新说明：
......
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