将目录下载中为'null'字符串的部分设为空值。

pom.xml

@@ -10,7 +10,7 @@
     </parent>
     <groupId>thyyxxk</groupId>
     <artifactId>web-server</artifactId>
-    <version>2</version>
+    <version>1</version>
     <name>web-server</name>
     <description>server for yibao-web</description>
     <properties>

src/main/java/thyyxxk/webserver/entity/medicalinsurance/download/SiDlChnsHbl.java

@@ -7,186 +7,193 @@ import lombok.Data;
 @Data
 public class SiDlChnsHbl implements Serializable {
 
-	private static final long serialVersionUID =  362772261715315275L;
-
-	/**
-	 * 医疗目录编码
-	 */
-	private String code;
-
-	/**
-	 * 单味药名称
-	 */
-	private String monooName;
-
-	/**
-	 * 单复方标志
-	 */
-	private String singleCompoundMark;
-
-	/**
-	 * 质量等级
-	 */
-	private String qualityGrade;
-
-	/**
-	 * 中草药年份
-	 */
-	private String herbalMedicineYear;
-
-	/**
-	 * 药用部位
-	 */
-	private String medicinalSite;
-
-	/**
-	 * 安全计量
-	 */
-	private String safetyMeasurement;
-
-	/**
-	 * 常规用法
-	 */
-	private String generalUsage;
-
-	/**
-	 * 性味
-	 */
-	private String propertyAndFlavor;
-
-	/**
-	 * 归经
-	 */
-	private String channelTropism;
-
-	/**
-	 * 品种
-	 */
-	private String variety;
-
-	/**
-	 * 开始日期
-	 */
-	private String startTime;
-
-	/**
-	 * 结束日期
-	 */
-	private String endTime;
-
-	/**
-	 * 有效标志
-	 */
-	private String validFlag;
-
-	/**
-	 * 唯一记录号
-	 */
-	private String uniqueRecordNumber;
-
-	/**
-	 * 数据创建时间
-	 */
-	private String dataCreationTime;
-
-	/**
-	 * 数据更新时间
-	 */
-	private String dataUpdateTime;
-
-	/**
-	 * 版本号
-	 */
-	private String versionNumber;
-
-	/**
-	 * 版本名称
-	 */
-	private String versionName;
-
-	/**
-	 * 药材名称
-	 */
-	private String medicalMaterialsName;
-
-	/**
-	 * 功能主治
-	 */
-	private String functionalGovernance;
-
-	/**
-	 * 炮制方法
-	 */
-	private String processingMethod;
-
-	/**
-	 * 功效分类
-	 */
-	private String efficacyClassification;
-
-	/**
-	 * 药材种来源
-	 */
-	private String medicinalMaterialsSource;
-
-	/**
-	 * 国家医保支付政策
-	 */
-	private String nationalPaymentPolicy;
-
-	/**
-	 * 省级医保支付政策
-	 */
-	private String provincialPaymentPolicy;
-
-	/**
-	 * 标准名称
-	 */
-	private String standardName;
-
-	/**
-	 * 标准页码
-	 */
-	private String standardPageNumber;
-
-	/**
-	 * 标准电子档案
-	 */
-	private String standardElectronicArchives;
-
-	public SiDlChnsHbl() {
-	}
-
-	public SiDlChnsHbl(String tempstr) {
-		String[] arr = tempstr.split("\t");
-		code = arr[0].trim();
-		monooName = arr[1].trim();
-		singleCompoundMark = arr[2].trim();
-		qualityGrade = arr[3].trim();
-		herbalMedicineYear = arr[4].trim();
-		medicinalSite = arr[5].trim();
-		safetyMeasurement = arr[6].trim();
-		generalUsage = arr[7].trim();
-		propertyAndFlavor = arr[8].trim();
-		channelTropism = arr[9].trim();
-		variety = arr[10].trim();
-		startTime = arr[11].trim();
-		endTime = arr[12].trim();
-		validFlag = arr[13].trim();
-		uniqueRecordNumber = arr[14].trim();
-		dataCreationTime = arr[15].trim();
-		dataUpdateTime = arr[16].trim();
-		versionNumber = arr[17].trim();
-		versionName = arr[18].trim();
-		medicalMaterialsName = arr[19].trim();
-		functionalGovernance = arr[20].trim();
-		processingMethod = arr[21].trim();
-		efficacyClassification = arr[22].trim();
-		medicinalMaterialsSource = arr[23].trim();
-		nationalPaymentPolicy = arr[24].trim();
-		provincialPaymentPolicy = arr[25].trim();
-		standardName = arr[26].trim();
-		standardPageNumber = arr[27].trim();
-		standardElectronicArchives = arr[28].trim();
-	}
+    private static final long serialVersionUID = 362772261715315275L;
+
+    /**
+     * 医疗目录编码
+     */
+    private String code;
+
+    /**
+     * 单味药名称
+     */
+    private String monooName;
+
+    /**
+     * 单复方标志
+     */
+    private String singleCompoundMark;
+
+    /**
+     * 质量等级
+     */
+    private String qualityGrade;
+
+    /**
+     * 中草药年份
+     */
+    private String herbalMedicineYear;
+
+    /**
+     * 药用部位
+     */
+    private String medicinalSite;
+
+    /**
+     * 安全计量
+     */
+    private String safetyMeasurement;
+
+    /**
+     * 常规用法
+     */
+    private String generalUsage;
+
+    /**
+     * 性味
+     */
+    private String propertyAndFlavor;
+
+    /**
+     * 归经
+     */
+    private String channelTropism;
+
+    /**
+     * 品种
+     */
+    private String variety;
+
+    /**
+     * 开始日期
+     */
+    private String startTime;
+
+    /**
+     * 结束日期
+     */
+    private String endTime;
+
+    /**
+     * 有效标志
+     */
+    private String validFlag;
+
+    /**
+     * 唯一记录号
+     */
+    private String uniqueRecordNumber;
+
+    /**
+     * 数据创建时间
+     */
+    private String dataCreationTime;
+
+    /**
+     * 数据更新时间
+     */
+    private String dataUpdateTime;
+
+    /**
+     * 版本号
+     */
+    private String versionNumber;
+
+    /**
+     * 版本名称
+     */
+    private String versionName;
+
+    /**
+     * 药材名称
+     */
+    private String medicalMaterialsName;
+
+    /**
+     * 功能主治
+     */
+    private String functionalGovernance;
+
+    /**
+     * 炮制方法
+     */
+    private String processingMethod;
+
+    /**
+     * 功效分类
+     */
+    private String efficacyClassification;
+
+    /**
+     * 药材种来源
+     */
+    private String medicinalMaterialsSource;
+
+    /**
+     * 国家医保支付政策
+     */
+    private String nationalPaymentPolicy;
+
+    /**
+     * 省级医保支付政策
+     */
+    private String provincialPaymentPolicy;
+
+    /**
+     * 标准名称
+     */
+    private String standardName;
+
+    /**
+     * 标准页码
+     */
+    private String standardPageNumber;
+
+    /**
+     * 标准电子档案
+     */
+    private String standardElectronicArchives;
+
+    public SiDlChnsHbl() {
+    }
+
+    public SiDlChnsHbl(String tempstr) {
+        String[] arr = tempstr.split("\t");
+        for (int i = 0; i < arr.length; i++) {
+            if (null == arr[i] || arr[i].trim().equals("null")) {
+                arr[i] = null;
+            } else {
+                arr[i] = arr[i].trim();
+            }
+        }
+        code = arr[0];
+        monooName = arr[1];
+        singleCompoundMark = arr[2];
+        qualityGrade = arr[3];
+        herbalMedicineYear = arr[4];
+        medicinalSite = arr[5];
+        safetyMeasurement = arr[6];
+        generalUsage = arr[7];
+        propertyAndFlavor = arr[8];
+        channelTropism = arr[9];
+        variety = arr[10];
+        startTime = arr[11];
+        endTime = arr[12];
+        validFlag = arr[13];
+        uniqueRecordNumber = arr[14];
+        dataCreationTime = arr[15];
+        dataUpdateTime = arr[16];
+        versionNumber = arr[17];
+        versionName = arr[18];
+        medicalMaterialsName = arr[19];
+        functionalGovernance = arr[20];
+        processingMethod = arr[21];
+        efficacyClassification = arr[22];
+        medicinalMaterialsSource = arr[23];
+        nationalPaymentPolicy = arr[24];
+        provincialPaymentPolicy = arr[25];
+        standardName = arr[26];
+        standardPageNumber = arr[27];
+        standardElectronicArchives = arr[28];
+    }
 }

