|
@@ -1092,29 +1092,27 @@ func (this *CommonApiController) GetFirstQuarter() {
|
1092
|
1092
|
countwo, _ := service.GetQuarterTotalCountTwo(orgid, statime, entime, lapseto)
|
1093
|
1093
|
|
1094
|
1094
|
//获取收缩压数据
|
1095
|
|
- _, systolicTotal, parseDateErr := service.GetSystolicBloodPressure(orgid, statime, entime)
|
|
1095
|
+ systolic, systolicTotal, parseDateErr := service.GetSystolicBloodPressure(orgid, statime, entime)
|
1096
|
1096
|
//统计收缩压合格的数据
|
1097
|
|
- systolic, sysstandTotal, parseDateErr := service.GetStandSystolicBloodPressure(orgid, statime, entime)
|
|
1097
|
+ //systolic, sysstandTotal, parseDateErr := service.GetStandSystolicBloodPressure(orgid, statime, entime)
|
1098
|
1098
|
|
1099
|
1099
|
//获取舒张压数据
|
1100
|
|
- _, diastotal, parseDateErr := service.GetDiastolicBloodPressure(orgid, statime, entime)
|
|
1100
|
+ diastolic, diastotal, parseDateErr := service.GetDiastolicBloodPressure(orgid, statime, entime)
|
1101
|
1101
|
//获取合格舒张压数据
|
1102
|
|
- diastolic, diasstandtotal, parseDateErr := service.GetDiastolicStandPressure(orgid, statime, entime)
|
|
1102
|
+ //diastolic, diasstandtotal, parseDateErr := service.GetDiastolicStandPressure(orgid, statime, entime)
|
1103
|
1103
|
normData, _ := service.GetNormData(orgid)
|
1104
|
1104
|
if err != nil {
|
1105
|
1105
|
this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeSystemError)
|
1106
|
1106
|
return
|
1107
|
1107
|
}
|
1108
|
1108
|
this.ServeSuccessJSON(map[string]interface{}{
|
1109
|
|
- "count": count,
|
1110
|
|
- "countwo": countwo,
|
1111
|
|
- "systolic": systolic,
|
1112
|
|
- "systolicTotal": systolicTotal,
|
1113
|
|
- "sysstandTotal": sysstandTotal,
|
1114
|
|
- "diastolic": diastolic,
|
1115
|
|
- "diastotal": diastotal,
|
1116
|
|
- "diasstandtotal": diasstandtotal,
|
1117
|
|
- "normData": normData,
|
|
1109
|
+ "count": count,
|
|
1110
|
+ "countwo": countwo,
|
|
1111
|
+ "systolic": systolic,
|
|
1112
|
+ "systolicTotal": systolicTotal,
|
|
1113
|
+ "diastolic": diastolic,
|
|
1114
|
+ "diastotal": diastotal,
|
|
1115
|
+ "normData": normData,
|
1118
|
1116
|
})
|
1119
|
1117
|
}
|
1120
|
1118
|
|
|
@@ -1676,48 +1674,48 @@ func (this *CommonApiController) GetBloodPressureList() {
|
1676
|
1674
|
fmt.Println("第四季度", fourQuarterEndStrUnix)
|
1677
|
1675
|
if bloodType == -1 {
|
1678
|
1676
|
//统计收缩压第一季度的总数
|
1679
|
|
- _, firstTotal, err := service.GetSystolicBloodPressure(orgId, firstQuarterStartUnix, fisrtQuarterEndStrUnix)
|
|
1677
|
+ firstList, firstTotal, err := service.GetSystolicBloodPressure(orgId, firstQuarterStartUnix, fisrtQuarterEndStrUnix)
|
1680
|
1678
|
//统计收缩压第一季合格的总数
|
1681
|
|
- _, firstStandTotal, err := service.GetStandSystolicBloodPressure(orgId, firstQuarterStartUnix, fisrtQuarterEndStrUnix)
|
|
1679
|
+ //_, firstStandTotal, err := service.GetStandSystolicBloodPressure(orgId, firstQuarterStartUnix, fisrtQuarterEndStrUnix)
|
1682
|
1680
|
//统计第二季收缩压总数
|
1683
|
|
- _, secondeTotal, err := service.GetSystolicBloodPressure(orgId, secondeQuarterStartUnix, secondQuarterEndStrUnix)
|
|
1681
|
+ secondelist, secondeTotal, err := service.GetSystolicBloodPressure(orgId, secondeQuarterStartUnix, secondQuarterEndStrUnix)
|
1684
|
1682
|
//第二季度合格总数
|
1685
|
|
- _, secondeStandTotal, err := service.GetStandSystolicBloodPressure(orgId, secondeQuarterStartUnix, secondQuarterEndStrUnix)
|
|
1683
|
+ //_, secondeStandTotal, err := service.GetStandSystolicBloodPressure(orgId, secondeQuarterStartUnix, secondQuarterEndStrUnix)
|
1686
|
1684
|
//统计第三季收缩压总数
|
1687
|
|
- _, threeTotal, err := service.GetSystolicBloodPressure(orgId, threeQuarterStartUnix, threeQuarterEndStrUnix)
|
|
1685
|
+ threelist, threeTotal, err := service.GetSystolicBloodPressure(orgId, threeQuarterStartUnix, threeQuarterEndStrUnix)
|
1688
|
1686
|
//第三季度合格数
|
1689
|
|
- _, threeStandTotal, err := service.GetStandSystolicBloodPressure(orgId, threeQuarterStartUnix, threeQuarterEndStrUnix)
|
|
1687
|
+ //_, threeStandTotal, err := service.GetStandSystolicBloodPressure(orgId, threeQuarterStartUnix, threeQuarterEndStrUnix)
|
1690
|
1688
|
//第四季度总数
|
1691
|
|
- _, fourTotal, err := service.GetSystolicBloodPressure(orgId, fourQuarterStartUnix, fourQuarterEndStrUnix)
|
|
1689
|
+ fourlist, fourTotal, err := service.GetSystolicBloodPressure(orgId, fourQuarterStartUnix, fourQuarterEndStrUnix)
|
1692
|
1690
|
//第四季度合格总数
|
1693
|
|
- _, fourStandTotal, err := service.GetStandSystolicBloodPressure(orgId, fourQuarterStartUnix, fourQuarterEndStrUnix)
|
|
1691
|
+ //_, fourStandTotal, err := service.GetStandSystolicBloodPressure(orgId, fourQuarterStartUnix, fourQuarterEndStrUnix)
|
1694
|
1692
|
if err != nil {
|
1695
|
1693
|
this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeSystemError)
|
1696
|
1694
|
return
|
1697
|
1695
|
}
|
1698
|
1696
|
|
1699
|
1697
|
this.ServeSuccessJSON(map[string]interface{}{
|
1700
|
|
- "firstTotal": firstTotal,
|
1701
|
|
- "firstStandTotal": firstStandTotal,
|
1702
|
|
- "secondeTotal": secondeTotal,
|
1703
|
|
- "secondeStandTotal": secondeStandTotal,
|
1704
|
|
- "threeTotal": threeTotal,
|
1705
|
|
- "threeStandTotal": threeStandTotal,
|
1706
|
|
- "fourTotal": fourTotal,
|
1707
|
|
- "fourStandTotal": fourStandTotal,
|
|
1698
|
+ "firstTotal": firstTotal,
|
|
1699
|
+ "firstList": firstList,
|
|
1700
|
+ "secondelist": secondelist,
|
|
1701
|
+ "secondeTotal": secondeTotal,
|
|
1702
|
+ "threelist": threelist,
|
|
1703
|
+ "threeTotal": threeTotal,
|
|
1704
|
+ "fourTotal": fourTotal,
|
|
1705
|
+ "fourlist": fourlist,
|
1708
|
1706
|
})
|
1709
|
1707
|
}
|
1710
|
1708
|
|
1711
|
1709
|
if bloodType == -2 {
|
1712
|
1710
|
//统计舒张压第一季度的总数
|
1713
|
|
- _, firstTotal, err := service.GetDiastolicBloodPressure(orgId, firstQuarterStartUnix, fisrtQuarterEndStrUnix)
|
1714
|
|
- _, firstStandTotal, err := service.GetDiastolicStandPressure(orgId, firstQuarterStartUnix, fisrtQuarterEndStrUnix)
|
1715
|
|
- _, secondeTotal, err := service.GetDiastolicBloodPressure(orgId, secondeQuarterStartUnix, secondQuarterEndStrUnix)
|
1716
|
|
- _, secondeStandTotal, err := service.GetDiastolicStandPressure(orgId, secondeQuarterStartUnix, secondQuarterEndStrUnix)
|
1717
|
|
- _, threeTotal, err := service.GetDiastolicBloodPressure(orgId, threeQuarterStartUnix, threeQuarterEndStrUnix)
|
1718
|
|
- _, threeStandTotal, err := service.GetDiastolicStandPressure(orgId, threeQuarterStartUnix, threeQuarterEndStrUnix)
|
1719
|
|
- _, fourTotal, err := service.GetDiastolicBloodPressure(orgId, fourQuarterStartUnix, fourQuarterEndStrUnix)
|
1720
|
|
- _, fourStandTotal, err := service.GetDiastolicStandPressure(orgId, fourQuarterStartUnix, fourQuarterEndStrUnix)
|
|
1711
|
+ firstList, firstTotal, err := service.GetDiastolicBloodPressure(orgId, firstQuarterStartUnix, fisrtQuarterEndStrUnix)
|
|
1712
|
+ //_, firstStandTotal, err := service.GetDiastolicStandPressure(orgId, firstQuarterStartUnix, fisrtQuarterEndStrUnix)
|
|
1713
|
+ secondelist, secondeTotal, err := service.GetDiastolicBloodPressure(orgId, secondeQuarterStartUnix, secondQuarterEndStrUnix)
|
|
1714
|
+ //_, secondeStandTotal, err := service.GetDiastolicStandPressure(orgId, secondeQuarterStartUnix, secondQuarterEndStrUnix)
|
|
1715
|
+ threelist, threeTotal, err := service.GetDiastolicBloodPressure(orgId, threeQuarterStartUnix, threeQuarterEndStrUnix)
|
|
1716
|
+ //_, threeStandTotal, err := service.GetDiastolicStandPressure(orgId, threeQuarterStartUnix, threeQuarterEndStrUnix)
|
|
1717
|
+ fourlist, fourTotal, err := service.GetDiastolicBloodPressure(orgId, fourQuarterStartUnix, fourQuarterEndStrUnix)
|
|
1718
|
+ //_, fourStandTotal, err := service.GetDiastolicStandPressure(orgId, fourQuarterStartUnix, fourQuarterEndStrUnix)
|
1721
|
1719
|
|
1722
|
1720
|
if err != nil {
|
1723
|
1721
|
this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeSystemError)
|
|
@@ -1725,14 +1723,14 @@ func (this *CommonApiController) GetBloodPressureList() {
|
1725
|
1723
|
}
|
1726
|
1724
|
|
1727
|
1725
|
this.ServeSuccessJSON(map[string]interface{}{
|
1728
|
|
- "firstTotal": firstTotal,
|
1729
|
|
- "firstStandTotal": firstStandTotal,
|
1730
|
|
- "secondeTotal": secondeTotal,
|
1731
|
|
- "secondeStandTotal": secondeStandTotal,
|
1732
|
|
- "threeTotal": threeTotal,
|
1733
|
|
- "threeStandTotal": threeStandTotal,
|
1734
|
|
- "fourTotal": fourTotal,
|
1735
|
|
- "fourStandTotal": fourStandTotal,
|
|
1726
|
+ "firstTotal": firstTotal,
|
|
1727
|
+ "firstList": firstList,
|
|
1728
|
+ "secondelist": secondelist,
|
|
1729
|
+ "secondeTotal": secondeTotal,
|
|
1730
|
+ "threelist": threelist,
|
|
1731
|
+ "threeTotal": threeTotal,
|
|
1732
|
+ "fourTotal": fourTotal,
|
|
1733
|
+ "fourlist": fourlist,
|
1736
|
1734
|
})
|
1737
|
1735
|
}
|
1738
|
1736
|
}
|