Merge branch 'master' into 'master'

优化传染病上传

See merge request lighter/web-server!196

src/main/java/thyyxxk/webserver/service/crbmanagement/EmrActivityInfoService.java

@@ -451,7 +451,11 @@ public class EmrActivityInfoService {
                         }
                     }
                 }
-                resultList.add(infoVo);
+                if(null != infoVo.getWmDiseaseCode()){
+                    resultList.add(infoVo);
+                } else {
+                    log.error(infoVo.getPatientId() + "====== 没有诊断！");
+                }
             }
         }
         return callIllIcdCategory(resultList, isCrb);