src/main/java/thyyxxk/webserver/entity/medicalinsurance/download/SiDlDssDns.java

@@ -141,30 +141,37 @@ public class SiDlDssDns implements Serializable {
 
 	public SiDlDssDns(String tempstr) {
 		String[] arr = tempstr.split("\t");
-		code = arr[0].trim();
-		chapter = arr[1].trim();
-		chapterCodeRange = arr[2].trim();
-		chapterName = arr[3].trim();
-		sectionCodeRange = arr[4].trim();
-		sectionName = arr[5].trim();
-		classOrderCode = arr[6].trim();
-		classOrderName = arr[7].trim();
-		subcode = arr[8].trim();
-		subname = arr[9].trim();
-		diagnosisCode = arr[10].trim();
-		diagnosisName = arr[11].trim();
-		useTheTag = arr[12].trim();
-		nationalDiagnosticCode = arr[13].trim();
-		nationalDiagnosticName = arr[14].trim();
-		clinicalDiagnosticCode = arr[15].trim();
-		clinicalDiagnosticName = arr[16].trim();
-		remarks = arr[17].trim();
-		validFlag = arr[18].trim();
-		uniqueRecordNumber = arr[19].trim();
-		dataCreationTime = arr[20].trim();
-		dataUpdateTime = arr[21].trim();
-		versionNumber = arr[22].trim();
-		versionName = arr[23].trim();
+		for (int i = 0; i < arr.length; i++) {
+			if (null == arr[i] || arr[i].trim().equals("null")) {
+				arr[i] = null;
+			} else {
+				arr[i] = arr[i].trim();
+			}
+		}
+		code = arr[0];
+		chapter = arr[1];
+		chapterCodeRange = arr[2];
+		chapterName = arr[3];
+		sectionCodeRange = arr[4];
+		sectionName = arr[5];
+		classOrderCode = arr[6];
+		classOrderName = arr[7];
+		subcode = arr[8];
+		subname = arr[9];
+		diagnosisCode = arr[10];
+		diagnosisName = arr[11];
+		useTheTag = arr[12];
+		nationalDiagnosticCode = arr[13];
+		nationalDiagnosticName = arr[14];
+		clinicalDiagnosticCode = arr[15];
+		clinicalDiagnosticName = arr[16];
+		remarks = arr[17];
+		validFlag = arr[18];
+		uniqueRecordNumber = arr[19];
+		dataCreationTime = arr[20];
+		dataUpdateTime = arr[21];
+		versionNumber = arr[22];
+		versionName = arr[23];
 		pyCode = PingYinUtils.getAllPinYinHeadChar(diagnosisName);
 	}
 }

