去除空值护理项

.settings/language.settings.xml

@@ -5,7 +5,7 @@
 			<provider copy-of="extension" id="org.eclipse.cdt.ui.UserLanguageSettingsProvider"/>
 			<provider-reference id="org.eclipse.cdt.core.ReferencedProjectsLanguageSettingsProvider" ref="shared-provider"/>
 			<provider-reference id="org.eclipse.cdt.managedbuilder.core.MBSLanguageSettingsProvider" ref="shared-provider"/>
-			<provider class="org.eclipse.cdt.managedbuilder.language.settings.providers.GCCBuiltinSpecsDetector" console="false" env-hash="908325126562" id="org.eclipse.cdt.managedbuilder.core.GCCBuiltinSpecsDetector" keep-relative-paths="false" name="CDT GCC Built-in Compiler Settings" parameter="${COMMAND} ${FLAGS} -E -P -v -dD &quot;${INPUTS}&quot;" prefer-non-shared="true">
+			<provider class="org.eclipse.cdt.managedbuilder.language.settings.providers.GCCBuiltinSpecsDetector" console="false" env-hash="-897966030472691006" id="org.eclipse.cdt.managedbuilder.core.GCCBuiltinSpecsDetector" keep-relative-paths="false" name="CDT GCC Built-in Compiler Settings" parameter="${COMMAND} ${FLAGS} -E -P -v -dD &quot;${INPUTS}&quot;" prefer-non-shared="true">
 				<language-scope id="org.eclipse.cdt.core.gcc"/>
 				<language-scope id="org.eclipse.cdt.core.g++"/>
 			</provider>
@@ -16,7 +16,7 @@
 			<provider copy-of="extension" id="org.eclipse.cdt.ui.UserLanguageSettingsProvider"/>
 			<provider-reference id="org.eclipse.cdt.core.ReferencedProjectsLanguageSettingsProvider" ref="shared-provider"/>
 			<provider-reference id="org.eclipse.cdt.managedbuilder.core.MBSLanguageSettingsProvider" ref="shared-provider"/>
-			<provider class="org.eclipse.cdt.managedbuilder.language.settings.providers.GCCBuiltinSpecsDetector" console="false" env-hash="1685337175238" id="org.eclipse.cdt.managedbuilder.core.GCCBuiltinSpecsDetector" keep-relative-paths="false" name="CDT GCC Built-in Compiler Settings" parameter="${COMMAND} ${FLAGS} -E -P -v -dD &quot;${INPUTS}&quot;" prefer-non-shared="true">
+			<provider class="org.eclipse.cdt.managedbuilder.language.settings.providers.GCCBuiltinSpecsDetector" console="false" env-hash="-1866745283451" id="org.eclipse.cdt.managedbuilder.core.GCCBuiltinSpecsDetector" keep-relative-paths="false" name="CDT GCC Built-in Compiler Settings" parameter="${COMMAND} ${FLAGS} -E -P -v -dD &quot;${INPUTS}&quot;" prefer-non-shared="true">
 				<language-scope id="org.eclipse.cdt.core.gcc"/>
 				<language-scope id="org.eclipse.cdt.core.g++"/>
 			</provider>

jni/logic/mainLogic.cc

