| 
					
				 | 
			
			
				@@ -5,10 +5,13 @@ import cn.hnthyy.thmz.Utils.IDCardUtil; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 import cn.hnthyy.thmz.Utils.R; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 import cn.hnthyy.thmz.Utils.StringUtil; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 import cn.hnthyy.thmz.comment.UserLoginToken; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+import cn.hnthyy.thmz.entity.his.mz.MzPatientMi; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 import cn.hnthyy.thmz.entity.his.zy.APatientMi; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+import cn.hnthyy.thmz.service.his.mz.MzPatientMiService; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 import cn.hnthyy.thmz.service.his.zy.APatientMiService; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 import cn.hutool.core.collection.CollUtil; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 import cn.hutool.core.convert.Convert; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+import cn.hutool.core.util.StrUtil; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 import lombok.extern.slf4j.Slf4j; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 import org.apache.commons.lang3.StringUtils; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 import org.springframework.beans.factory.annotation.Autowired; 
			 | 
		
	
	
		
			
				| 
					
				 | 
			
			
				@@ -24,6 +27,8 @@ import java.util.Map; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 public class APatientMiController { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				     @Autowired 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				     private APatientMiService aPatientMiService; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+    @Autowired 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+    private MzPatientMiService mzPatientMiService; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				  
			 | 
		
	
		
			
				 | 
				 | 
			
			
				  
			 | 
		
	
		
			
				 | 
				 | 
			
			
				  
			 | 
		
	
	
		
			
				| 
					
				 | 
			
			
				@@ -83,9 +88,16 @@ public class APatientMiController { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                 resultMap.put("message", "病人门诊id不能为空"); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                 return resultMap; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+            List<APatientMi> aPatientMis = aPatientMiService.queryAPatientByMzNo(mzNo); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+            if(CollUtil.isEmpty(aPatientMis)){ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                MzPatientMi mzPatientMi = mzPatientMiService.queryByPatientId(mzNo); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                if(mzPatientMi !=null && StrUtil.isNotBlank(mzPatientMi.getSocialNo())){ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                    aPatientMis = aPatientMiService.queryAPatientBySocialNo(mzPatientMi.getSocialNo()); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+            } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             resultMap.put("code", 0); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             resultMap.put("message", "查询病人信息成功"); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-            resultMap.put("data", aPatientMiService.queryAPatientByMzNo(mzNo)); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+            resultMap.put("data", aPatientMis); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             return resultMap; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         } catch (Exception e) { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             e.printStackTrace(); 
			 | 
		
	
	
		
			
				| 
					
				 | 
			
			
				@@ -112,14 +124,21 @@ public class APatientMiController { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             if (checkPatient(aPatientMi, resultMap)){ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                 return resultMap; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-            List<APatientMi> aPatientMiDb=aPatientMiService.queryAPatientByMzNo(aPatientMi.getMzNo()); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             int num=0; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-            if(CollUtil.isEmpty(aPatientMiDb)){ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-               //新增 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-                num=aPatientMiService.saveMzPatientMi(aPatientMi); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+            if(StrUtil.isNotBlank(aPatientMi.getInpatientNo())){ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                APatientMi tempAPatientMi = aPatientMiService.queryPatientMiByInPatientNo(aPatientMi.getInpatientNo()); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                if(tempAPatientMi != null){ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                    num=aPatientMiService.modifyMzPatientMi(aPatientMi); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                }else { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                    num=aPatientMiService.saveMzPatientMi(aPatientMi); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             }else { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-                //修改 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-                num=aPatientMiService.modifyMzPatientMi(aPatientMi); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                List<APatientMi> aPatientMiDb=aPatientMiService.queryAPatientByMzNo(aPatientMi.getMzNo()); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                if(CollUtil.isEmpty(aPatientMiDb)){ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                    num=aPatientMiService.saveMzPatientMi(aPatientMi); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                }else { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                    num=aPatientMiService.modifyMzPatientMi(aPatientMi); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             if(num >=1){ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                 resultMap.put("code", 0); 
			 |