src/main/java/thyyxxk/webserver/entity/medicalinsurance/download/SiDlDytmSrgyDss.java

@@ -89,21 +89,28 @@ public class SiDlDytmSrgyDss implements Serializable {
 
 	public SiDlDytmSrgyDss(String tempstr) {
 		String[] arr = tempstr.split("\t");
-		code = arr[0].trim();
-		daytimeSurgeryCode = arr[1].trim();
-		daytimeSurgeryName = arr[2].trim();
-		validFlag = arr[3].trim();
-		uniqueRecordNumber = arr[4].trim();
-		dataCreationTime = arr[5].trim();
-		dataUpdateTime = arr[6].trim();
-		versionNumber = arr[7].trim();
-		diseaseConnotation = arr[8].trim();
-		remarks = arr[9].trim();
-		versionName = arr[10].trim();
-		guidePageNum = arr[11].trim();
-		electronicGuideArchives = arr[12].trim();
-		operationCode = arr[13].trim();
-		operationName = arr[14].trim();
+		for (int i = 0; i < arr.length; i++) {
+			if (arr[i].trim().equals("null")) {
+				arr[i] = null;
+			} else {
+				arr[i] = arr[i].trim();
+			}
+		}
+		code = arr[0];
+		daytimeSurgeryCode = arr[1];
+		daytimeSurgeryName = arr[2];
+		validFlag = arr[3];
+		uniqueRecordNumber = arr[4];
+		dataCreationTime = arr[5];
+		dataUpdateTime = arr[6];
+		versionNumber = arr[7];
+		diseaseConnotation = arr[8];
+		remarks = arr[9];
+		versionName = arr[10];
+		guidePageNum = arr[11];
+		electronicGuideArchives = arr[12];
+		operationCode = arr[13];
+		operationName = arr[14];
 	}
 
 }

src/main/java/thyyxxk/webserver/entity/medicalinsurance/download/SiDlMdcnSply.java

