Merge branch 'master' of http://git.yvanui.com/hust/wuhan_epi

whepi-web/src/main/java/com/bofeng/dao/MsReportMapper.java

@@ -22,6 +22,9 @@ public interface MsReportMapper extends BaseMapper<MsReport> {
     @Select("select property_id from sys_user_role where user_id=#{userId} and role_id=1")
     Long selectHouseIdByUserId(@Param("userId") Long userId);
 
+    @Select("select property_id from sys_user_role where user_id=#{userId} and role_id=1")
+    List<Long> selectHouseIdsByUserId(@Param("userId") Long userId);
+
     //确诊
     @Select("select count(*) from ms_suspected where report_id=#{reportId} and  medical=#{medical}")
     Integer selectSuspectedNum(@Param("reportId") Long reportId, @Param("medical") Integer medical);

whepi-web/src/main/java/com/bofeng/service/MsSuspectedService.java

@@ -74,6 +74,12 @@ public class MsSuspectedService {
 
         //判断是否疑似
         Integer suspectedStatus = 0;
+        //确诊
+        if (medical == 1)
+            suspectedStatus = 1;
+        //隔离
+        if (singleRoom == 1)
+            suspectedStatus = 1;
         //体温
         if (temperature.compareTo(new BigDecimal(36)) == -1 || temperature.compareTo(new BigDecimal(37.3)) == 1)
             suspectedStatus = 1;

whepi-web/src/main/java/com/bofeng/service/RiBaoService.java

@@ -84,8 +84,18 @@ public class RiBaoService {
     //获取今天数据
     public String getHouseStr(Long houseId) {
         UptownHouse house = uptownHouseMapper.selectById(houseId);
+        if (null == house) {
+            return "";
+        }
+
         UptownUnit unit = uptownUnitMapper.selectById(house.getUnitId());
         StringBuffer sb = new StringBuffer();
+        if (null == unit) {
+            sb.append(house.getDoorplate()).append("室");
+            String houseStr = sb.toString();
+            return houseStr;
+        }
+
         sb.append(unit.getRidgepole()).append("栋").append(unit.getUnit()).append("单元").append(house.getDoorplate()).append("室");
         String houseStr = sb.toString();
         return houseStr;
@@ -315,11 +325,11 @@ public class RiBaoService {
                 msReportMapper.insert(msReport);
             }
         } else {
-            Long houseId = msReportMapper.selectHouseIdByUserId(userCreate);
+            List<Long> houseIds = msReportMapper.selectHouseIdsByUserId(userCreate);
             reportId = IdWorker.getId();
             MsReport msReport = new MsReport();
             msReport.setReportId(reportId);
-            msReport.setHouseId(houseId);
+            msReport.setHouseId(houseIds.get(0).longValue());
             msReport.setSafetyNum(0);
             msReport.setSureNum(0);
             msReport.setSuspectedNum(0);