| 
					
				 | 
			
			
				@@ -134,13 +134,28 @@ public class VerifyCaseFrontSheet { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         if (StringUtil.invalidValue(info.getHkPlaceName())) { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             array.add(new CodeName("hkPlaceName","患者户口地址不能为空!")); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-        if (Objects.equals(info.getInsutype(), Insutype.BASIC_MEDICAL_INSURANCE_FOR_EMPLOYEES.getCode())) { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-            if (StringUtil.invalidValue(info.getUnitName()) || StringUtil.invalidValue(info.getUnitPlace())) { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-                array.add(new CodeName("unitName","患者工作单位及地址不能为空!")); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-            } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-            if (StringUtil.isBlank(info.getUnitPhone())) { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-                array.add(new CodeName("unitPhone","患者单位电话不能为空!")); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-            } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+//        if (Objects.equals(info.getInsutype(), Insutype.BASIC_MEDICAL_INSURANCE_FOR_EMPLOYEES.getCode())) { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+//            if (StringUtil.invalidValue(info.getUnitName()) || StringUtil.invalidValue(info.getUnitPlace())) { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+//                array.add(new CodeName("unitName","患者工作单位及地址不能为空!")); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+//            } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+//            if (StringUtil.isBlank(info.getUnitPhone())) { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+//                array.add(new CodeName("unitPhone","患者单位电话不能为空!")); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+//            } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+//        } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+        if (StringUtil.invalidValue(info.getUnitName()) || StringUtil.invalidValue(info.getUnitPlace())) { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+            array.add(new CodeName("unitName","患者工作单位及地址不能为空!")); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+        } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+        if (StringUtil.isBlank(info.getUnitPhone())) { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+            array.add(new CodeName("unitPhone","患者单位电话不能为空!")); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+        } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+        if (StringUtil.isBlank(info.getUnitZipCode()) || info.getUnitZipCode().contains("-")) { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+            array.add(new CodeName("unitZipCode", "患者工作单位邮编不能为空!")); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+        } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+        if (StringUtil.isBlank(info.getAddrZipCode()) || info.getAddrZipCode().contains("-")) { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+            array.add(new CodeName("addrZipCode", "患者现住址邮编不能为空!")); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+        } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+        if (StringUtil.isBlank(info.getHkZipCode()) || info.getHkZipCode().contains("-")) { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+            array.add(new CodeName("hkZipCode", "患者户口邮编不能为空!")); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         if (StringUtil.invalidValue(info.getContactName())) { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             array.add(new CodeName("contactName","患者联系人姓名不能为空!")); 
			 | 
		
	
	
		
			
				| 
					
				 | 
			
			
				@@ -439,6 +454,9 @@ public class VerifyCaseFrontSheet { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         if (StringUtil.isBlank(surgery.getOperator())) { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             array.add(new CodeName("surgeryTable","手术" + surgery.getNo() + ",术者不能为空!")); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+        if (surgery.getType() < 3 && StringUtil.isBlank(surgery.getLevel())) { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+            array.add(new CodeName("surgeryTable","手术" + surgery.getNo() + "手术操作编码为介入治疗或手术时,手术级别不能为空!")); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+        } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         if (isHighLevelSurgery(surgery.getLevel())) { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             if (StringUtil.isBlank(surgery.getAssistantOne())) { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                 array.add(new CodeName("surgeryTable","手术" + surgery.getNo() + ",三、四级手术I助不能为空!")); 
			 |