@@ -369,76 +369,83 @@ public class SiDlMdcnSply implements Serializable {
 
 	public SiDlMdcnSply(String tempstr) {
 		String[] arr = tempstr.split("\t");
-		code = arr[0].trim();
-		suppliesName = arr[1].trim();
-		medicalDeviceUniqueCode = arr[2].trim();
-		siUniversalCode = arr[3].trim();
-		siUniversalName = arr[4].trim();
-		productModel = arr[5].trim();
-		specificationCode = arr[6].trim();
-		spec = arr[7].trim();
-		consumableClassification = arr[8].trim();
-		specificationsAndModels = arr[9].trim();
-		materialCode = arr[10].trim();
-		consumableMaterial = arr[11].trim();
-		packingSpecifications = arr[12].trim();
-        packageQuantity = arr[13].trim();
-		productPackagingMaterial = arr[14].trim();
-		packingUnit = arr[15].trim();
-		productConversionRatio = arr[16].trim();
-		minimumUnit = arr[17].trim();
-		productionAddrCategory = arr[18].trim();
-		productionAddrCategoryName = arr[19].trim();
-		productStandard = arr[20].trim();
-		expdt = arr[21].trim();
-		performanceStructure = arr[22].trim();
-		scopeOfApplication = arr[23].trim();
-		productUsageMethod = arr[24].trim();
-		productPictureNumber = arr[25].trim();
-		productQualityStandard = arr[26].trim();
-		instructions = arr[27].trim();
-		otherSupportingMaterials = arr[28].trim();
-		specialMachineFlag = arr[29].trim();
-		specialMachineName = arr[30].trim();
-		groupName = arr[31].trim();
-		groupLogo = arr[32].trim();
-		limitUsingFlag = arr[33].trim();
-		siLimitRange = arr[34].trim();
-		minimumSalesUnit = arr[35].trim();
-		highValueFlag = arr[36].trim();
-		classificationCode = arr[37].trim();
-		implantAndOrganFlag = arr[38].trim();
-		sterizationFlag = arr[39].trim();
-		sterilizationFlagName = arr[40].trim();
-		implantInterventionalFlag = arr[41].trim();
-		implantInterventionalClassName = arr[42].trim();
-		disposableFlag = arr[43].trim();
-		disposableFlagName = arr[44].trim();
-		registrantName = arr[45].trim();
-		startTime = arr[46].trim();
-		endTime = arr[47].trim();
-		managementCategory = arr[48].trim();
-		managementCategoryName = arr[49].trim();
-		registrationRecordNo = arr[50].trim();
-		registeredProductName = arr[51].trim();
-		structureAndComposition = arr[52].trim();
-		otherContent = arr[53].trim();
-		approvalDate = arr[54].trim();
-		registeredApplicantAddr = arr[55].trim();
-		certificateStartTime = arr[56].trim();
-		certificateEndTime = arr[57].trim();
-		productionNumber = arr[58].trim();
-		productionName = arr[59].trim();
-		productionAddress = arr[60].trim();
-		agenterprise = arr[61].trim();
-		agenterpriseAddress = arr[62].trim();
-		productionCountry = arr[63].trim();
-		salesServiceOrganization = arr[64].trim();
-		certificateElectronicFile = arr[65].trim();
-		productImage = arr[66].trim();
-		validFlag = arr[67].trim();
-		uniqueRecordNumber = arr[68].trim();
-		versionNumber = arr[69].trim();
-		versionName = arr[70].trim();
+		for (int i = 0; i < arr.length; i++) {
+			if (null == arr[i] || arr[i].trim().equals("null")) {
+				arr[i] = null;
+			} else {
+				arr[i] = arr[i].trim();
+			}
+		}
+		code = arr[0];
+		suppliesName = arr[1];
+		medicalDeviceUniqueCode = arr[2];
+		siUniversalCode = arr[3];
+		siUniversalName = arr[4];
+		productModel = arr[5];
+		specificationCode = arr[6];
+		spec = arr[7];
+		consumableClassification = arr[8];
+		specificationsAndModels = arr[9];
+		materialCode = arr[10];
+		consumableMaterial = arr[11];
+		packingSpecifications = arr[12];
+        packageQuantity = arr[13];
+		productPackagingMaterial = arr[14];
+		packingUnit = arr[15];
+		productConversionRatio = arr[16];
+		minimumUnit = arr[17];
+		productionAddrCategory = arr[18];
+		productionAddrCategoryName = arr[19];
+		productStandard = arr[20];
+		expdt = arr[21];
+		performanceStructure = arr[22];
+		scopeOfApplication = arr[23];
+		productUsageMethod = arr[24];
+		productPictureNumber = arr[25];
+		productQualityStandard = arr[26];
+		instructions = arr[27];
+		otherSupportingMaterials = arr[28];
+		specialMachineFlag = arr[29];
+		specialMachineName = arr[30];
+		groupName = arr[31];
+		groupLogo = arr[32];
+		limitUsingFlag = arr[33];
+		siLimitRange = arr[34];
+		minimumSalesUnit = arr[35];
+		highValueFlag = arr[36];
+		classificationCode = arr[37];
+		implantAndOrganFlag = arr[38];
+		sterizationFlag = arr[39];
+		sterilizationFlagName = arr[40];
+		implantInterventionalFlag = arr[41];
+		implantInterventionalClassName = arr[42];
+		disposableFlag = arr[43];
+		disposableFlagName = arr[44];
+		registrantName = arr[45];
+		startTime = arr[46];
+		endTime = arr[47];
+		managementCategory = arr[48];
+		managementCategoryName = arr[49];
+		registrationRecordNo = arr[50];
+		registeredProductName = arr[51];
+		structureAndComposition = arr[52];
+		otherContent = arr[53];
+		approvalDate = arr[54];
+		registeredApplicantAddr = arr[55];
+		certificateStartTime = arr[56];
+		certificateEndTime = arr[57];
+		productionNumber = arr[58];
+		productionName = arr[59];
+		productionAddress = arr[60];
+		agenterprise = arr[61];
+		agenterpriseAddress = arr[62];
+		productionCountry = arr[63];
+		salesServiceOrganization = arr[64];
+		certificateElectronicFile = arr[65];
+		productImage = arr[66];
+		validFlag = arr[67];
+		uniqueRecordNumber = arr[68];
+		versionNumber = arr[69];
+		versionName = arr[70];
 	}
 }

src/main/java/thyyxxk/webserver/entity/medicalinsurance/download/SiDlMdcnSrvc.java

@@ -94,21 +94,28 @@ public class SiDlMdcnSrvc implements Serializable {
 
 	public SiDlMdcnSrvc(String tempstr) {
 		String[] arr = tempstr.split("\t");
-		code = arr[0].trim();
-		chargeUnit = arr[1].trim();
-		valofName = arr[2].trim();
-		descriptions = arr[3].trim();
-		excludeContent = arr[4].trim();
-		connotation = arr[5].trim();
-		validFlag = arr[6].trim();
-		remarks = arr[7].trim();
-		serviceCategory = arr[8].trim();
-		serviceName = arr[9].trim();
-		entrySpecification = arr[10].trim();
-		startDate = arr[11].trim();
-		endDate = arr[12].trim();
-		uniqueRecordNumber = arr[13].trim();
-		versionNumber = arr[14].trim();
-		versionName = arr[15].trim();
+		for (int i = 0; i < arr.length; i++) {
+			if (null == arr[i] || arr[i].trim().equals("null")) {
+				arr[i] = null;
+			} else {
+				arr[i] = arr[i].trim();
+			}
+		}
+		code = arr[0];
+		chargeUnit = arr[1];
+		valofName = arr[2];
+		descriptions = arr[3];
+		excludeContent = arr[4];
+		connotation = arr[5];
+		validFlag = arr[6];
+		remarks = arr[7];
+		serviceCategory = arr[8];
+		serviceName = arr[9];
+		entrySpecification = arr[10];
+		startDate = arr[11];
+		endDate = arr[12];
+		uniqueRecordNumber = arr[13];
+		versionNumber = arr[14];
+		versionName = arr[15];
 	}
 }

