导出名字错误

master
linjj 2 years ago
parent 9fd2239d30
commit 132d6bbbbe

@ -6,6 +6,8 @@
*/
package com.emr.controller;
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONArray;
import com.emr.entity.Emr_Dictionary;
import com.emr.entity.Power_User;
import com.emr.service.Emr_DictionaryService;
@ -16,6 +18,7 @@ import org.apache.shiro.subject.Subject;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.ResponseBody;
import javax.servlet.http.HttpServletRequest;
@ -45,6 +48,12 @@ public class DictionaryController {
return null;
}
}
@ResponseBody
@RequestMapping(value = "/saveZtree")
public int saveZtree(String initZNodes){
List<Emr_Dictionary> emrDictionaries = JSONArray.parseArray(initZNodes, Emr_Dictionary.class);
return emrDictionaryService.saveZtree(emrDictionaries);
}
@ResponseBody
@RequestMapping(value = "/delById")

@ -77,8 +77,8 @@ public class VCountController {
@ResponseBody
@RequestMapping(value = "/exportExcel")
public void exportExcel(HttpServletResponse response, V_CountVo vCount){
String tableThNames = "科室代码,科室名称,出院人数,已归档,未归档,死亡人数,归档率(%),2日率(%),3日率(%),7日率(%)";
String fieldCns = "deptCode,deptName,outNum,fileNum,unfileNum,deathNum,fileRate,day2Rate,day3Rate,day7Rate";
String tableThNames = "科室代码,科室名称,出院人数,已归档,未归档,死亡人数,归档率(%),2日率(%),3日率(%)";
String fieldCns = "deptCode,deptName,outNum,fileNum,unfileNum,deathNum,fileRate,day3Rate,day2Rate";
//构造excel的数据
try {
List<V_Count> list = v_countService.selectByCol(vCount);
@ -87,11 +87,9 @@ public class VCountController {
Double fileRate = Double.valueOf(count.getFileRate())*100;
Double day2Rate = Double.valueOf(count.getDay2Rate())*100;
Double day3Rate = Double.valueOf(count.getDay3Rate())*100;
Double day7Rate = Double.valueOf(count.getDay7Rate())*100;
count.setFileRate(fileRate.intValue()+"%");
count.setDay2Rate(day2Rate.intValue()+"%");
count.setDay3Rate(day3Rate.intValue()+"%");
count.setDay7Rate(day7Rate.intValue()+"%");
}
}
//文件名

@ -27,6 +27,9 @@ public interface Emr_DictionaryMapper {
*/
int insertSel(Emr_Dictionary emrDictionary);
int saveZtree(@Param("list")List<Emr_Dictionary> list);
/**
* id
* @param id

@ -7,12 +7,22 @@ public class Emr_Dictionary {
private String typename;
public String getSort() {
return sort;
}
public void setSort(String sort) {
this.sort = sort;
}
private String code;
private String name;
private String pyCode;
private String sort;
private String wbCode;
private String zipCode;

@ -20,7 +20,12 @@ public interface Emr_DictionaryService {
* @return
*/
List<Emr_Dictionary> dicByClo(Emr_Dictionary emrDictionary);
/**
* @description:
* @author linjj
* @date: 2023/8/25 15:53
*/
int saveZtree(List<Emr_Dictionary> emrDictionaries);
/**
*
*

@ -29,6 +29,11 @@ public class Emr_DictionaryServiceImpl implements Emr_DictionaryService {
return emrDictionaryMapper.dicByClo(emrDictionary);
}
@Override
public int saveZtree(List<Emr_Dictionary> emrDictionaries) {
return emrDictionaryMapper.saveZtree(emrDictionaries);
}
@Override
public int insertSel(Emr_Dictionary emrDictionary) {
return emrDictionaryMapper.insertSel(emrDictionary);

@ -2,7 +2,7 @@
#POWER_IP = localhost
#POWER_PORT = 8081
POWER_IP = 200.100.104.40
POWER_IP = localhost
POWER_PORT = 8081
#power\u6743\u9650\u7CFB\u7EDF\u7684\u670D\u52A1\u5668\u5730\u5740\u5934
@ -24,7 +24,7 @@ complete_port = ${POWER_PORT}
requestCompleteUrl = http://${complete_ip}:${complete_port}/completeInfo/getCompleteInfoByMasterId/
CHECKSUCCESS_PORT = ${POWER_PORT}
HomepageDictionary=http://${CHECKSUCCESS_IP}:${CHECKSUCCESS_PORT}/WholeCheckInterface/services/HomepageDictionary?wsdl
HomepageDictionary=http://${CHECKSUCCESS_IP}:8081/WholeCheckInterface/services/HomepageDictionary?wsdl
HomepageMethod=CheckData
#webSocket\u670D\u52A1\u5668\u5730\u5740
@ -39,7 +39,7 @@ STR_SPLIT = *^:|,.
recallReason=\u533B\u9662\u9700\u8981\u8FD9\u4EFD\u6587\u6863
#pdf\u6C34\u5370
pdfWater = \u4F5B\u5C71\u5E02\u9AD8\u660E\u4EBA\u6C11\u533B\u9662&\u62CD\u7167\u65E0\u6548,\u9700\u8981\u590D\u5370\u8BF7\u627E\u75C5\u6848\u5BA4
pdfWater = \u6F6E\u5DDE\u5E02\u4EBA\u6C11\u533B\u9662
#\u672C\u5730\u56FE\u7247\u5730\u5740
pictureUrl=D:\\JiaShiPic\\
@ -50,20 +50,10 @@ picSrc=upload\\
#\u5B9A\u4E49\u7B2C\u4E09\u65B9\u6D4F\u89C8\u75C5\u5386\u7684\u67E5\u8BE2\u5168\u90E8\u5206\u7C7B\u7684\u5206\u7C7Bid\u53C2\u6570\u503C
allAddortIds = 00000000
notJudgeTasks = \u77E5\u60C5\u540C\u610F\u4E66
#\u7528\u4E8E\u8D85\u671F\u901A\u77E5\uFF0C\u53EA\u901A\u77E5\u8BE5\u65E5\u671F\u4EE5\u540E\u7684\u51FA\u9662\u8D85\u671F\u7684\u8BB0\u5F55
overDateSet = 2021-05-01
#\u5404\u5BA1\u6838\u89D2\u8272\u7528\u6237id 1\uFF1A\u533B\u751F\uFF1B2\uFF1A\u62A4\u58EB\uFF1B3\uFF1A\u75C5\u6848\u5BA4\u4EBA\u5458\uFF1B5\uFF1A\u533B\u751F\u8D28\u63A7\u5458\uFF1B6\uFF1A\u79D1\u4E3B\u4EFB\uFF1B7\uFF1A\u62A4\u58EB\u957F\uFF1B8\uFF1A\u62A4\u58EB\u8D28\u63A7\u5458
#\u79D1\u4E3B\u4EFB\u548C\u62A4\u58EB\u957F\u5BA1\u6838\u65F6\u9700\u8981\u8FC7\u6EE4\u6821\u9A8C\u7684\u4EFB\u52A1\u6587\u4EF6\u540D\u79F0\u96C6\u5408
notJudgeTasks = \u77E5\u60C5\u540C\u610F\u4E66
#\u7B2C\u4E09\u65B9oracle\u914D\u7F6E\u4FE1\u606F
oracleUrl = 200.100.100.1:1521/orc1
oracleUserName = Jswzh
oraclePassWord = Jswzh
#oracleUrl = 127.0.0.1:1521/ORCL
#oracleUserName = docus
#oraclePassWord = docus702

@ -1,16 +1,16 @@
#\u6570\u636E\u5E93IP
#dataBaseIp=localhost
##\u6570\u636E\u5E93\u540D\u79F0
#dataBaseName=gm_record
##\u6570\u636E\u5E93\u5BC6\u7801
#dataBasePassword=docus702
#\u6570\u636E\u5E93IP
dataBaseIp=200.100.104.40
dataBaseIp=localhost
#\u6570\u636E\u5E93\u540D\u79F0
dataBaseName=emr_record
dataBaseName=gm_record
#\u6570\u636E\u5E93\u5BC6\u7801
dataBasePassword=AbcXyz123
dataBasePassword=admin123
#\u6570\u636E\u5E93IP
#dataBaseIp=200.100.104.40
##\u6570\u636E\u5E93\u540D\u79F0
#dataBaseName=emr_record
##\u6570\u636E\u5E93\u5BC6\u7801
#dataBasePassword=AbcXyz123
jdbc.driver=com.microsoft.sqlserver.jdbc.SQLServerDriver
jdbc.url=jdbc\:sqlserver\://${dataBaseIp}:1433;databaseName=${dataBaseName}

@ -20,6 +20,7 @@
<result column="creater" property="creater" jdbcType="NVARCHAR" />
<result column="create_time" property="createTime" jdbcType="NCHAR" />
<result column="remark" property="remark" jdbcType="NVARCHAR" />
<result column="sort" property="sort" />
</resultMap>
<sql id="Base_Column_List">
id,typeCode,typeName,code,name,py_code,wb_code,zip_code,gb_code,flag,c_comment,parent_id,effective, creater, create_time, updater,
@ -107,6 +108,7 @@
emr_dictionary.gb_code,
emr_dictionary.flag,
emr_dictionary.c_comment,
emr_dictionary.sort,
CASE
WHEN emr_dictionary.parent_id = '0' THEN
emr_dictionary.parent_id
@ -158,7 +160,7 @@
<if test="effective != null">
and emr_dictionary.effective = #{effective,jdbcType=INTEGER}
</if>
ORDER BY emr_dictionary.parent_id
ORDER BY emr_dictionary.sort
<!--
select <include refid="Base_Column_List"/>
from emr_dictionary
@ -371,6 +373,14 @@
</set>
where id = #{id,jdbcType=NVARCHAR}
</update>
<update id="saveZtree">
<foreach collection="list" item="item" separator=";">
update emr_dictionary
set sort = #{item.sort}
where name = #{item.name}
</foreach>
</update>
<!--按父id查询编码和名称-->
<select id="selectAllByParentId" resultMap="BaseResultMap">
select emr_dictionary.CODE,emr_dictionary.NAME from emr_dictionary

@ -88,7 +88,7 @@
</when>
</choose>
group by dept_name) as t1 on c.dept_name= t1.dept_name
left join (select dept_name,COUNT(*) AS fileNum from archive_master as s where (s.ArchiveState = '128' OR (s.ArchiveState = '64' and s.T1 is not null and s.T1 != '' and s.T1 >= '1801-02-04 00:00:00')) and s.inp_no NOT like '%B' and s.inp_no NOT like '%C' and s.inp_no NOT like '%D' and s.ArchiveState='128'
left join (select dept_name,COUNT(*) AS fileNum from archive_master as s where (s.ArchiveState = '128' OR (s.ArchiveState = '64' and s.T1 is not null and s.T1 != '' and s.T1 >= '1801-02-04 00:00:00')) and s.inp_no NOT like '%B' and s.inp_no NOT like '%C' and s.inp_no NOT like '%D'
<choose>
<when test="startDate != null and startDate != '' and endDate != null and endDate != ''">
and discharge_date_time between CONVERT(VARCHAR(10),#{startDate,jdbcType=NCHAR},120) and
@ -116,7 +116,7 @@
</when>
</choose>
group by dept_name) as t4 on c.dept_name= t4.dept_name
left join (select dept_name,COUNT(*) AS Num from archive_master as s where s.ArchiveState = '128' and ( datediff( d, discharge_date_time, checked_datetime ) - ( SELECT COUNT(1) FROM emr_holiday_set WHERE date BETWEEN CONVERT ( VARCHAR (10), discharge_date_time, 120 ) AND checked_datetime AND flag = 2 )) &lt;= 2 and s.inp_no NOT like '%B' and s.inp_no NOT like '%C' and s.inp_no NOT like '%D' and s.ArchiveState='128'
left join (select dept_name,COUNT(*) AS Num from archive_master as s where s.ArchiveState = '64' and ( datediff( d, T1, checked_datetime ) - ( SELECT COUNT(1) FROM emr_holiday_set WHERE date BETWEEN CONVERT ( VARCHAR (10), T1, 120 ) AND checked_datetime AND flag = 2 )) &lt;= 2 and s.inp_no NOT like '%B' and s.inp_no NOT like '%C' and s.inp_no NOT like '%D'
<choose>
<when test="startDate != null and startDate != '' and endDate != null and endDate != ''">
and discharge_date_time between CONVERT(VARCHAR(10),#{startDate,jdbcType=NCHAR},120) and
@ -130,7 +130,7 @@
</when>
</choose>
group by dept_name) as t5 on c.dept_name= t5.dept_name
left join (select dept_name,COUNT(*) AS Num from archive_master as s where (s.ArchiveState = '128' OR (s.ArchiveState = '64' and s.T1 is not null and s.T1 != '' and s.T1 >= '1801-02-04 00:00:00')) and ( datediff( d, discharge_date_time, checked_datetime ) - ( SELECT COUNT(1) FROM emr_holiday_set WHERE date BETWEEN CONVERT ( VARCHAR (10), discharge_date_time, 120 ) AND checked_datetime AND flag = 2 )) &lt;= 3 and s.inp_no NOT like '%B' and s.inp_no NOT like '%C' and s.inp_no NOT like '%D' and s.ArchiveState='128'
left join (select dept_name,COUNT(*) AS Num from archive_master as s where (s.ArchiveState = '128' OR (s.ArchiveState = '64' and s.T1 is not null and s.T1 != '' and s.T1 >= '1801-02-04 00:00:00')) and ( datediff( d, T1, checked_datetime ) - ( SELECT COUNT(1) FROM emr_holiday_set WHERE date BETWEEN CONVERT ( VARCHAR (10), T1, 120 ) AND checked_datetime AND flag = 2 )) &lt;= 3 and s.inp_no NOT like '%B' and s.inp_no NOT like '%C' and s.inp_no NOT like '%D'
<choose>
<when test="startDate != null and startDate != '' and endDate != null and endDate != ''">
and discharge_date_time between CONVERT(VARCHAR(10),#{startDate,jdbcType=NCHAR},120) and
@ -144,7 +144,7 @@
</when>
</choose>
group by dept_name) as t6 on c.dept_name= t6.dept_name
left join (select dept_name,COUNT(*) AS Num from archive_master as s where (s.ArchiveState = '128' OR (s.ArchiveState = '64' and s.T1 is not null and s.T1 != '' and s.T1 >= '1801-02-04 00:00:00')) and ( datediff( d, discharge_date_time, checked_datetime ) - ( SELECT COUNT(1) FROM emr_holiday_set WHERE date BETWEEN CONVERT ( VARCHAR (10), discharge_date_time, 120 ) AND checked_datetime AND flag = 2 )) &lt;= 5 and s.inp_no NOT like '%B' and s.inp_no NOT like '%C' and s.inp_no NOT like '%D' and s.ArchiveState='128'
left join (select dept_name,COUNT(*) AS Num from archive_master as s where (s.ArchiveState = '128' OR (s.ArchiveState = '64' and s.T1 is not null and s.T1 != '' and s.T1 >= '1801-02-04 00:00:00')) and ( datediff( d, T1, checked_datetime ) - ( SELECT COUNT(1) FROM emr_holiday_set WHERE date BETWEEN CONVERT ( VARCHAR (10), T1, 120 ) AND checked_datetime AND flag = 2 )) &lt;= 5 and s.inp_no NOT like '%B' and s.inp_no NOT like '%C' and s.inp_no NOT like '%D'
<choose>
<when test="startDate != null and startDate != '' and endDate != null and endDate != ''">
and discharge_date_time between CONVERT(VARCHAR(10),#{startDate,jdbcType=NCHAR},120) and

@ -204,19 +204,16 @@
<div class="col-sm-1"></div>
</div>
</div>
<%--<div class="row">--%>
<%--<div class="form-group">--%>
<%--<label class="col-sm-3 control-label">父级:</label>--%>
<%--<div class="col-sm-3">--%>
<%--<select id="parentId" class="input-sm form-control">                --%>
<%--&lt;%&ndash;<option value="1">有效</option>                &ndash;%&gt;--%>
<%--&lt;%&ndash;<option value="0">无效</option>&ndash;%&gt;--%>
<%--</select>--%>
<%--</div>--%>
<%--<div class="col-sm-1"></div>--%>
<%--</div>--%>
<%--</div>--%>
<div class="row">
<div class="form-group">
<label class="col-sm-3 control-label">排序:</label>
<div class="col-sm-4">
<input type="text" readonly class="input-sm form-control" id="sort" name="sort"
maxlength="20"/>
</div>
<div class="col-sm-1"></div>
</div>
</div>
<div class="row">
<div class="form-group">
<label class="col-sm-3 control-label">报表上可见:</label>
@ -244,9 +241,8 @@
<div class="form-group">
<label class="col-sm-3 control-label">是否有效:</label>
<div class="col-sm-4">
<select id="effective" class="input-sm form-control">                
<select id="effective" class="input-sm form-control">
<option value="1">有效</option>
               
<option value="0">无效</option>
</select>
</div>
@ -293,6 +289,7 @@
</div>
</div>
<script type="text/javascript">
var initZNodes = []
var zNodes = [];
var nodeList = [];
var currNode;//当前选中节点
@ -321,36 +318,6 @@
};
var spinner = new Spinner(opts);
// function trans_tree(jsonData) {
// //result存储json数据转为树形结构后的结果。
// //temp为临时对象将json数据按照id值排序.
// //len是json长度用于循环遍历结束的条件
// var result = [], temp = {}, len = jsonData.length
// for (var i = 0; i < len; i++) {
// // 以id作为索引存储元素可以无需遍历直接快速定位元素
// temp[jsonData[i]['id']] = jsonData[i]
// }
// for (var j = 0; j < len; j++) {
// var currentElement = jsonData[j]
// // 临时变量里面的当前元素的父元素即pid的值与找对应id值
// var tempCurrentElementParent = temp[currentElement['pid']]
// // 如果存在父元素即如果有pid属性
// if (tempCurrentElementParent) {
// // 如果父元素没有chindren键
// if (!tempCurrentElementParent['children']) {
// // 设上父元素的children键
// tempCurrentElementParent['children'] = []
// }
// // 给父元素加上当前元素作为子元素
// tempCurrentElementParent['children'].push(currentElement)
// }
// // 不存在父元素,意味着当前元素是一级元素
// else {
// result.push(currentElement);
// }
// }
// return result;
// }
function initTree() {
@ -371,18 +338,23 @@
//var htmlStr="";
if (result != null) {
for (var i = 0; i < result.length; i++) {
var obj = {};
obj.id = result[i].id;
obj.pid = result[i].parentId;
obj.pId = result[i].parentId;
obj.typecode = result[i].typecode;
obj.code = result[i].code;
obj.sort = result[i].sort;
if (result[i].parentId == 0 || obj.code == null) {
obj.name = result[i].typename.trim();
obj.open = true
obj.childOuter = false
obj.drag = false
// htmlStr += "<option value=" + result[i].id + ">" + result[i].typename + "</option>";
} else {
obj.name = result[i].name.trim();
obj.dropInner = false
obj.dropRoot = false
// htmlStr += "<option value=" + result[i].id + ">" + result[i].name + "</option>";
}
obj.typename = result[i].typename;
@ -411,18 +383,10 @@
if (currId != "" && currId != null) {
//修改选中已选节点
node = treeObj.getNodeByParam("id", currId);
// $("#addBtn").show();
// $("#subTypeDiv").hide();
// $("#allTypeDiv").show();
// $("#addTypeBtn").hide();
} else {
//添加选中父节点
node = treeObj.getNodeByParam("id", 0);
// $("#addBtn").hide();
// $("#subTypeDiv").show();
// $("#allTypeDiv").hide();
// $("#addTypeBtn").show();
}
currNode = node;
treeObj.selectNode(node, true);//将指定ID的节点选中
@ -453,6 +417,7 @@
$("#parentId").val("");
$("#effective").val(1);
$("#remark").val("");
$("#sort").val("");
}
var setting = {
@ -475,9 +440,19 @@
}
},
edit: {
enable: false
drag: {
autoExpandTrigger: true,
prev: dropPrev,
inner: dropInner,
next: dropNext
},
enable: true,
showRemoveBtn: false,
showRenameBtn: false
},
callback: {
onDrop:onDrop,
beforeDrag: beforeDrag,
beforeClick: function (treeId, treeNode) {
$("#delBtn").show();
$("#allTypeDiv").show();
@ -519,6 +494,7 @@
$("#cComment").val(treeNode.cComment);
$("#flag").val(treeNode.flag);
$("#parentId").val("");
$("#sort").val(treeNode.sort);
$("#effective").val(treeNode.effective);
$("#remark").val(treeNode.remark);
@ -535,29 +511,6 @@
}
};
// function searchNode() {
// var zTree = $.fn.zTree.getZTreeObj("ztree");
// var value = $("#key").val();
// if (value == "") {
// var nodes = zTree.getNodesByParam("isHidden", true);
// zTree.showNodes(nodes);
// } else {
// nodeList = zTree.getNodesByParamFuzzy("name", value);
// var nodes = zTree.getNodes();
// zTree.hideNodes(nodes[0].children);
// updateNodes(true);
// }
// zTree.expandAll(true);
// }
//
// function updateNodes(highlight) {
// var zTree = $.fn.zTree.getZTreeObj("ztree");
// for (var i = 0, l = nodeList.length; i < l; i++) {
// zTree.showNode(nodeList[i]);
// }
// }
function focusKey(e) {
if (key.hasClass("empty")) {
key.removeClass("empty");
@ -1028,6 +981,57 @@
});
});
});
function onDrop(event, treeId, treeNodes, targetNode, moveType, isCopy) {
let newList = []
$('#ztree_2_ul').children('li').each((index, item) => {
newList.push($(item).children('a').attr('title'))
initZNodes = []
if (index == $('#ztree_2_ul').children('li').length - 1) {
newList.forEach(row => {
const findRow = zNodes.find(row1 => row1.name == row)
if (findRow) {
initZNodes.push(findRow)
initZNodes[initZNodes.length -1].sort = initZNodes.length
}
})
}
})
saveZtree(initZNodes)
}
function dropPrev(treeId, nodes, targetNode) {
var pNode = targetNode.getParentNode();
if (pNode && pNode.dropInner === false) {
return false;
} else {
for (var i=0,l=curDragNodes.length; i<l; i++) {
var curPNode = curDragNodes[i].getParentNode();
if (curPNode && curPNode !== targetNode.getParentNode() && curPNode.childOuter === false) {
return false;
}
}
}
return true;
}
//保存拖拽后排序
function saveZtree(initZNodes){
$.ajax({
type:'post',
url: "${path}/dictionary/saveZtree",
data:{initZNodes: JSON.stringify(initZNodes)},
dateType:'json',
success:function(data){
console.log(data)
if(data = 1){
toastr.success("保存成功");
location=location
}else{
toastr.error("保存失败");
}
}
})
}
//展开
function expandAll() {
@ -1040,6 +1044,51 @@
var treeObj = $.fn.zTree.getZTreeObj("ztree");
treeObj.expandAll(false);
}
function dropInner(treeId, nodes, targetNode) {
console.log(123123213)
if (targetNode && targetNode.dropInner === false) {
return false;
} else {
for (var i=0,l=curDragNodes.length; i<l; i++) {
if (!targetNode && curDragNodes[i].dropRoot === false) {
return false;
} else if (curDragNodes[i].parentTId && curDragNodes[i].getParentNode() !== targetNode && curDragNodes[i].getParentNode().childOuter === false) {
return false;
}
}
}
return true;
}
var log, className = "dark", curDragNodes, autoExpandNode;
function beforeDrag(treeId, treeNodes) {
className = (className === "dark" ? "":"dark");
for (var i=0,l=treeNodes.length; i<l; i++) {
if (treeNodes[i].drag === false) {
curDragNodes = null;
return false;
} else if (treeNodes[i].parentTId && treeNodes[i].getParentNode().childDrag === false) {
curDragNodes = null;
return false;
}
}
curDragNodes = treeNodes;
return true;
}
function dropNext(treeId, nodes, targetNode) {
var pNode = targetNode.getParentNode();
if (pNode && pNode.dropInner === false) {
return false;
} else {
for (var i=0,l=curDragNodes.length; i<l; i++) {
var curPNode = curDragNodes[i].getParentNode();
if (curPNode && curPNode !== targetNode.getParentNode() && curPNode.childOuter === false) {
return false;
}
}
}
return true;
}
</script>
</body>

File diff suppressed because it is too large Load Diff

@ -520,55 +520,7 @@ $(function () {
{type: 'average', name: '平均值'}
]
}
}
,
{
name: '5日归档率%',
type: 'line',
min: 10,
max: 100,
data: day7Arr,
lineStyle: {
normal: {
width: 5,
color: {
type: 'linear',
colorStops: [{
offset: 0,
color: '#06D06F' // 0% 处的颜色
},
{
offset: 0.4,
color: '#06D06F' // 100% 处的颜色
}, {
offset: 1,
color: '#06D06F' // 100% 处的颜色
}
],
globalCoord: false // 缺省为 false
},
shadowColor: 'rgba(249,165,137, 0.5)',
shadowBlur: 10,
shadowOffsetY: 7
}
},
itemStyle: {
normal: {
color: '#06D06F',
borderWidth: 10,
/*shadowColor: 'rgba(72,216,191, 0.3)',
shadowBlur: 100,*/
borderColor: "#F6D06F"
}
},
smooth: true,
markLine: {
data: [
{type: 'average', name: '平均值'}
]
}
}
},
]
};
}
@ -680,12 +632,6 @@ function initTable() {
align: 'left',
valign: 'middle',
},
// {
// title: '在院人数',
// field: 'inNum',
// align: 'center',
// valign: 'middle',
// },
{
title: '出院人数',
field: 'outNum',
@ -723,21 +669,9 @@ function initTable() {
return val;
}
},
{
title: '2日归档率%',
field: 'day2Rate',
align: 'center',
valign: 'middle',
formatter: function (value, row, index) {
var val;
if (row.day2Rate != null && row.day2Rate != '') {
val = Math.round(row.day2Rate * 100) + "%";
}
return val;
}
},
{
title: '3日归档率%',
field: 'day3Rate',
align: 'center',
valign: 'middle',
@ -750,18 +684,31 @@ function initTable() {
}
},
{
title: '5日归档率%',
field: 'day7Rate',
title: '3日归档率%',
field: 'day2Rate',
align: 'center',
valign: 'middle',
formatter: function (value, row, index) {
var val;
if (row.day7Rate != null && row.day7Rate != '') {
val = Math.round(row.day7Rate * 100) + "%";
if (row.day2Rate != null && row.day2Rate != '') {
val = Math.round(row.day2Rate * 100) + "%";
}
return val;
}
}
},
// {
// title: '5日归档率%',
// field: 'day7Rate',
// align: 'center',
// valign: 'middle',
// formatter: function (value, row, index) {
// var val;
// if (row.day7Rate != null && row.day7Rate != '') {
// val = Math.round(row.day7Rate * 100) + "%";
// }
// return val;
// }
// }
],
onLoadSuccess: function (result) { //加载成功时执行
$(".page-list").show();

Loading…
Cancel
Save