将性别隐藏

jni/logic/mainLogic.cc

@@ -719,41 +719,37 @@ static void obtainListItemData_BedListView(ZKListView *pListView,ZKListView::ZKL
 			name->setText(customerName);
 		}
 
-
 		if (partSetting.customerAgeHiddenOnDoor != 0) {
 			if (frameBedList[index]["customer_age"].asString() == "") {
 				age->setText("");
 			} else {
 				age->setText("*" + frameBedList[index]["customer_age_unit"].asString());
 			}
-		}
-		else {
-			age->setText(frameBedList[index]["customer_age"].asString() + frameBedList[index]["customer_age_unit"].asString());
-		}
-
 
-		string customerSex = frameBedList[index]["customer_sex"].asString();
-		if (customerSex == "0") {	// 如果性别为女性，替换成女性，底色为粉色
-			sex->setText(LANGUAGEMANAGER->getValue("Woman"));
-			sex->setTextColor(0xFF9F9F);
-			sex->setBackgroundPic("9/lightRed.9.png");
-		}
-		else if (customerSex == "1") {
-			sex->setText(LANGUAGEMANAGER->getValue("Man"));
-			sex->setTextColor(0x3A78EF);
-			sex->setBackgroundPic("9/lightBlue.9.png");
-		}
-		else if (customerSex == "") {
-			sex->setText(customerSex);
+			sex->setText("*****");
 			sex->setTextColor(0x37B643);
 			sex->setBackgroundPic("9/lightGreen.9.png");
 		}
 		else {
-			sex->setText(LANGUAGEMANAGER->getValue("Unknown"));
-			sex->setTextColor(0x37B643);
-			sex->setBackgroundPic("9/lightGreen.9.png");
-		}
+			age->setText(frameBedList[index]["customer_age"].asString() + frameBedList[index]["customer_age_unit"].asString());
 
+			string customerSex = frameBedList[index]["customer_sex"].asString();
+			if (customerSex == "0") {	// 如果性别为女性，替换成女性，底色为粉色
+				sex->setText(LANGUAGEMANAGER->getValue("Woman"));
+				sex->setTextColor(0xFF9F9F);
+				sex->setBackgroundPic("9/lightRed.9.png");
+			}
+			else if (customerSex == "1") {
+				sex->setText(LANGUAGEMANAGER->getValue("Man"));
+				sex->setTextColor(0x3A78EF);
+				sex->setBackgroundPic("9/lightBlue.9.png");
+			}
+			else {
+				sex->setText(LANGUAGEMANAGER->getValue("Unknown"));
+				sex->setTextColor(0x37B643);
+				sex->setBackgroundPic("9/lightGreen.9.png");
+			}
+		}
 
 		// 医生护士相关
 		if (rightTitleInfo["doctor_valid"] != 1){
@@ -1125,18 +1121,14 @@ static void obtainListItemData_BedListView4(ZKListView *pListView,ZKListView::ZK
 			} else {
 				age->setText("*" + frameBedList[index]["customer_age_unit"].asString());
 			}
-		}
-		else {
-			age->setText(frameBedList[index]["customer_age"].asString() + frameBedList[index]["customer_age_unit"].asString());
-		}
-
 
-		if (partSetting.customerAgeHiddenOnDoor != 0) {
 			sex->setText(LANGUAGEMANAGER->getValue("Unknown"));
 			sex->setTextColor(0x37B643);
 			sex->setBackgroundPic("9/lightGreen.9.png");
 		}
 		else {
+			age->setText(frameBedList[index]["customer_age"].asString() + frameBedList[index]["customer_age_unit"].asString());
+
 			string customerSex = frameBedList[index]["customer_sex"].asString();
 			if (customerSex == "0") {	// 如果性别为女性，替换成女性，底色为粉色
 				sex->setText(LANGUAGEMANAGER->getValue("Woman"));
@@ -1155,7 +1147,6 @@ static void obtainListItemData_BedListView4(ZKListView *pListView,ZKListView::ZK
 			}
 		}
 
-
 		// 医生护士相关
 		if (rightTitleInfo["doctor_valid"] != 1){
 			doctorTitle->setVisible(false);