src/main/java/thyyxxk/webserver/entity/medicalinsurance/download/SiDlOprtn.java

@@ -139,30 +139,37 @@ public class SiDlOprtn implements Serializable {
 	}
 
 	public SiDlOprtn(String[] arr) {
-		code = arr[0].trim();
-		chapter = arr[1].trim();
-		chapterCodeRange = arr[2].trim();
-		chapterName = arr[3].trim();
-		classOrderCode = arr[4].trim();
-		classOrderName = arr[5].trim();
-		subcode = arr[6].trim();
-		subname = arr[7].trim();
-		fineCode = arr[8].trim();
-		detailsName = arr[9].trim();
-		surgicalOperationCode = arr[10].trim();
-		operationOperationName = arr[11].trim();
-		useTheTag = arr[12].trim();
-		nationalOperationCode = arr[13].trim();
-		nationalOperationName = arr[14].trim();
-		clinicalOperationCode = arr[15].trim();
-		clinicalOperationName = arr[16].trim();
-		remarks = arr[17].trim();
-		validFlag = arr[18].trim();
-		uniqueRecordNumber = arr[19].trim();
-		dataCreationTime = arr[20].trim();
-		dataUpdateTime = arr[21].trim();
-		versionNumber = arr[22].trim();
-		versionName = arr[23].trim();
+		for (int i = 0; i < arr.length; i++) {
+			if (null == arr[i] || arr[i].trim().equals("null")) {
+				arr[i] = null;
+			} else {
+				arr[i] = arr[i].trim();
+			}
+		}
+		code = arr[0];
+		chapter = arr[1];
+		chapterCodeRange = arr[2];
+		chapterName = arr[3];
+		classOrderCode = arr[4];
+		classOrderName = arr[5];
+		subcode = arr[6];
+		subname = arr[7];
+		fineCode = arr[8];
+		detailsName = arr[9];
+		surgicalOperationCode = arr[10];
+		operationOperationName = arr[11];
+		useTheTag = arr[12];
+		nationalOperationCode = arr[13];
+		nationalOperationName = arr[14];
+		clinicalOperationCode = arr[15];
+		clinicalOperationName = arr[16];
+		remarks = arr[17];
+		validFlag = arr[18];
+		uniqueRecordNumber = arr[19];
+		dataCreationTime = arr[20];
+		dataUpdateTime = arr[21];
+		versionNumber = arr[22];
+		versionName = arr[23];
 		pyCode = PingYinUtils.getAllPinYinHeadChar(operationOperationName);
 	}
 

src/main/java/thyyxxk/webserver/entity/medicalinsurance/download/SiDlPayByDss.java

