修改新疆大屏
This commit is contained in:
+4
-4
@@ -150,8 +150,8 @@ public class LargeScreenDataServiceImpl extends ServiceImpl<LargeScreenDataMappe
|
|||||||
list.add(type1);
|
list.add(type1);
|
||||||
LargeScreenData type2 = new LargeScreenData();
|
LargeScreenData type2 = new LargeScreenData();
|
||||||
type2.setType("hospital");
|
type2.setType("hospital");
|
||||||
type2.setStatus(dto.getEmergencyNumStatus());
|
type2.setStatus(dto.getEmergencyCountStatus());
|
||||||
type2.setValue(dto.getEmergencyNum());
|
type2.setValue(dto.getEmergencyCount());
|
||||||
type2.setCenterId(dto.getCenterId());
|
type2.setCenterId(dto.getCenterId());
|
||||||
list.add(type2);
|
list.add(type2);
|
||||||
break;
|
break;
|
||||||
@@ -348,8 +348,8 @@ public class LargeScreenDataServiceImpl extends ServiceImpl<LargeScreenDataMappe
|
|||||||
vo.setHospitalCountStatus(largeScreenData.getStatus());
|
vo.setHospitalCountStatus(largeScreenData.getStatus());
|
||||||
break;
|
break;
|
||||||
case "hospital":
|
case "hospital":
|
||||||
vo.setEmergencyNum(String.valueOf(largeScreenData.getValue()));
|
vo.setEmergencyCount(String.valueOf(largeScreenData.getValue()));
|
||||||
vo.setEmergencyNumStatus(largeScreenData.getStatus());
|
vo.setEmergencyCountStatus(largeScreenData.getStatus());
|
||||||
break;
|
break;
|
||||||
case "weightLossCountDay":
|
case "weightLossCountDay":
|
||||||
vo.setWeightLossCountDay(String.valueOf(largeScreenData.getValue()));
|
vo.setWeightLossCountDay(String.valueOf(largeScreenData.getValue()));
|
||||||
|
|||||||
+10
-10
@@ -290,9 +290,9 @@ public class LargeScreenServiceImpl extends ServiceImpl<LargeScreenMapper, Large
|
|||||||
if (null != medicalData){
|
if (null != medicalData){
|
||||||
if ("1".equals(medicalData.getStatus())){
|
if ("1".equals(medicalData.getStatus())){
|
||||||
if (medicalData.getCount().contains("+")){
|
if (medicalData.getCount().contains("+")){
|
||||||
statistics.setCheckedCount(statistics.getCheckedCount()+Integer.parseInt(medicalData.getCount()));
|
statistics.setCheckedCount(statistics.getCheckedCount()+Integer.parseInt(medicalData.getCount().replace("+", "").trim()));
|
||||||
}else {
|
}else {
|
||||||
statistics.setCheckedCount(Integer.parseInt(medicalData.getCount()));
|
statistics.setCheckedCount(Integer.parseInt(medicalData.getCount().replace("+", "").trim()));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -326,30 +326,30 @@ public class LargeScreenServiceImpl extends ServiceImpl<LargeScreenMapper, Large
|
|||||||
if (null != dataDetailVO){
|
if (null != dataDetailVO){
|
||||||
if ("1".equals(dataDetailVO.getTotalCountStatus())){
|
if ("1".equals(dataDetailVO.getTotalCountStatus())){
|
||||||
if (dataDetailVO.getTotalCount().contains("+")){
|
if (dataDetailVO.getTotalCount().contains("+")){
|
||||||
statisticsVO.setTotalCount(statisticsVO.getTotalCount() + Integer.parseInt(dataDetailVO.getTotalCount()));
|
statisticsVO.setTotalCount(statisticsVO.getTotalCount() + Integer.parseInt(dataDetailVO.getTotalCount().replace("+", "").trim()));
|
||||||
}else {
|
}else {
|
||||||
statisticsVO.setTotalCount(Integer.valueOf(dataDetailVO.getTotalCount()));
|
statisticsVO.setTotalCount(Integer.valueOf(dataDetailVO.getTotalCount().replace("+", "").trim()));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
if ("1".equals(dataDetailVO.getCardiovaAbCountStatus())){
|
if ("1".equals(dataDetailVO.getCardiovaAbCountStatus())){
|
||||||
if (dataDetailVO.getCardiovaAbCount().contains("+")){
|
if (dataDetailVO.getCardiovaAbCount().contains("+")){
|
||||||
statisticsVO.setCardiovaAbCount(statisticsVO.getCardiovaAbCount() + Integer.parseInt(dataDetailVO.getCardiovaAbCount()));
|
statisticsVO.setCardiovaAbCount(statisticsVO.getCardiovaAbCount() + Integer.parseInt(dataDetailVO.getCardiovaAbCount().replace("+", "").trim()));
|
||||||
}else {
|
}else {
|
||||||
statisticsVO.setCardiovaAbCount(Integer.valueOf(dataDetailVO.getCardiovaAbCount()));
|
statisticsVO.setCardiovaAbCount(Integer.valueOf(dataDetailVO.getCardiovaAbCount().replace("+", "").trim()));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
if ("1".equals(dataDetailVO.getCerebrovAbCountStatus())){
|
if ("1".equals(dataDetailVO.getCerebrovAbCountStatus())){
|
||||||
if (dataDetailVO.getCerebrovAbCount().contains("+")){
|
if (dataDetailVO.getCerebrovAbCount().contains("+")){
|
||||||
statisticsVO.setCerebrovAbCount(statisticsVO.getCerebrovAbCount() + Integer.parseInt(dataDetailVO.getCerebrovAbCount()));
|
statisticsVO.setCerebrovAbCount(statisticsVO.getCerebrovAbCount() + Integer.parseInt(dataDetailVO.getCerebrovAbCount().replace("+", "").trim()));
|
||||||
}else {
|
}else {
|
||||||
statisticsVO.setCerebrovAbCount(Integer.valueOf(dataDetailVO.getCerebrovAbCount()));
|
statisticsVO.setCerebrovAbCount(Integer.valueOf(dataDetailVO.getCerebrovAbCount().replace("+", "").trim()));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
if ("1".equals(dataDetailVO.getCctaAbCountStatus())){
|
if ("1".equals(dataDetailVO.getCctaAbCountStatus())){
|
||||||
if (dataDetailVO.getCctaAbCount().contains("+")){
|
if (dataDetailVO.getCctaAbCount().contains("+")){
|
||||||
statisticsVO.setCctaAbCount(statisticsVO.getCctaAbCount() + Integer.parseInt(dataDetailVO.getCctaAbCount()));
|
statisticsVO.setCctaAbCount(statisticsVO.getCctaAbCount() + Integer.parseInt(dataDetailVO.getCctaAbCount().replace("+", "").trim()));
|
||||||
}else {
|
}else {
|
||||||
statisticsVO.setCctaAbCount(Integer.valueOf(dataDetailVO.getCctaAbCount()));
|
statisticsVO.setCctaAbCount(Integer.valueOf(dataDetailVO.getCctaAbCount().replace("+", "").trim()));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
+4
-4
@@ -60,18 +60,18 @@ public class TblHelpCenterServiceImpl extends ServiceImpl<TblHelpCenterMapper, T
|
|||||||
if (item.getType().equals("0")) {
|
if (item.getType().equals("0")) {
|
||||||
if ("1".equals(dataDetailVO.getHospitalCountStatus())){
|
if ("1".equals(dataDetailVO.getHospitalCountStatus())){
|
||||||
if (dataDetailVO.getHospitalCount().contains("+")){
|
if (dataDetailVO.getHospitalCount().contains("+")){
|
||||||
item.setCount(Integer.valueOf(item.getCount()+dataDetailVO.getHospitalCount()));
|
item.setCount(item.getCount()+Integer.parseInt(dataDetailVO.getHospitalCount().replace("+", "").trim()));
|
||||||
}else {
|
}else {
|
||||||
item.setCount(Integer.valueOf(dataDetailVO.getHospitalCount()));
|
item.setCount(Integer.parseInt(dataDetailVO.getHospitalCount().replace("+", "").trim()));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
if (item.getType().equals("1")) {
|
if (item.getType().equals("1")) {
|
||||||
if ("1".equals(dataDetailVO.getEmergencyCountStatus())){
|
if ("1".equals(dataDetailVO.getEmergencyCountStatus())){
|
||||||
if (dataDetailVO.getEmergencyCount().contains("+")){
|
if (dataDetailVO.getEmergencyCount().contains("+")){
|
||||||
item.setCount(Integer.valueOf(item.getCount()+dataDetailVO.getEmergencyCount()));
|
item.setCount(item.getCount()+Integer.parseInt(dataDetailVO.getEmergencyCount().replace("+", "").trim()));
|
||||||
}else {
|
}else {
|
||||||
item.setCount(Integer.valueOf(dataDetailVO.getEmergencyCount()));
|
item.setCount(Integer.parseInt(dataDetailVO.getEmergencyCount().replace("+", "").trim()));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
+10
-10
@@ -129,9 +129,9 @@ public class TblUserHelpServiceImpl extends ServiceImpl<TblUserHelpMapper, TblUs
|
|||||||
// 呼入电话
|
// 呼入电话
|
||||||
if ("1".equals(dataDetailVO.getLatestCallStatus())) {
|
if ("1".equals(dataDetailVO.getLatestCallStatus())) {
|
||||||
if (dataDetailVO.getLatestCall().contains("+")) {
|
if (dataDetailVO.getLatestCall().contains("+")) {
|
||||||
vo.setGross(list.size() + Integer.parseInt(dataDetailVO.getLatestCall()));
|
vo.setGross(list.size() + Integer.parseInt(dataDetailVO.getLatestCall().replace("+", "").trim()));
|
||||||
} else {
|
} else {
|
||||||
vo.setGross(Integer.valueOf(dataDetailVO.getLatestCall()));
|
vo.setGross(Integer.valueOf(dataDetailVO.getLatestCall().replace("+", "").trim()));
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
vo.setGross(list.size());
|
vo.setGross(list.size());
|
||||||
@@ -140,9 +140,9 @@ public class TblUserHelpServiceImpl extends ServiceImpl<TblUserHelpMapper, TblUs
|
|||||||
if ("1".equals(dataDetailVO.getLatestAcceptCallStatus())) {
|
if ("1".equals(dataDetailVO.getLatestAcceptCallStatus())) {
|
||||||
if (dataDetailVO.getLatestAcceptCall().contains("+")) {
|
if (dataDetailVO.getLatestAcceptCall().contains("+")) {
|
||||||
int count = Math.toIntExact(list.stream().filter(a -> "1".equals(a.getStatus()) || "2".equals(a.getStatus())).count());
|
int count = Math.toIntExact(list.stream().filter(a -> "1".equals(a.getStatus()) || "2".equals(a.getStatus())).count());
|
||||||
vo.setAlerdyreceive(count + Integer.parseInt(dataDetailVO.getLatestAcceptCall()));
|
vo.setAlerdyreceive(count + Integer.parseInt(dataDetailVO.getLatestAcceptCall().replace("+", "").trim()));
|
||||||
} else {
|
} else {
|
||||||
vo.setAlerdyreceive(Integer.parseInt(dataDetailVO.getLatestAcceptCall()));
|
vo.setAlerdyreceive(Integer.parseInt(dataDetailVO.getLatestAcceptCall().replace("+", "").trim()));
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
int count = Math.toIntExact(list.stream().filter(a -> "1".equals(a.getStatus()) || "2".equals(a.getStatus())).count());
|
int count = Math.toIntExact(list.stream().filter(a -> "1".equals(a.getStatus()) || "2".equals(a.getStatus())).count());
|
||||||
@@ -152,9 +152,9 @@ public class TblUserHelpServiceImpl extends ServiceImpl<TblUserHelpMapper, TblUs
|
|||||||
if ("1".equals(dataDetailVO.getIllNumStatus())) {
|
if ("1".equals(dataDetailVO.getIllNumStatus())) {
|
||||||
if (dataDetailVO.getIllNum().contains("+")) {
|
if (dataDetailVO.getIllNum().contains("+")) {
|
||||||
int count = Math.toIntExact(list.stream().filter(a -> "2".equals(a.getType())).count());
|
int count = Math.toIntExact(list.stream().filter(a -> "2".equals(a.getType())).count());
|
||||||
vo.setJqqz(count + Integer.parseInt(dataDetailVO.getIllNum()));
|
vo.setJqqz(count + Integer.parseInt(dataDetailVO.getIllNum().replace("+", "").trim()));
|
||||||
} else {
|
} else {
|
||||||
vo.setJqqz(Integer.parseInt(dataDetailVO.getIllNum()));
|
vo.setJqqz(Integer.parseInt(dataDetailVO.getIllNum().replace("+", "").trim()));
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
int count = Math.toIntExact(list.stream().filter(a -> "2".equals(a.getType())).count());
|
int count = Math.toIntExact(list.stream().filter(a -> "2".equals(a.getType())).count());
|
||||||
@@ -164,9 +164,9 @@ public class TblUserHelpServiceImpl extends ServiceImpl<TblUserHelpMapper, TblUs
|
|||||||
if ("1".equals(dataDetailVO.getEmergencyNumStatus())) {
|
if ("1".equals(dataDetailVO.getEmergencyNumStatus())) {
|
||||||
if (dataDetailVO.getEmergencyNum().contains("+")) {
|
if (dataDetailVO.getEmergencyNum().contains("+")) {
|
||||||
int count = Math.toIntExact(list.stream().filter(a -> "1".equals(a.getType())).count());
|
int count = Math.toIntExact(list.stream().filter(a -> "1".equals(a.getType())).count());
|
||||||
vo.setDbjy(count + Integer.parseInt(dataDetailVO.getEmergencyNum()));
|
vo.setDbjy(count + Integer.parseInt(dataDetailVO.getEmergencyNum().replace("+", "").trim()));
|
||||||
}else {
|
}else {
|
||||||
vo.setDbjy(Integer.parseInt(dataDetailVO.getEmergencyNum()));
|
vo.setDbjy(Integer.parseInt(dataDetailVO.getEmergencyNum().replace("+", "").trim()));
|
||||||
}
|
}
|
||||||
}else {
|
}else {
|
||||||
int count = Math.toIntExact(list.stream().filter(a -> "1".equals(a.getType())).count());
|
int count = Math.toIntExact(list.stream().filter(a -> "1".equals(a.getType())).count());
|
||||||
@@ -176,9 +176,9 @@ public class TblUserHelpServiceImpl extends ServiceImpl<TblUserHelpMapper, TblUs
|
|||||||
Integer totalAcceptance = tblUserHelpMapper.getTotalAcceptance();
|
Integer totalAcceptance = tblUserHelpMapper.getTotalAcceptance();
|
||||||
if ("1".equals(dataDetailVO.getTotalDisposalStatus())) {
|
if ("1".equals(dataDetailVO.getTotalDisposalStatus())) {
|
||||||
if (dataDetailVO.getTotalDisposal().contains("+")) {
|
if (dataDetailVO.getTotalDisposal().contains("+")) {
|
||||||
vo.setTotalacceptance(totalAcceptance + Integer.parseInt(dataDetailVO.getTotalDisposal()));
|
vo.setTotalacceptance(totalAcceptance + Integer.parseInt(dataDetailVO.getTotalDisposal().replace("+", "").trim()));
|
||||||
}else {
|
}else {
|
||||||
vo.setTotalacceptance(Integer.parseInt(dataDetailVO.getTotalDisposal()));
|
vo.setTotalacceptance(Integer.parseInt(dataDetailVO.getTotalDisposal().replace("+", "").trim()));
|
||||||
}
|
}
|
||||||
}else {
|
}else {
|
||||||
vo.setTotalacceptance(totalAcceptance);
|
vo.setTotalacceptance(totalAcceptance);
|
||||||
|
|||||||
Reference in New Issue
Block a user