xielianghe

admin-ui/app/whepi/lingyun/lingyunUser.js

@@ -224,7 +224,7 @@ define(function (require) {
                     {field: 'loudong', title: '部门名称', maxWidth: 200, align: 'left',},
                     {field: 'phone', title: '联系电话', maxWidth: 200, align: 'left',},
                     {field: 'doorplate', title: '工号', maxWidth: 200, align: 'left',},
-                    {field: 'bingqingDesc', title: '病情表述', maxWidth: 200, align: 'left',},
+                    {field: 'bingqingDesc', title: '病情表述', align: 'left',},
                     {field: 'workLoalDesc', title: '工作驻地', maxWidth: 200, align: 'left',},
                     {field: 'todayLoalDesc', title: '今晚住地', maxWidth: 200, align: 'left',},
                     {field: 'isTripDesc', title: '是否出行', maxWidth: 200, align: 'left',},

whepi-ui/templates/home/ribao.js

@@ -530,7 +530,7 @@ function insertlingyun() {
     }
     person.startLocal = 4;
     person.startLocalOther = $('#js_input_cfdq').val();
-    person.startLocalStr = $('#js_input_cfdq').val();
+    person.startLocalStr = "其它地点_" + $('#js_input_cfdq').val();
   } else if (cfd != 4 && cfd != 0) {
     if (cfd == 1) {
       person.startLocal = 1;
@@ -560,7 +560,7 @@ function insertlingyun() {
     }
     person.endLocal = 4;
     person.endLocalOther = $('#js_input_mddq').val();
-    person.endlocalStr = $('#js_input_mddq').val();
+    person.endlocalStr = "其它地点_" + $('#js_input_mddq').val();
   } else if (mdd != 4 && mdd != 0) {
     if (mdd == 1) {
       person.endLocal = 1;
@@ -749,14 +749,14 @@ function ribao_cell(v) {
       if (v.workLocal < 4)
         workLocal = "工作驻地：" + getLocal(v.workLocal) + "；";
       else
-        workLocal = "工作驻地：" + v.workLocalOther + "；";
+        workLocal = "工作驻地：其它地点_" + v.workLocalOther + "；";
     }
 
     if (v.todayLocal != 0) {
       if (v.todayLocal < 4)
         todayLocal = "今晚住地：" + getLocal(v.todayLocal) + "；";
       else
-        todayLocal = "今晚住地：" + v.todayLocalOther + "；";
+        todayLocal = "今晚住地：其它地点_" + v.todayLocalOther + "；";
     }
     if (v.isTrip != undefined)
       isTrip = "是否跨市出行：" + getIsTrip(v.isTrip) + "；"
@@ -1499,7 +1499,7 @@ function updateSuspected(suspectedId) {
               {
                 person.startLocal = v.startLocal;
                 person.startLocalOther = v.startLocalOther;
-                person.endlocal = v.endLocal;
+                person.endLocal = v.endLocal;
                 person.endLocalOther = v.endLocalOther;
                 person.tripType = v.tripType;
                 person.startLocalStr = getLocalOther(v.startLocal, v.startLocalOther);
@@ -1655,14 +1655,14 @@ function helpValue1(v) {
       if (v.workLocal < 4)
         workLocal = "工作驻地：" + getLocal(v.workLocal) + "；";
       else
-        workLocal = "工作驻地：" + v.workLocalOther + "；";
+        workLocal = "工作驻地：其它地点_" + v.workLocalOther + "；";
     }
 
     if (v.todayLocal != 0) {
       if (v.todayLocal < 4)
         todayLocal = "今晚住地：" + getLocal(v.todayLocal) + "；";
       else
-        todayLocal = "今晚住地：" + v.todayLocalOther + "；";
+        todayLocal = "今晚住地：其它地点_" + v.todayLocalOther + "；";
     }
 
     if (v.isTrip != undefined)
@@ -1817,7 +1817,7 @@ function getLocalOther(local, localOther) {
   else if (local == 3)
     return "当阳市";
   else if (local == 4)
-    return localOther;
+    return "其它地点_" + localOther;
   return "";
 }
 

whepi-web/src/main/java/com/bofeng/entity/ExcelRiBaoLY.java

@@ -236,16 +236,11 @@ public class ExcelRiBaoLY {
         }
         if (medical == 1) {
             bingqingDesc += "已确诊、";
-        }
-        else if (medical == 2) {
+        } else if (medical == 2) {
             bingqingDesc += "疑似、";
-        }
-
-        else if (medical == 3) {
+        } else if (medical == 3) {
             bingqingDesc += "有接触史、";
-        }
-
-        else if (medical == 5) {
+        } else if (medical == 5) {
             bingqingDesc += "解除隔离、";
         }
 
@@ -309,28 +304,29 @@ public class ExcelRiBaoLY {
 
     public String getWorkLoalDesc() {
         if (workLocal == 1) {
-            workLoalDesc = "武汉";
+            workLoalDesc = "武汉市";
         } else if (workLocal == 2) {
-            workLoalDesc = "宜昌";
+            workLoalDesc = "宜昌市";
         } else if (workLocal == 3) {
-            workLoalDesc = "当阳";
-        }else if (workLocal == 4) {
-            workLoalDesc = workLocalOther;
+            workLoalDesc = "当阳市";
+        } else if (workLocal == 4) {
+            workLoalDesc = "其它地点_" + workLocalOther;
         }
         return workLoalDesc;
     }
+
     @ExcelProperty(value = "今晚住地", index = 16)
     private String todayLoalDesc = "";
 
     public String getTodayLoalDesc() {
         if (todayLocal == 1) {
-            todayLoalDesc = "武汉";
+            todayLoalDesc = "武汉市";
         } else if (todayLocal == 2) {
-            todayLoalDesc = "宜昌";
+            todayLoalDesc = "宜昌市";
         } else if (todayLocal == 3) {
-            todayLoalDesc = "当阳";
+            todayLoalDesc = "当阳市";
         } else if (todayLocal == 4) {
-            todayLoalDesc = todayLocalOther;
+            todayLoalDesc = "其它地点_" + todayLocalOther;
         }
         return todayLoalDesc;
     }

whepi-web/src/main/java/com/bofeng/entity/ExcelRiBaoLYBM4.java

@@ -27,6 +27,7 @@ public class ExcelRiBaoLYBM4 {
     private int diarrhea = 0;
     private int singleRoom = 0;
     private int scoreRezult = 0;
+    private int temperatureScore = 0;
     private int safetyNum = 0;
     private int reportStatus = 0;
     private int sureNum = 0;
@@ -230,16 +231,11 @@ public class ExcelRiBaoLYBM4 {
         }
         if (medical == 1) {
             bingqingDesc += "已确诊、";
-        }
-        else if (medical == 2) {
+        } else if (medical == 2) {
             bingqingDesc += "疑似、";
-        }
-
-        else if (medical == 3) {
+        } else if (medical == 3) {
             bingqingDesc += "有接触史、";
-        }
-
-        else if (medical == 5) {
+        } else if (medical == 5) {
             bingqingDesc += "解除隔离、";
         }
 
@@ -294,6 +290,23 @@ public class ExcelRiBaoLYBM4 {
         if (!Strings.isNullOrEmpty(others)) {
             bingqingDesc += others;
         }
+        bingqingDesc += "评分结果：";
+        if (scoreRezult == 0)
+            bingqingDesc += "未评估";
+        else if (scoreRezult == 1) {
+            if (temperatureScore > 1)
+                bingqingDesc += "正常,间隔时间服用退烧药，多休息，多喝水";
+            else
+                bingqingDesc += "正常";
+        } else if (scoreRezult == 2) {
+            if (temperatureScore > 1)
+                bingqingDesc += "注意观察,间隔时间服用退烧药，多休息，多喝水";
+            else
+                bingqingDesc += "注意观察";
+        } else if (scoreRezult == 3)
+            bingqingDesc += "联系社区医生（或者在线问诊）";
+        else if (scoreRezult == 4)
+            bingqingDesc += "尽快就诊";
         return bingqingDesc;
     }
 
@@ -305,13 +318,13 @@ public class ExcelRiBaoLYBM4 {
             return "";
         }
         if (workLocal == 1) {
-            workLoalDesc = "武汉";
+            workLoalDesc = "武汉市";
         } else if (workLocal == 2) {
-            workLoalDesc = "宜昌";
+            workLoalDesc = "宜昌市";
         } else if (workLocal == 3) {
-            workLoalDesc = "当阳";
-        }else if (workLocal == 4) {
-            workLoalDesc = workLocalOther;
+            workLoalDesc = "当阳市";
+        } else if (workLocal == 4) {
+            workLoalDesc = "其它地点_" + workLocalOther;
         }
         return workLoalDesc;
     }
@@ -324,13 +337,13 @@ public class ExcelRiBaoLYBM4 {
             return "";
         }
         if (todayLocal == 1) {
-            todayLoalDesc = "武汉";
+            todayLoalDesc = "武汉市";
         } else if (todayLocal == 2) {
-            todayLoalDesc = "宜昌";
+            todayLoalDesc = "宜昌市";
         } else if (todayLocal == 3) {
-            todayLoalDesc = "当阳";
+            todayLoalDesc = "当阳市";
         } else if (todayLocal == 4) {
-            todayLoalDesc = todayLocalOther;
+            todayLoalDesc = "其它地点_" + todayLocalOther;
         }
         return todayLoalDesc;
     }
@@ -349,6 +362,7 @@ public class ExcelRiBaoLYBM4 {
         }
         return isTripDesc;
     }
+
     @ExcelProperty(value = "出行详细", index = 1)
     private String tripDetDesc = "";
 

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

@@ -126,13 +126,13 @@ public class MsReportService {
     public String getLocalOther(Integer local, String localOther) {
         String localDet = "";
         if (local == 1) {
-            localDet = "武汉";
+            localDet = "武汉市";
         } else if (local == 2)
-            localDet = "宜昌";
+            localDet = "宜昌市";
         else if (local == 3)
-            localDet = "当阳";
+            localDet = "当阳市";
         else if (local == 4)
-            localDet = localOther;
+            localDet = "其它地点_" + localOther;
         return localDet;
     }
 

whepi-web/src/main/resources/mapper/RbMapper.xml

@@ -68,7 +68,7 @@
         select suu.ridgepole,suu.unit,suh.doorplate,suho.linkman,suho.phone,msr.safety_num as safetyNum, msr.report_status as reportStatus,
         msr.sure_num as sureNum,msr.suspected_num as suspectedNum,msr.normal_num as normalNum,
         msr.single_num as singleNum,mss.user_name as userName,mss.grender, mss.age,mss.family_status as familyStatus,
-        mss.medical,mss.temperature,mss.cough,mss.muscle ,mss.dyspnea,mss.fatigue,mss.diarrhea,mss.single_room as singleRoom,mss.score_rezult,
+        mss.medical,mss.temperature,mss.cough,mss.muscle ,mss.dyspnea,mss.fatigue,mss.diarrhea,mss.single_room as singleRoom,mss.score_rezult,mss.temperature_score,
         tr.trip_id,tr.is_trip,tr.today_local,tr.today_local_other,tr.work_local,tr.work_local_other,ur.user_id as userId
         from sys_uptown_house suh
         inner join sys_uptown_home suho on suho.house_id=suh.house_id