@@ -89,24 +89,31 @@ public class SiDlPayByDss implements Serializable {
 
 	public SiDlPayByDss(String tempstr) {
 		String[] arr = tempstr.split("\t");
-		code = arr[0].trim();
-		settlementCode = arr[1].trim();
-		settlementName = arr[2].trim();
-		limitedOperationCode = arr[3].trim();
-		limitedOperationName = arr[4].trim();
-		validFlag = arr[5].trim();
-		uniqueRecordNumber = arr[6].trim();
-		dataCreationTime = arr[7].trim();
-		dataUpdateTime = arr[8].trim();
-		versionNumber = arr[9].trim();
-		connotation = arr[10].trim();
-		remarks = arr[11].trim();
-		versionName = arr[12].trim();
+		for (int i = 0; i < arr.length; i++) {
+			if (null == arr[i] || arr[i].trim().equals("null")) {
+				arr[i] = null;
+			} else {
+				arr[i] = arr[i].trim();
+			}
+		}
+		code = arr[0];
+		settlementCode = arr[1];
+		settlementName = arr[2];
+		limitedOperationCode = arr[3];
+		limitedOperationName = arr[4];
+		validFlag = arr[5];
+		uniqueRecordNumber = arr[6];
+		dataCreationTime = arr[7];
+		dataUpdateTime = arr[8];
+		versionNumber = arr[9];
+		connotation = arr[10];
+		remarks = arr[11];
+		versionName = arr[12];
 		if (arr.length > 13) {
-			guidePageNumber = arr[13].trim();
+			guidePageNumber = arr[13];
 		}
 		if (arr.length > 14) {
-			guideElectronicArchives = arr[14].trim();
+			guideElectronicArchives = arr[14];
 		}
 	}
 

src/main/java/thyyxxk/webserver/entity/medicalinsurance/download/SiDlPtntWstnMdcn.java

@@ -474,97 +474,104 @@ public class SiDlPtntWstnMdcn implements Serializable {
 
 	public SiDlPtntWstnMdcn(String tempstr) {
 		String[] arr = tempstr.split("\t");
-		code = arr[0].trim();
-		drugTradeName = arr[1].trim();
-		universalNameNumber = arr[2].trim();
-		generalDrugName = arr[3].trim();
-		chemicalName = arr[4].trim();
-		alias = arr[5].trim();
-		englishName = arr[6].trim();
-		registrationName = arr[7].trim();
-		drugSupervisionLocalCode = arr[8].trim();
-		drugDosageForms = arr[9].trim();
-		drugDosageFormName = arr[10].trim();
-		drugCategory = arr[11].trim();
-		drugCategoryName = arr[12].trim();
-		drugSpecifications = arr[13].trim();
-		drugSpecificationCode = arr[14].trim();
-		registrationDosageType = arr[15].trim();
-		registrationSpecifications = arr[16].trim();
-		registrationSpecificationCode = arr[17].trim();
-		eachDosage = arr[18].trim();
-		frequencyOfUsage = arr[19].trim();
-		aateGroup = arr[20].trim();
-		nationalDrugNo = arr[21].trim();
-		usr = arr[22].trim();
-		patentFlag = arr[23].trim();
-		productionSiteCategory = arr[24].trim();
-		productionSiteCategoryName = arr[25].trim();
-		unitType = arr[26].trim();
-		nonprescriptionFlag = arr[27].trim();
-		nonprescriptionFlagName = arr[28].trim();
-		packagingMaterial = arr[29].trim();
-		packagingMaterialName = arr[30].trim();
-		packingSpecifications = arr[31].trim();
-		packageQuantity = arr[32].trim();
-		functionalGovernance = arr[33].trim();
-		routeOfMedication = arr[34].trim();
-		instructions = arr[35].trim();
-		startTime = arr[36].trim();
-		endTime = arr[37].trim();
-		minimumUnit = arr[38].trim();
-		minimumSalesUnit = arr[39].trim();
-		minimumUnitOfMeasurement = arr[40].trim();
-		minimumPackingQuantity = arr[41].trim();
-		minimumPackingUnit = arr[42].trim();
-		minimumPreparationUnit = arr[43].trim();
-		minimumPackagingUnitName = arr[44].trim();
-		minimumPreparationUnitName = arr[45].trim();
-		conversionRatio = arr[46].trim();
-		validityPeriodOfTheDrug = arr[47].trim();
-		minimumUnitValuation = arr[48].trim();
-		wbCode = arr[49].trim();
-		pyCode = arr[50].trim();
-		subpackagingManufacturer = arr[51].trim();
-		productionNumber = arr[52].trim();
-		productionName = arr[53].trim();
-		limitedDrugFlag = arr[54].trim();
-		specialDrugMark = arr[55].trim();
-		limitTheUsageRange = arr[56].trim();
-		limitUsingFlags = arr[57].trim();
-		certificateNumber = arr[58].trim();
-		certificateStartDate = arr[59].trim();
-		certificateEndDate = arr[60].trim();
-		licenseNumber = arr[61].trim();
-		approvalStartDate = arr[62].trim();
-		approvalEndDate = arr[63].trim();
-		marketStatus = arr[64].trim();
-		marketStatusName = arr[65].trim();
-		registrationElectronicFile = arr[66].trim();
-		supplementaryElectronicFile = arr[67].trim();
-		nationalSiCatalogueRemark = arr[68].trim();
-		basicDrugFlagName = arr[69].trim();
-		basicDrugFlag = arr[70].trim();
-		adjustedTaxFlag = arr[71].trim();
-		adjustedTaxFlagName = arr[72].trim();
-		listedDrugsSet = arr[73].trim();
-		negotiatedDrugFlag = arr[74].trim();
-		negotiatedDrugFlagName = arr[75].trim();
-		healthCommissionDrugCode = arr[76].trim();
-		remarks = arr[77].trim();
-		validFlag = arr[78].trim();
-		uniqueRecordNumber = arr[79].trim();
-		dataCreationTime = arr[80].trim();
-		dataUpdateTime = arr[81].trim();
-		versionNumber = arr[82].trim();
-		versionName = arr[83].trim();
-		drugsForChildren = arr[84].trim();
-		corporateName = arr[85].trim();
-		consistencyDrugs = arr[86].trim();
-		distributingBusiness = arr[87].trim();
-		contact = arr[88].trim();
-		enterpriseElectronicFile = arr[89].trim();
-		nationalDosage = arr[90].trim();
-		nationalClassFlag = arr[91].trim();
+		for (int i = 0; i < arr.length; i++) {
+			if (null == arr[i] || arr[i].trim().equals("null")) {
+				arr[i] = null;
+			} else {
+				arr[i] = arr[i].trim();
+			}
+		}
+		code = arr[0];
+		drugTradeName = arr[1];
+		universalNameNumber = arr[2];
+		generalDrugName = arr[3];
+		chemicalName = arr[4];
+		alias = arr[5];
+		englishName = arr[6];
+		registrationName = arr[7];
+		drugSupervisionLocalCode = arr[8];
+		drugDosageForms = arr[9];
+		drugDosageFormName = arr[10];
+		drugCategory = arr[11];
+		drugCategoryName = arr[12];
+		drugSpecifications = arr[13];
+		drugSpecificationCode = arr[14];
+		registrationDosageType = arr[15];
+		registrationSpecifications = arr[16];
+		registrationSpecificationCode = arr[17];
+		eachDosage = arr[18];
+		frequencyOfUsage = arr[19];
+		aateGroup = arr[20];
+		nationalDrugNo = arr[21];
+		usr = arr[22];
+		patentFlag = arr[23];
+		productionSiteCategory = arr[24];
+		productionSiteCategoryName = arr[25];
+		unitType = arr[26];
+		nonprescriptionFlag = arr[27];
+		nonprescriptionFlagName = arr[28];
+		packagingMaterial = arr[29];
+		packagingMaterialName = arr[30];
+		packingSpecifications = arr[31];
+		packageQuantity = arr[32];
+		functionalGovernance = arr[33];
+		routeOfMedication = arr[34];
+		instructions = arr[35];
+		startTime = arr[36];
+		endTime = arr[37];
+		minimumUnit = arr[38];
+		minimumSalesUnit = arr[39];
+		minimumUnitOfMeasurement = arr[40];
+		minimumPackingQuantity = arr[41];
+		minimumPackingUnit = arr[42];
+		minimumPreparationUnit = arr[43];
+		minimumPackagingUnitName = arr[44];
+		minimumPreparationUnitName = arr[45];
+		conversionRatio = arr[46];
+		validityPeriodOfTheDrug = arr[47];
+		minimumUnitValuation = arr[48];
+		wbCode = arr[49];
+		pyCode = arr[50];
+		subpackagingManufacturer = arr[51];
+		productionNumber = arr[52];
+		productionName = arr[53];
+		limitedDrugFlag = arr[54];
+		specialDrugMark = arr[55];
+		limitTheUsageRange = arr[56];
+		limitUsingFlags = arr[57];
+		certificateNumber = arr[58];
+		certificateStartDate = arr[59];
+		certificateEndDate = arr[60];
+		licenseNumber = arr[61];
+		approvalStartDate = arr[62];
+		approvalEndDate = arr[63];
+		marketStatus = arr[64];
+		marketStatusName = arr[65];
+		registrationElectronicFile = arr[66];
+		supplementaryElectronicFile = arr[67];
+		nationalSiCatalogueRemark = arr[68];
+		basicDrugFlagName = arr[69];
+		basicDrugFlag = arr[70];
+		adjustedTaxFlag = arr[71];
+		adjustedTaxFlagName = arr[72];
+		listedDrugsSet = arr[73];
+		negotiatedDrugFlag = arr[74];
+		negotiatedDrugFlagName = arr[75];
+		healthCommissionDrugCode = arr[76];
+		remarks = arr[77];
+		validFlag = arr[78];
+		uniqueRecordNumber = arr[79];
+		dataCreationTime = arr[80];
+		dataUpdateTime = arr[81];
+		versionNumber = arr[82];
+		versionName = arr[83];
+		drugsForChildren = arr[84];
+		corporateName = arr[85];
+		consistencyDrugs = arr[86];
+		distributingBusiness = arr[87];
+		contact = arr[88];
+		enterpriseElectronicFile = arr[89];
+		nationalDosage = arr[90];
+		nationalClassFlag = arr[91];
 	}
 }

src/main/java/thyyxxk/webserver/entity/medicalinsurance/download/SiDlSlwSpcChr.java

@@ -94,21 +94,28 @@ public class SiDlSlwSpcChr implements Serializable {
 
 	public SiDlSlwSpcChr(String tempstr) {
 		String[] arr = tempstr.split("\t");
-		code = arr[0].trim();
-		categoryName = arr[1].trim();
-		detailDiseasesName = arr[2].trim();
-		medicalInsuranceDivision = arr[3].trim();
-		remarks = arr[4].trim();
-		validFlag = arr[5].trim();
-		uniqueRecordNumber = arr[6].trim();
-		dataCreationTime = arr[7].trim();
-		dataUpdateTime = arr[8].trim();
-		version = arr[9].trim();
-		connotation = arr[10].trim();
-		versionName = arr[11].trim();
-		guidePageNumber = arr[12].trim();
-		guideElectronicArchives = arr[13].trim();
-		diseaseName = arr[14].trim();
-		categoryCode = arr[15].trim();
+		for (int i = 0; i < arr.length; i++) {
+			if (null == arr[i] || arr[i].trim().equals("null")) {
+				arr[i] = null;
+			} else {
+				arr[i] = arr[i].trim();
+			}
+		}
+		code = arr[0];
+		categoryName = arr[1];
+		detailDiseasesName = arr[2];
+		medicalInsuranceDivision = arr[3];
+		remarks = arr[4];
+		validFlag = arr[5];
+		uniqueRecordNumber = arr[6];
+		dataCreationTime = arr[7];
+		dataUpdateTime = arr[8];
+		version = arr[9];
+		connotation = arr[10];
+		versionName = arr[11];
+		guidePageNumber = arr[12];
+		guideElectronicArchives = arr[13];
+		diseaseName = arr[14];
+		categoryCode = arr[15];
 	}
 }

src/main/java/thyyxxk/webserver/entity/medicalinsurance/download/SiDlTcmSyndr.java

@@ -84,23 +84,30 @@ public class SiDlTcmSyndr implements Serializable {
 
 	public SiDlTcmSyndr(String tempstr) {
 		String[] arr = tempstr.split("\t");
-		code = arr[0].trim();
-		catalogueCode = arr[1].trim();
-		catalogueName = arr[2].trim();
-		propertyCode = arr[3].trim();
-		properties = arr[4].trim();
-		classificationCode = arr[5].trim();
-		classificationName = arr[6].trim();
-		remarks = arr[7].trim();
-		validFlag = arr[8].trim();
-		uniqueRecordNumber = arr[9].trim();
-		dataCreationTime = arr[10].trim();
-		dataUpdateTime = arr[11].trim();
+		for (int i = 0; i < arr.length; i++) {
+			if (null == arr[i] || arr[i].trim().equals("null")) {
+				arr[i] = null;
+			} else {
+				arr[i] = arr[i].trim();
+			}
+		}
+		code = arr[0];
+		catalogueCode = arr[1];
+		catalogueName = arr[2];
+		propertyCode = arr[3];
+		properties = arr[4];
+		classificationCode = arr[5];
+		classificationName = arr[6];
+		remarks = arr[7];
+		validFlag = arr[8];
+		uniqueRecordNumber = arr[9];
+		dataCreationTime = arr[10];
+		dataUpdateTime = arr[11];
 		if (arr.length > 12) {
-			version = arr[12].trim();
+			version = arr[12];
 		}
 		if (arr.length > 13) {
-			versionName = arr[13].trim();
+			versionName = arr[13];
 		}
 	}
 }

src/main/java/thyyxxk/webserver/entity/medicalinsurance/download/SiDlTmrMrphlgy.java

@@ -69,17 +69,24 @@ public class SiDlTmrMrphlgy implements Serializable {
 
 	public SiDlTmrMrphlgy(String tempstr) {
 		String[] arr = tempstr.split("\t");
-		code = arr[0].trim();
-		tumorCellTypeCode = arr[1].trim();
-		tumorCellType = arr[2].trim();
-		morphologyClassificationCode = arr[3].trim();
-		morphologicalClassification = arr[4].trim();
-		validFlag = arr[5].trim();
-		uniqueRecordNumber = arr[6].trim();
-		dataCreationTime = arr[7].trim();
-		dataUpdateTime = arr[8].trim();
-		versionNumber = arr[9].trim();
-		versionName = arr[10].trim();
+		for (int i = 0; i < arr.length; i++) {
+			if (null == arr[i] || arr[i].trim().equals("null")) {
+				arr[i] = null;
+			} else {
+				arr[i] = arr[i].trim();
+			}
+		}
+		code = arr[0];
+		tumorCellTypeCode = arr[1];
+		tumorCellType = arr[2];
+		morphologyClassificationCode = arr[3];
+		morphologicalClassification = arr[4];
+		validFlag = arr[5];
+		uniqueRecordNumber = arr[6];
+		dataCreationTime = arr[7];
+		dataUpdateTime = arr[8];
+		versionNumber = arr[9];
+		versionName = arr[10];
 	}
 
 }

src/main/java/thyyxxk/webserver/entity/medicalinsurance/download/SiDlTrdtnlChnsDss.java

@@ -84,20 +84,27 @@ public class SiDlTrdtnlChnsDss implements Serializable {
 
 	public SiDlTrdtnlChnsDss(String tempstr) {
 		String[] arr = tempstr.split("\t");
-		code = arr[0].trim();
-		categoryCode = arr[1].trim();
-		categoryName = arr[2].trim();
-		classificationListCode = arr[3].trim();
-		classificationListName = arr[4].trim();
-		diseaseClassificationCode = arr[5].trim();
-		diseaseClassificationName = arr[6].trim();
-		remarks = arr[7].trim();
-		validFlag = arr[8].trim();
-		uniqueRecordNumber = arr[9].trim();
-		dataCreationTime = arr[10].trim();
-		dataUpdateTime = arr[11].trim();
-		version = arr[12].trim();
-		versionName = arr[13].trim();
+		for (int i = 0; i < arr.length; i++) {
+			if (null == arr[i] || arr[i].trim().equals("null")) {
+				arr[i] = null;
+			} else {
+				arr[i] = arr[i].trim();
+			}
+		}
+		code = arr[0];
+		categoryCode = arr[1];
+		categoryName = arr[2];
+		classificationListCode = arr[3];
+		classificationListName = arr[4];
+		diseaseClassificationCode = arr[5];
+		diseaseClassificationName = arr[6];
+		remarks = arr[7];
+		validFlag = arr[8];
+		uniqueRecordNumber = arr[9];
+		dataCreationTime = arr[10];
+		dataUpdateTime = arr[11];
+		version = arr[12];
+		versionName = arr[13];
 	}
 
 }