@@ -954,36 +954,89 @@ static void obtainListItemData_BedListView(ZKListView *pListView,ZKListView::ZKL
 
 		// 护理项相关
 		Json::Value nurseConfigList = frameBedList[index]["nurse_config_dtos"];
-		for (int i = 0; i < 6; i++) {
-			int nurseOptionNumber = ID_MAIN_NurseOption1 + i * 2;
-			if (i == 5) {
-				nurseOptionNumber = ID_MAIN_NurseOption6;
-			}
-			if (StoragePreferences::getInt(STORE_TEMPLATE, defaultTemplateInt) == 3) {
-				pListItem->findSubItemByID(nurseOptionNumber)->setVisible(true);
-				if (nurseConfigList.size() > 0 && nurseConfigList.size() >= i && nurseConfigList[i]["nurse_option_name"].asString() != "") {
+
+
+		if (StoragePreferences::getInt(STORE_TEMPLATE, defaultTemplateInt) == 3) {
+			int count = 0;
+			for (const Json::Value& nurseConfig : nurseConfigList) {
+				int nurseOptionNumber = ID_MAIN_NurseOption1 + count * 2;
+				if (count == 5) {
+					nurseOptionNumber = ID_MAIN_NurseOption6;
+				}
+
+				if (nurseConfig["nurse_option_name"].asString() != "" && count < 6) {
 					//颜色
-					string nurseConfigColot = nurseConfigList[i]["nurse_color_rbg"].asString();
+					string nurseConfigColot = nurseConfig["nurse_color_rbg"].asString();
 					uint32_t bgColor = 0xFFF5F8FF;
 					if (nurseConfigColot != "") {
 						string rgbStr = "FF" + nurseConfigColot;
 						transform(rgbStr.begin(), rgbStr.end(), rgbStr.begin(), ::toupper);
 						bgColor = strtoul(("0x" + rgbStr).c_str(), NULL,16);
 					}
-					string nurseOptionName = nurseConfigList[i]["nurse_option_name"].asString();
+					string nurseOptionName = nurseConfig["nurse_option_name"].asString();
 					pListItem->findSubItemByID(nurseOptionNumber)->setBackgroundColor(bgColor);
 					pListItem->findSubItemByID(nurseOptionNumber)->setText(nurseOptionName);
+
+					count++;
+				}
+
+				if (count >= 6) {
+					break;
 				}
-				else {
+			}
+
+			if (count < 5) {
+				for (int i = count; i < 6; i++) {
+					int nurseOptionNumber = ID_MAIN_NurseOption1 + i * 2;
+					if (i == 5) {
+						nurseOptionNumber = ID_MAIN_NurseOption6;
+					}
 					pListItem->findSubItemByID(nurseOptionNumber)->setBackgroundColor(0xFFF5F8FF);
 					pListItem->findSubItemByID(nurseOptionNumber)->setText(LANGUAGEMANAGER->getValue("None"));
 				}
 			}
-			else {
+
+		}
+		else {
+			for (int i = 0; i < 6; i++) {
+				int nurseOptionNumber = ID_MAIN_NurseOption1 + i * 2;
+				if (i == 5) {
+					nurseOptionNumber = ID_MAIN_NurseOption6;
+				}
 				pListItem->findSubItemByID(nurseOptionNumber)->setVisible(false);
 			}
 		}
 
+//		for (int i = 0; i < 6; i++) {
+//			int nurseOptionNumber = ID_MAIN_NurseOption1 + i * 2;
+//			if (i == 5) {
+//				nurseOptionNumber = ID_MAIN_NurseOption6;
+//			}
+//			if (StoragePreferences::getInt(STORE_TEMPLATE, defaultTemplateInt) == 3) {
+//				pListItem->findSubItemByID(nurseOptionNumber)->setVisible(true);
+//				if (nurseConfigList.size() > 0 && nurseConfigList.size() >= i && nurseConfigList[i]["nurse_option_name"].asString() != "") {
+//					//颜色
+//					string nurseConfigColot = nurseConfigList[i]["nurse_color_rbg"].asString();
+//					uint32_t bgColor = 0xFFF5F8FF;
+//					if (nurseConfigColot != "") {
+//						string rgbStr = "FF" + nurseConfigColot;
+//						transform(rgbStr.begin(), rgbStr.end(), rgbStr.begin(), ::toupper);
+//						bgColor = strtoul(("0x" + rgbStr).c_str(), NULL,16);
+//					}
+//					string nurseOptionName = nurseConfigList[i]["nurse_option_name"].asString();
+//					pListItem->findSubItemByID(nurseOptionNumber)->setBackgroundColor(bgColor);
+//					pListItem->findSubItemByID(nurseOptionNumber)->setText(nurseOptionName);
+//				}
+//				else {
+//					pListItem->findSubItemByID(nurseOptionNumber)->setBackgroundColor(0xFFF5F8FF);
+//					pListItem->findSubItemByID(nurseOptionNumber)->setText(LANGUAGEMANAGER->getValue("None"));
+//				}
+//			}
+//			else {
+//				pListItem->findSubItemByID(nurseOptionNumber)->setVisible(false);
+//			}
+//		}
+
 
 //		Json::Value nurseConfigList = frameBedList[index]["nurse_config_dtos"];
 //		if (nurseConfigList.size() > 0) {

jni/service/BusinessConfig.h

@@ -64,10 +64,10 @@
 
 #define STORE_MAC_ADDR "mac_addr"
 
-static int defaultTemplateInt = 1;
+static int defaultTemplateInt = 3;
 
-static std::string versionCode = "v1.0.56";
-static int versionNo = 56;
+static std::string versionCode = "v1.0.57";
+static int versionNo = 57;
 static std::string serverIP = "172.28.100.100";
 static std::string tcpIP = "172.28.100.100";
 static int serverHttpPort = 8006;