Merge remote-tracking branch 'origin/master'

whepi-ui/templates/yeweihui/home.ftl

@@ -90,7 +90,7 @@
                     },
                     type: 'GET',
                     success: function (data) {
-                        // $('#ribao_famliy').empty();
+                        $('#huiz').empty();
                         for (var i = 0; i < data.data.length; i++) {
                             var v = data.data[i];
                             if(i == 0){

whepi-ui/templates/yeweihui/ribao.ftl

@@ -81,7 +81,7 @@
                     if(v.msStatus == 2 && v.reportStatus == 1){//异常
                         td = '<td style="background-color: green" align="center" value="'+v.houseId+'"><p style="height: 100%;width: 100%;background-color: yellow" onclick=\'ribao_ycxq('+JSON.stringify(v.houseId) +');\'>'+v.doorplate+'</p></td>';
                     }else if(v.msStatus != 2 && v.reportStatus == 1 && v.msStatus != null && v.reportStatus !=null){//已报
-                        td = '<td style="background-color: #0bb20c" align="center">'+v.doorplate+'</td>';
+                        td = '<td style="background-color: #0bb20c" align="center"><p style="height: 100%;width: 100%;background-color: #0bb20c" onclick=\'ribao_ycxq('+JSON.stringify(v.houseId) +');\'>'+v.doorplate+'</p></td>';
                     }else if(v.reportStatus == 1 || v.reportStatus == 0){//待报
                         td = '<td style="background-color: #75859f" align="center">'+v.doorplate+'</td>';
                     }

whepi-web/src/main/java/com/bofeng/controller/AdminAreaController.java

@@ -11,7 +11,7 @@ import org.springframework.web.bind.annotation.RestController;
 import java.util.List;
 
 @RestController
-public class AdminAreaController {
+public class WxSysAreaController {
 
     @Autowired
     private SysAreaService sysAreaService;

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

@@ -43,30 +43,28 @@ public interface RbMapper extends BaseMapper<sysUptownUnit> {
 
     @Select("select * from " +
             "(" +
-            "select count(*) as num,d.user_id as userId,e.uptown_name as uptownName from sys_uptown_house a " +
+            "select count(*) as num,e.uptown_name as uptownName from sys_uptown_house a " +
             "inner join sys_uptown_unit b on b.unit_id = a.unit_id " +
             "inner join sys_uptown e on b.uptown_id = e.uptown_id " +
             "inner join sys_owner c on c.uptown_id = b.uptown_id " +
             "inner join sys_user_role d on d.property_id = c.owner_id and d.role_id = 2 " +
-            "GROUP BY d.user_id,e.uptown_name " +
+            "where d.user_id = #{userId} " +
+            "GROUP BY e.uptown_name " +
             "union all " +
-            "select DISTINCT count(*) as num,e.user_id as userId,'' as uptownName from ms_report a " +
+            "select DISTINCT count(*) as num,'' as uptownName from ms_report a " +
             "inner join sys_uptown_house b on a.house_id = b.house_id " +
             "inner join sys_uptown_unit c on c.unit_id = b.unit_id " +
             "inner join sys_owner d on d.uptown_id = c.uptown_id " +
             "inner join sys_user_role e on e.property_id = d.owner_id and e.role_id = 2 " +
-            "where a.report_status = 1  and a.report_date = #{reportDate} " +
-            "GROUP BY e.user_id " +
+            "where a.report_status = 1  and a.report_date = #{reportDate} and e.user_id = #{userId} " +
             "union all " +
-            "select DISTINCT count(*) as num,e.user_id as userId,'' as uptownName from ms_report a " +
+            "select DISTINCT count(*) as num,'' as uptownName from ms_report a " +
             "inner join sys_uptown_house b on a.house_id = b.house_id " +
             "inner join sys_uptown_unit c on c.unit_id = b.unit_id " +
             "inner join sys_owner d on d.uptown_id = c.uptown_id " +
             "inner join sys_user_role e on e.property_id = d.owner_id and e.role_id = 2 " +
-            "where a.report_status = 1 and a.ms_status = 2 and a.report_date = #{reportDate} " +
-            "GROUP BY e.user_id " +
-            ") tt " +
-            "where tt.userId = #{userId}")
+            "where a.report_status = 1 and a.ms_status = 2 and a.report_date = #{reportDate} and e.user_id = #{userId} " +
+            ") tt ")
     List<MsSuspected> selecthuiz(@Param("userId") Long userId,@Param("reportDate") String reportDate);
 
     @Select(

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

@@ -37,71 +37,59 @@ public class RbService {
         Date date = new Date();
         SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd");
         String dateStr = simpleDateFormat.format(date);
-        List<MsSuspected> sysUptownHouses = rbMapper.selectYcXq(houseId,dateStr);
-        if(sysUptownHouses.size() !=0){
+        List<MsSuspected> sysUptownHouses = rbMapper.selectYcXq(houseId, dateStr);
+        String bingqingDesc = "";
+        if(sysUptownHouses.size() != 0 ){
             for (int i = 0; i < sysUptownHouses.size(); i++) {
 
                 Integer cough = sysUptownHouses.get(i).getCough();
-                if(cough != null && cough == 0){
-                    sysUptownHouses.get(i).setCoughStr("无咳嗽");
-                }else if(cough != null && cough ==1){
-                    sysUptownHouses.get(i).setCoughStr("偶尔短暂咳嗽");
+                if(cough != null && cough ==1){
+                    bingqingDesc += "偶尔短暂咳嗽、";
                 }else if(cough != null && cough ==2){
-                    sysUptownHouses.get(i).setCoughStr("咳嗽轻度影响生活");
+                    bingqingDesc += "咳嗽轻度影响生活、";
                 }else if(cough != null && cough ==3){
-                    sysUptownHouses.get(i).setCoughStr("咳嗽严重影响生活");
+                    bingqingDesc += "咳嗽严重影响生活、";
                 }
                 Integer muscle = sysUptownHouses.get(i).getMuscle();
-                if(muscle != null && muscle==0){
-                    sysUptownHouses.get(i).setMuscleStr("无肌肉酸痛");
-                }else if(muscle != null && muscle ==1){
-                    sysUptownHouses.get(i).setMuscleStr("肌肉按压有酸痛");
+                if(muscle != null && muscle ==1){
+                    bingqingDesc += "肌肉按压有酸痛、";
                 }else if(muscle != null && muscle ==2){
-                    sysUptownHouses.get(i).setMuscleStr("偶尔肌肉按压酸痛");
+                    bingqingDesc += "偶尔肌肉按压酸痛、";
                 }else if(muscle != null && muscle ==3){
-                    sysUptownHouses.get(i).setMuscleStr("肌肉按压持续酸痛");
+                    bingqingDesc += "肌肉按压持续酸痛、";
                 }
                 Integer dyspnea = sysUptownHouses.get(i).getDyspnea();
-                if(dyspnea != null && dyspnea ==0){
-                    sysUptownHouses.get(i).setDyspneaStr("无呼吸困难");
-                }else if(dyspnea != null && dyspnea ==1){
-                    sysUptownHouses.get(i).setDyspneaStr("呼吸急走或上坡气短");
+                if(dyspnea != null && dyspnea ==1){
+                    bingqingDesc += "呼吸急走或上坡气短、";
                 }else if(dyspnea != null && dyspnea ==2){
-                    sysUptownHouses.get(i).setDyspneaStr("呼吸气短而走路变慢");
+                    bingqingDesc += "呼吸气短而走路变慢、";
                 }else if(dyspnea != null && dyspnea ==3){
-                    sysUptownHouses.get(i).setDyspneaStr("呼吸走路数分钟后气短");
+                    bingqingDesc += "呼吸走路数分钟后气短、";
                 }else if(dyspnea != null && dyspnea ==4){
-                    sysUptownHouses.get(i).setDyspneaStr("呼吸气短无法离开房间");
+                    bingqingDesc += "呼吸气短无法离开房间、";
                 }
                 Integer fatigue = sysUptownHouses.get(i).getFatigue();
-                if(fatigue !=null && fatigue == 0){
-                    sysUptownHouses.get(i).setFatigueStr("无乏力");
-                }else if(fatigue !=null && fatigue == 1){
-                    sysUptownHouses.get(i).setFatigueStr("可体力劳动但觉得累");
+                if(fatigue !=null && fatigue == 1){
+                    bingqingDesc += "可体力劳动但觉得累、";
                 }else if(fatigue !=null && fatigue == 2){
-                    sysUptownHouses.get(i).setFatigueStr("轻体力劳动后长时间不能恢复");
+                    bingqingDesc += "轻体力劳动后长时间不能恢复、";
                 }else if(fatigue !=null && fatigue == 3){
-                    sysUptownHouses.get(i).setFatigueStr("不能正常生活");
+                    bingqingDesc += "不能正常生活、";
                 }
                 Integer diarrhea = sysUptownHouses.get(i).getDiarrhea();
-                if(diarrhea !=null && diarrhea == 0){
-                    sysUptownHouses.get(i).setDiarrheaStr("无腹泻");
-                }else if(diarrhea !=null && diarrhea == 1){
-                    sysUptownHouses.get(i).setDiarrheaStr("轻度腹泻少于于3次");
+                if(diarrhea !=null && diarrhea == 1){
+                    bingqingDesc += "轻度腹泻少于于3次、";
                 }else if(diarrhea !=null && diarrhea == 2){
-                    sysUptownHouses.get(i).setDiarrheaStr("中度腹泻4-6次");
+                    bingqingDesc += "中度腹泻4-6次、";
                 }else if(diarrhea !=null && diarrhea == 3){
-                    sysUptownHouses.get(i).setDiarrheaStr("重度腹泻超过6次");
+                    bingqingDesc += "重度腹泻超过6次、";
                 }
                 Integer singleRoom = sysUptownHouses.get(i).getSingleRoom();
-                if(singleRoom != null && singleRoom ==0 ){
-                    sysUptownHouses.get(i).setSingleRoomStr("没有单间隔离");
-                }else if(singleRoom != null && singleRoom == 1){
-                    sysUptownHouses.get(i).setSingleRoomStr("单间隔离");
+                if(singleRoom != null && singleRoom == 1){
+                    bingqingDesc += "单间隔离";
                 }
 
-                sysUptownHouses.get(i).setZhengzhuang(sysUptownHouses.get(i).getCoughStr()+","+sysUptownHouses.get(i).getMuscleStr()+","+sysUptownHouses.get(i).getDyspneaStr()
-                        +","+sysUptownHouses.get(i).getFatigueStr()+","+sysUptownHouses.get(i).getDiarrheaStr()+","+sysUptownHouses.get(i).getSingleRoomStr());
+                sysUptownHouses.get(i).setZhengzhuang(bingqingDesc);
             }
         }
 

whepi-web/src/main/java/com/bofeng/wx/controller/YeWeiHuiController.java

@@ -189,7 +189,7 @@ public class YeWeiHuiController {
 
     @GetMapping("/yeweihui/ribaohuiz")
     public Model<List<MsSuspected>> yeweihuiRibaohuiz(Long userCreate,String reportDate) {
-//        Long userCreate = 1225331049509187586L;
+//        Long userCreate = 1225321682867105793L;
         List<MsSuspected> rbList = rbService.selecthuiz(userCreate,reportDate);
         return Model.newSuccess(rbList);
     }

whepi-web/src/main/resources/application.yml

@@ -43,7 +43,7 @@ endpoints:
 #  whitelabel.enabled: false
 
 spring:
-  profiles.active: dev
+  profiles.active: maoyunfeng
 
   application:
     name: whepi-web