|
|
@@ -185,23 +185,24 @@ public class MsReportService {
|
|
|
if (listReport == null || listReport.size() == 0)
|
|
|
return 0;
|
|
|
|
|
|
- //如果是凌云，判断出行是否填写异常
|
|
|
- UptownUnit unit = uptownUnitMapper.getUptownUnitByUser(userCreate);
|
|
|
//判断体温是否填写
|
|
|
List<MsSuspected> listSuspected = msSuspectedMapper.selectByReportId(Long.parseLong(listReport.get(0).getReportId().toString()));
|
|
|
if (listSuspected == null || listSuspected.size() == 0)
|
|
|
return 3;
|
|
|
- if (unit != null) {
|
|
|
- if (unit.getUptownId() == 1238790987234L || unit.getUptownId() == 5) {
|
|
|
- if (listSuspected != null && listSuspected.size() > 1)
|
|
|
- return 5;
|
|
|
- }
|
|
|
- } else {
|
|
|
+ // if (unit != null) {
|
|
|
+ // if (unit.getUptownId() == 1238790987234L || unit.getUptownId() == 5) {
|
|
|
+ // if (listSuspected != null && listSuspected.size() > 1)
|
|
|
+ // return 5;
|
|
|
+ // }
|
|
|
+ // }
|
|
|
+ else {
|
|
|
for (MsSuspected msSuspected : listSuspected) {
|
|
|
//体温是否填写
|
|
|
if (msSuspected.getTemperature().compareTo(new BigDecimal(0)) == 0)
|
|
|
return 2;
|
|
|
|
|
|
+ //如果是凌云，判断出行是否填写异常
|
|
|
+ UptownUnit unit = uptownUnitMapper.getUptownUnitByUser(userCreate);
|
|
|
if (unit != null) {
|
|
|
if (unit.getUptownId() == 1238790987234L || unit.getUptownId() == 5) {
|
|
|
//上一天的上报记录.3天内
|
lange