|
|
@@ -2,10 +2,7 @@ package com.bofeng.service;
|
|
|
|
|
|
|
|
|
import com.baomidou.mybatisplus.toolkit.IdWorker;
|
|
|
-import com.bofeng.dao.MsReportMapper;
|
|
|
-import com.bofeng.dao.MsSuspectedMapper;
|
|
|
-import com.bofeng.dao.MsTripDetMapper;
|
|
|
-import com.bofeng.dao.MsTripMapper;
|
|
|
+import com.bofeng.dao.*;
|
|
|
import com.bofeng.entity.*;
|
|
|
import org.apache.commons.lang3.tuple.Triple;
|
|
|
import org.joda.time.DateTime;
|
|
|
@@ -38,6 +35,8 @@ public class MsReportService {
|
|
|
private MsTripDetMapper msTripDetMapper;
|
|
|
@Autowired
|
|
|
private MsTripMapper msTripMapper;
|
|
|
+ @Autowired
|
|
|
+ private UptownUnitMapper uptownUnitMapper;
|
|
|
|
|
|
public List<MsSuspected> getByReportId(Long reportId) {
|
|
|
List<MsSuspected> listSuspected = null;
|
|
|
@@ -415,6 +414,8 @@ public class MsReportService {
|
|
|
if (listReport != null && listReport.size() > 0)
|
|
|
return;
|
|
|
|
|
|
+ UptownUnit unit = uptownUnitMapper.getUptownUnitByUser(userCreate);
|
|
|
+
|
|
|
//判断最近一天是否有数据
|
|
|
List<MsSuspected> listSuspected = msSuspectedMapper.selectNextSuspected(userCreate);
|
|
|
//有数据
|
|
|
@@ -459,7 +460,12 @@ public class MsReportService {
|
|
|
msSuspected1.setDiarrhea(msSuspected.getDiarrhea());
|
|
|
msSuspected1.setFatigue(msSuspected.getFatigue());
|
|
|
msSuspected1.setDiarrhea(msSuspected.getDiarrhea());
|
|
|
- msSuspected1.setSingleRoom(msSuspected.getSingleRoom());
|
|
|
+ //如果是凌云的，不需要复制单间隔离
|
|
|
+ if (unit != null) {
|
|
|
+ if (unit.getUptownId() == 1238790987234L || unit.getUptownId() == 5)
|
|
|
+ msSuspected1.setSingleRoom(0);
|
|
|
+ } else
|
|
|
+ msSuspected1.setSingleRoom(msSuspected.getSingleRoom());
|
|
|
msSuspected1.setOthers(msSuspected.getOthers());
|
|
|
// msSuspected1.setScoreRezult(msSuspected.getScoreRezult());
|
|
|
// msSuspected1.setScore(msSuspected.getScore());
|
lange