Commit 0ef64a62 by 289446646@qq.com

部分修改

parent c16fe8ed
...@@ -380,10 +380,10 @@ ...@@ -380,10 +380,10 @@
res += '<li class="f13"> ' + params[0].axisValue + '区</li>'; res += '<li class="f13"> ' + params[0].axisValue + '区</li>';
res += '<li>管理/签约人群年内累计死亡日期后存在随访记录的在管<br/>高血压患者人数:' + params[0].data + '/' + params[1].data + res += '<li>管理/签约人群年内累计死亡日期后存在随访记录的在管<br/>高血压患者人数:' + params[0].data + '/' + params[1].data +
'人</li>'; '人</li>';
res += '<li>去年管理/签约人群年内累计死亡日期后存在随访记录的在<br/>管高血压患者人数:' + params[2].data + '/' + params[2].data + res += '<li>去年管理/签约人群年内累计死亡日期后存在随访记录的在<br/>管高血压患者人数:' + params[2].data + '/' + params[3].data +
'人</li>'; '人</li>';
res += '<li>管.高血压患者年内累计死亡后随访比例/去年:' + params[3].data + '/' + params[3].data + '%</li>'; res += '<li>管.高血压患者年内累计死亡后随访比例/去年:' + params[4].data + '/' + params[5].data + '%</li>';
res += '<li>签.高血压患者年内累计死亡后随访比例/去年:' + params[4].data + '/' + params[5].data + '%</li>'; res += '<li>签.高血压患者年内累计死亡后随访比例/去年:' + params[6].data + '/' + params[7].data + '%</li>';
res += '</ul>'; res += '</ul>';
} else if (params[0].seriesName == '管理/签约人群病史未标记人数') { } else if (params[0].seriesName == '管理/签约人群病史未标记人数') {
var res = '<ul class="f12 pl10 pr15">'; var res = '<ul class="f12 pl10 pr15">';
...@@ -399,9 +399,9 @@ ...@@ -399,9 +399,9 @@
var res = '<ul class="f12 pl10 pr15">'; var res = '<ul class="f12 pl10 pr15">';
res += '<li class="f13"> ' + params[0].axisValue + '区</li>'; res += '<li class="f13"> ' + params[0].axisValue + '区</li>';
res += '<li>管理/签约人群高血压患者并临床情况<br/>未标记数:' + params[0].data + '/' + params[1].data + '人</li>'; res += '<li>管理/签约人群高血压患者并临床情况<br/>未标记数:' + params[0].data + '/' + params[1].data + '人</li>';
res += '<li>去年管理/签约人群高血压患者并临床情况<br/>未标记数:' + params[2].data + '/' + params[2].data + '人</li>'; res += '<li>去年管理/签约人群高血压患者并临床情况<br/>未标记数:' + params[2].data + '/' + params[3].data + '人</li>';
res += '<li>管.高血压患者并存临床情况未标记率/去年:' + params[3].data + '/' + params[3].data + '%</li>'; res += '<li>管.高血压患者并存临床情况未标记率/去年:' + params[4].data + '/' + params[5].data + '%</li>';
res += '<li>签.高血压患者并存临床情况未标记率/去年:' + params[4].data + '/' + params[5].data + '%</li>'; res += '<li>签.高血压患者并存临床情况未标记率/去年:' + params[6].data + '/' + params[7].data + '%</li>';
res += '</ul>'; res += '</ul>';
} }
return res return res
...@@ -572,6 +572,8 @@ ...@@ -572,6 +572,8 @@
data104: [], data104: [],
data105: [], data105: [],
data106: [], data106: [],
data107: [],
data108: [],
data201: [], data201: [],
data202: [], data202: [],
data203: [], data203: [],
...@@ -582,6 +584,12 @@ ...@@ -582,6 +584,12 @@
data208: [], data208: [],
data209: [], data209: [],
data210: [], data210: [],
data211: [],
data212: [],
data213: [],
data214: [],
data215: [],
data216: [],
data301: [], data301: [],
data302: [], data302: [],
data303: [], data303: [],
...@@ -856,7 +864,7 @@ ...@@ -856,7 +864,7 @@
this._group = 'YWSJ' this._group = 'YWSJ'
} }
commonMethod(param).then(res => { commonMethod(param).then(res => {
console.log("res.data="+JSON.stringify(res.data)); // console.log("res.data="+JSON.stringify(res.data));
if (res.data.content.length > 0) { if (res.data.content.length > 0) {
res.data.zbdic.forEach((item, index) => { res.data.zbdic.forEach((item, index) => {
...@@ -1088,7 +1096,15 @@ ...@@ -1088,7 +1096,15 @@
return parseInt(prev.YWSJ.substring(5, 7)) - parseInt(next.YWSJ.substring(5, 7)) return parseInt(prev.YWSJ.substring(5, 7)) - parseInt(next.YWSJ.substring(5, 7))
}) })
} }
//---重新赋值先请空,否则一直push会有问题
_this.data101 = []
_this.data103 = []
_this.data102 = []
_this.data104 = []
_this.data105 = []
_this.data106 = []
_this.data107 = []
_this.data108 = []
if (_this.bingNo == 1) { if (_this.bingNo == 1) {
tempList.forEach((item, index) => { tempList.forEach((item, index) => {
...@@ -1107,36 +1123,49 @@ ...@@ -1107,36 +1123,49 @@
} else { } else {
obj.name = item.XZQH_TEXT ? item.XZQH_TEXT : item.YLJGDM_EX2 obj.name = item.XZQH_TEXT ? item.XZQH_TEXT : item.YLJGDM_EX2
} }
console.log("item="+JSON.stringify(item)); console.log("item="+JSON.stringify(item));
obj.code = item.XZQH? item.XZQH : item.YLJGDM obj.code = item.XZQH? item.XZQH : item.YLJGDM
item.zbxx.forEach((item2, index2) => { item.zbxx.forEach((item2, index2) => {
//管理人群累计死后随访人数 //管理人群累计死后随访人数
//去年管理人群累计死后随访人数 //去年管理人群累计死后随访人数
if (item2.ZBID == '1116') { if (item2.ZBID == '1116') {
_this.data101.push(item2.ZXZ) // _this.data101.push(item2.ZXZ)
_this.data103.push(item2.TBZ) // _this.data103.push(item2.TBZ)
obj.tag1 = _this.Gbotdata.content[index].zbxx[index2].ZXZ ? parseFloat(_this.Gbotdata.content[index].zbxx[index2].ZXZ).toFixed(1) : 0 obj.tag1 = _this.Gbotdata.content[index].zbxx[index2].ZXZ ? parseFloat(_this.Gbotdata.content[index].zbxx[index2].ZXZ).toFixed(1) : 0
obj.tag2 = item2.ZXZ ? parseFloat(item2.ZXZ).toFixed(1) : 0 obj.tag2 = item2.ZXZ ? parseFloat(item2.ZXZ).toFixed(1) : 0
_this.data102.push(item2.ZXZ) // _this.data102.push(item2.ZXZ)
_this.data104.push(item2.TBZ) // _this.data104.push(item2.TBZ)
obj.tag3 = _this.Gbotdata.content[index].zbxx[index2].ZZZ ? parseFloat(_this.Gbotdata.content[index].zbxx[index2].ZZZ).toFixed(1) : 0
obj.tag4 = item2.ZZZ ? parseFloat(item2.ZZZ).toFixed(1) : 0
} }
//去年管理人群累计死后随访人数 //去年管理人群累计死后随访人数
if (item2.ZBID == '1111') { if (item2.ZBID == '1111') {
_this.data105.push(item2.ZXZ) _this.data102.push(item2.ZXZ)
obj.tag3 = _this.Gbotdata.content[index].zbxx[index2].ZXZ ? parseFloat(_this.Gbotdata.content[index].zbxx[index2].ZXZ).toFixed(1) : 0 _this.data104.push(item2.TBZ)
obj.tag4 = item2.ZXZ ? parseFloat(item2.ZXZ).toFixed(1) : 0 _this.data101.push(_this.Gbotdata.content[index].zbxx[index2].ZXZ ? parseFloat(_this.Gbotdata.content[index].zbxx[index2].ZXZ).toFixed(1) : 0)
_this.data103.push(_this.Gbotdata.content[index].zbxx[index2].TBZ ? parseFloat(_this.Gbotdata.content[index].zbxx[index2].TBZ).toFixed(1) : 0)
console.log("_this.data101.="+JSON.stringify(_this.data101));
// obj.tag3 = _this.Gbotdata.content[index].zbxx[index2].ZXZ ? parseFloat(_this.Gbotdata.content[index].zbxx[index2].ZXZ).toFixed(1) : 0
// obj.tag4 = item2.ZXZ ? parseFloat(item2.ZXZ).toFixed(1) : 0
} }
//去年签约人群累计死后随访人数 //高血压患者年内累计死亡后随访比例
if (item2.ZBID == '1110') { if (item2.ZBID == '1110') {
_this.data106.push(item2.TBZ) var g_sfb = _this.Gbotdata.content[index].zbxx[index2].ZXZ ? parseFloat(_this.Gbotdata.content[index].zbxx[index2].ZXZ).toFixed(1) : 0
var g_sfb_qn = _this.Gbotdata.content[index].zbxx[index2].TZB ? parseFloat(_this.Gbotdata.content[index].zbxx[index2].TZB).toFixed(1) : 0
_this.data105.push(g_sfb)
_this.data106.push(g_sfb_qn)
_this.data107.push(item2.ZXZ)
_this.data108.push(item2.TBZ)
obj.tag5 = _this.Gbotdata.content[index].zbxx[index2].ZXZ ? parseFloat(_this.Gbotdata.content[index].zbxx[index2].ZXZ).toFixed(1) : 0 obj.tag5 = _this.Gbotdata.content[index].zbxx[index2].ZXZ ? parseFloat(_this.Gbotdata.content[index].zbxx[index2].ZXZ).toFixed(1) : 0
obj.tag6 = item2.ZXZ ? parseFloat(item2.ZXZ).toFixed(1) : 0 obj.tag6 = item2.ZXZ ? parseFloat(item2.ZXZ).toFixed(1) : 0
} }
}) })
_this.listArrayFinal.push(obj) _this.listArrayFinal.push(obj)
}) })
...@@ -1266,6 +1295,45 @@ ...@@ -1266,6 +1295,45 @@
data: _this.data105 data: _this.data105
}, },
{ {
name: '管·累计死后随访比/去年',
type: 'line',
smooth: true,
yAxisIndex: 1,
symbol: 'circle',
symbolSize: 6,
lineStyle: {
normal: {
width: 2
}
},
itemStyle: {
normal: {
color: new this.$echarts.graphic.LinearGradient(
0, 0, 0, 1,
[{
offset: 0,
color: '#115D5D'
},
{
offset: 0.5,
color: '#115D5D'
},
{
offset: 0.5,
color: '#FFC54E'
},
{
offset: 1,
color: '#FFC54E'
}
]
)
}
},
z: 12,
data: _this.data106
},
{
name: '签·累计死后随访比/去年', name: '签·累计死后随访比/去年',
type: 'line', type: 'line',
smooth: true, smooth: true,
...@@ -1283,7 +1351,27 @@ ...@@ -1283,7 +1351,27 @@
} }
}, },
z: 12, z: 12,
data: _this.data106 data: _this.data107
},
{
name: '签·累计死后随访比/去年',
type: 'line',
smooth: true,
yAxisIndex: 1,
symbol: 'circle',
symbolSize: 6,
lineStyle: {
normal: {
width: 2
}
},
itemStyle: {
normal: {
color: '#FFC54E'
}
},
z: 12,
data: _this.data108
} }
] ]
...@@ -1311,36 +1399,66 @@ ...@@ -1311,36 +1399,66 @@
obj.code = item.XZQH obj.code = item.XZQH
item.zbxx.forEach((item2, index2) => { item.zbxx.forEach((item2, index2) => {
//管理人群累计死后随访人数 //高血压患者合并糖尿病者病史未标记人数
if (item2.ZBID == '1127') {
var g_rs =_this.Gbotdata.content[index].zbxx[index2].ZXZ ? parseFloat(_this.Gbotdata.content[index].zbxx[index2].ZXZ).toFixed(1) : 0;
var q_rs = item2.ZXZ;
var g_rs_qn=_this.Gbotdata.content[index].zbxx[index2].TBZ ? parseFloat(_this.Gbotdata.content[index].zbxx[index2].TBZ).toFixed(1) : 0;
var q_rs_qn = item2.TBZ;
_this.data201.push(g_rs)
_this.data202.push(q_rs)
_this.data203.push(g_rs_qn)
_this.data204.push(q_rs_qn)
}
//管签未标记率
if (item2.ZBID == '1127') { if (item2.ZBID == '1127') {
_this.data201.push(item2.ZXZ) _this.data201.push(item2.ZXZ)
_this.data203.push(item2.TBZ) _this.data203.push(item2.TBZ)
obj.tag1 = item2.ZXZ ? parseFloat(item2.ZXZ).toFixed(1) : 0 //管未标记率
} var g_wbjl = _this.Gbotdata.content[index].zbxx[index2].ZXZ ? parseFloat(_this.Gbotdata.content[index].zbxx[index2].ZXZ).toFixed(1) : 0
if (_this.Qbotdata.content[index].zbxx[index2].ZBID == '1127') { var q_wbjl = item2.ZXZ ? parseFloat(item2.ZXZ).toFixed(1) : 0;
_this.data202.push(item2.ZXZ) var g_wbjl_qn = _this.Gbotdata.content[index].zbxx[index2].TBZ ? parseFloat(_this.Gbotdata.content[index].zbxx[index2].TBZ).toFixed(1) : 0
_this.data204.push(item2.TBZ) var q_wbjl_qn = item2.TBZ ? parseFloat(item2.TBZ).toFixed(1) : 0;
obj.tag2 = item2.ZXZ ? parseFloat(item2.ZXZ).toFixed(1) : 0 obj.tag1= g_wbjl;
obj.tag2 = q_wbjl
_this.data205.push(g_wbjl)
_this.data206.push(q_wbjl)
_this.data207.push(g_wbjl_qn)
_this.data208.push(q_wbjl_qn)
} }
//管签批量异常随访比
if (item2.ZBID == '1136') { if (item2.ZBID == '1136') {
_this.data205.push(item2.ZXZ) _this.data205.push(item2.ZXZ)
_this.data206.push(item2.TBZ) _this.data206.push(item2.TBZ)
obj.tag3 = item2.ZXZ ? parseFloat(item2.ZXZ).toFixed(1) : 0 var g_ycsfb = _this.Gbotdata.content[index].zbxx[index2].ZXZ ? parseFloat(_this.Gbotdata.content[index].zbxx[index2].ZXZ).toFixed(1) : 0
} var q_ycsfb = item2.ZXZ ? parseFloat(item2.ZXZ).toFixed(1) : 0;
var g_ycsfb_qn = _this.Gbotdata.content[index].zbxx[index2].TBZ ? parseFloat(_this.Gbotdata.content[index].zbxx[index2].TBZ).toFixed(1) : 0
if (item2.ZBID == '1136') { var q_ycsfb_qn = item2.TBZ ? parseFloat(item2.TBZ).toFixed(1) : 0;
_this.data207.push(item2.ZXZ)
_this.data208.push(item2.TBZ) obj.tag3 = g_ycsfb
obj.tag4 = item2.ZXZ ? parseFloat(item2.ZXZ).toFixed(1) : 0 obj.tag4 = q_ycsfb
_this.data209.push(g_ycsfb)
_this.data210.push(q_ycsfb)
_this.data211.push(g_ycsfb_qn)
_this.data212.push(q_ycsfb_qn)
} }
//不一致率
if (item2.ZBID == '1139') { if (item2.ZBID == '1139') {
_this.data209.push(item2.ZXZ)
_this.data210.push(item2.TBZ) var g_byzl = _this.Gbotdata.content[index].zbxx[index2].ZXZ ? parseFloat(_this.Gbotdata.content[index].zbxx[index2].ZXZ).toFixed(1) : 0
obj.tag5 = item2.TBL ? parseFloat(item2.TBL).toFixed(1) : 0 var q_byzl = item2.ZXZ ? parseFloat(item2.ZXZ).toFixed(1) : 0;
obj.tag6 = item2.TBL ? parseFloat(item2.TBL).toFixed(1) : 0 var g_byzl_qn = _this.Gbotdata.content[index].zbxx[index2].TBZ ? parseFloat(_this.Gbotdata.content[index].zbxx[index2].TBZ).toFixed(1) : 0
var q_byzl_qn = item2.TBZ ? parseFloat(item2.TBZ).toFixed(1) : 0;
obj.tag5 = g_byzl
obj.tag6 = q_byzl
_this.data213.push(g_byzl)
_this.data214.push(q_byzl)
_this.data215.push(g_byzl_qn)
_this.data216.push(q_byzl_qn)
} }
}) })
...@@ -1821,6 +1939,8 @@ ...@@ -1821,6 +1939,8 @@
_this.data104 = [] _this.data104 = []
_this.data105 = [] _this.data105 = []
_this.data106 = [] _this.data106 = []
_this.data107 = []
_this.data108 = []
_this.listArrayFinal = [] _this.listArrayFinal = []
_this.option2.xAxis[0].data = [] _this.option2.xAxis[0].data = []
_this.option2.series.forEach(item => { _this.option2.series.forEach(item => {
......
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