| 
					
				 | 
			
			
				@@ -2,6 +2,7 @@ package thyyxxk.webserver.service.inpatient.casefrontsheet; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				  
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 import com.alibaba.fastjson.JSONArray; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 import com.alibaba.fastjson.JSONObject; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+import com.alibaba.fastjson.serializer.SerializerFeature; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 import lombok.extern.slf4j.Slf4j; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 import org.springframework.beans.factory.annotation.Autowired; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 import org.springframework.stereotype.Service; 
			 | 
		
	
	
		
			
				| 
					
				 | 
			
			
				@@ -206,7 +207,8 @@ public class CaseFrontSheetExportService { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             sheet.setDisdiag0(makeExportFormat(diagCodeArr[0], diagNameArr[0])); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				  
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             sheet.setSurgery0(makeExportFormat(surgeryCodeArr[0], surgeryNameArr[0], surgeryLevelArr[0])); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-            JSONObject obj = JSONObject.parseObject(JSONObject.toJSONString(sheet)); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+            String jstring = JSONObject.toJSONString(sheet, SerializerFeature.WriteMapNullValue); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+            JSONObject obj = JSONObject.parseObject(jstring); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             if (request.needAllDiagnoses() && diagCodeArr.length > 1 && diagNameArr.length > 1) { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                 for (int i = 1; i < diagCodeArr.length; i++) { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                     obj.put("disdiag" + i, makeExportFormat(diagCodeArr[i], diagNameArr[i])); 
			 |