xielianghe

whepi-ui/templates/home/ribao.js

@@ -672,14 +672,14 @@ function ribao_cell(v) {
   var grender = getGreder(v.grender);
   var age = v.age;
   var familyStatus = "";
+  if (v.familyStatus != 0)
+    familyStatus = "基本状况：" + getFamilyStatus(v.familyStatus) + "；";
   var medical = "";
   if (v.medical != 0)
     medical = "新冠肺炎：" + getMedical(v.medical) + "；";
   var singleRoom = "";
   var uptownId = $("#uptownId").val();
   if (uptownId != xiaoquId && uptownId != ceshixiaoquId) {
-    if (v.familyStatus != 0)
-      familyStatus = "基本状况：" + getFamilyStatus(v.familyStatus) + "；";
 
     if (v.singleRoom != 0)
       singleRoom = "单间隔离：" + getSingleRoom(v.singleRoom) + "；";
@@ -1480,6 +1480,8 @@ function helpValue1(v) {
   var grender = getGreder(v.grender);
   var age = v.age;
   var familyStatus = "";
+  if (v.familyStatus != 0)
+    familyStatus = "基本状况：" + getFamilyStatus(v.familyStatus) + "；";
 
   var medical = "";
   if (v.medical != 0)
@@ -1488,8 +1490,6 @@ function helpValue1(v) {
 
   var uptownId = $("#uptownId").val();
   if (uptownId != xiaoquId && uptownId != ceshixiaoquId) {
-    if (v.familyStatus != 0)
-      familyStatus = "基本状况：" + getFamilyStatus(v.familyStatus) + "；";
 
     if (v.singleRoom != 0)
       singleRoom = "单间隔离：" + getSingleRoom(v.singleRoom) + "；";